changeset 18771:6ecbb322a803

merge of '5fbd62e0397f65bf7b8def7a4ad421e0044d429c' and 'aea49b9a427019527ec0e314f70a35c7defe0d89'
author Kevin Stange <kevin@simguy.net>
date Thu, 02 Aug 2007 04:16:37 +0000 (2007-08-02)
parents dac3cb3627bd (current diff) faf6d526ae87 (diff)
children d76f1a491357
files
diffstat 79 files changed, 21960 insertions(+), 18927 deletions(-) [+]
line wrap: on
line diff
--- a/AUTHORS	Thu Aug 02 04:12:57 2007 +0000
+++ b/AUTHORS	Thu Aug 02 04:16:37 2007 +0000
@@ -19,6 +19,7 @@
 Daniel 'datallah' Atallah - Developer
 Ethan 'Paco-Paco' Blanton - Developer
 Thomas Butter - Developer
+Ka-Hing Cheung - Developer
 Sadrul Habib Chowdhury - Developer
 Mark 'KingAnt' Doliner - Developer
 Christian 'ChipX86' Hammond - Developer & Webmaster
@@ -38,7 +39,6 @@
 Crazy Patch Writers:
 -------------------
 John 'rekkanoryo' Bailey
-Ka-Hing 'javabsp' Cheung
 Felipe 'shx' Contreras
 Decklin Foster
 Casey Harkins
--- a/COPYRIGHT	Thu Aug 02 04:12:57 2007 +0000
+++ b/COPYRIGHT	Thu Aug 02 04:16:37 2007 +0000
@@ -144,6 +144,7 @@
 Gustavo Gir叩ldez
 Richard Gobeille
 Ian Goldberg
+Matthew Goldstein
 Michael Golden
 Charlie Gordon
 Ryan C. Gordon
@@ -245,6 +246,7 @@
 Andrew Molloy
 Michael Monreal
 Benjamin Moody
+John Moody
 Tim Mooney
 Sergio Moretto
 Christian Muise
--- a/ChangeLog	Thu Aug 02 04:12:57 2007 +0000
+++ b/ChangeLog	Thu Aug 02 04:16:37 2007 +0000
@@ -1,6 +1,12 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.1.0 (??/??/????):
+version 2.1.1 (??/??/????):
+	libpurple:
+	* Added an account action to open your inbox in the yahoo prpl.
+	* Added support for Unicode status messages in Yahoo.
+	* Server-stored aliases for Yahoo. (John Moody)
+
+version 2.1.0 (07/28/2007):
 	libpurple:
 	* Core changes to allow UIs to use second-granularity for scheduling.
 	  Pidgin and Finch, which use the glib event loop, were changed to use
--- a/ChangeLog.API	Thu Aug 02 04:12:57 2007 +0000
+++ b/ChangeLog.API	Thu Aug 02 04:16:37 2007 +0000
@@ -1,6 +1,6 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
-version 2.1.0 (??/??/????):
+version 2.1.0 (7/28/2007):
 	libpurple:
 		Added:
 		* purple-remote: added getstatus command
@@ -29,6 +29,8 @@
 		* purple_xfer_get_remote_user
 		* purple_pounces_get_all_for_ui
 		* purple_prefs_get_children_names
+		* added displaying-email-notification and 
+ 	          displaying-emails-notification signals
 
 		Changed:
 		* The documentation of the following functions now properly
@@ -74,6 +76,8 @@
 		* pidgin_menu_position_func_helper
 		* pidgin_blist_get_name_markup, returns the buddy list markup
 		  text for a given buddy.
+		* pidgin_blist_draw_tooltip and pidgin_blist_tooltip_destroy
+		  for creating blist tooltips from outside of buddy list code
 		* pidgin_themes_remove_smiley_theme
 
 		Changed:
--- a/ChangeLog.win32	Thu Aug 02 04:12:57 2007 +0000
+++ b/ChangeLog.win32	Thu Aug 02 04:16:37 2007 +0000
@@ -1,4 +1,4 @@
-version 2.1.0 (??/??/????):
+version 2.1.0 (7/28/2007):
 	* Updated launcher application (pidgin.exe) to support portable mode
 	  via `pidgin.exe --portable-mode` or by renaming the binary to
 	  `pidgin-portable.exe`
--- a/NEWS	Thu Aug 02 04:12:57 2007 +0000
+++ b/NEWS	Thu Aug 02 04:16:37 2007 +0000
@@ -1,5 +1,14 @@
 Pidgin and Finch: The Pimpin' Penguin IM Clients That're Good for the Soul
 
+2.1.0 (7/28/2007):
+	Sean: This release took a bit longer than 3 weeks, but boy is it 
+	worth it! We're beginning to experiment with new UI concepts and
+	this release features a largely re-designed conversation window.
+	We've closed 150 tickets for this release; much thanks go to all
+	the developers, translators, and testers who made this possible.
+
+	Ka-Hing: Sean said no one else NEWS'ed, so I figure I should.
+
 2.0.2 (6/14/2007):
 	Sean: Another big maintenance release. Again, about 100 tickets were
 	resolved in this release, and they keep coming in. Lots of bug fixes,
--- a/configure.ac	Thu Aug 02 04:12:57 2007 +0000
+++ b/configure.ac	Thu Aug 02 04:16:37 2007 +0000
@@ -46,7 +46,7 @@
 m4_define([purple_lt_current], [1])
 m4_define([purple_major_version], [2])
 m4_define([purple_minor_version], [1])
-m4_define([purple_micro_version], [0])
+m4_define([purple_micro_version], [1])
 m4_define([purple_version_suffix], [devel])
 m4_define([purple_version],
           [purple_major_version.purple_minor_version.purple_micro_version])
@@ -56,7 +56,7 @@
 m4_define([gnt_major_version], [2])
 m4_define([gnt_minor_version], [0])
 m4_define([gnt_micro_version], [0])
-m4_define([gnt_version_suffix], [devel])
+m4_define([gnt_version_suffix], [])
 m4_define([gnt_version],
           [gnt_major_version.gnt_minor_version.gnt_micro_version])
 m4_define([gnt_display_version], gnt_version[]m4_ifdef([gnt_version_suffix],[gnt_version_suffix]))
--- a/doc/notify-signals.dox	Thu Aug 02 04:12:57 2007 +0000
+++ b/doc/notify-signals.dox	Thu Aug 02 04:16:37 2007 +0000
@@ -2,6 +2,8 @@
 
  @signals
   @signal displaying-userinfo
+  @signal displaying-email-notification
+  @signal displaying-emails-notification
  @endsignals
 
  @signaldef displaying-userinfo
@@ -18,5 +20,37 @@
   @param user_info The information to be displayed, as PurpleNotifyUserInfoEntry objects
  @endsignaldef
 
+ @signaldef displaying-email-notification
+  @signalproto
+void (*displaying_email_notification)(const char *subject,
+                                      const char *from,
+                                      const char *to,
+                                      const char *url);
+  @endsignalproto
+  @signaldesc
+   Emitted before email notification is handed to the UI to display.
+  @param subject   Subject of email being notified of.
+  @param from      Who the email is from.
+  @param to        Who the email is to.
+  @param url       A url to view the email.
+ @endsignaldef
+
+ @signaldef displaying-emails-notification
+  @signalproto
+void (*displaying_emails_notification)(const char **subjects,
+                                       const char **froms,
+                                       const char **tos,
+                                       const char **urls,
+                                       guint count);
+  @endsignalproto
+  @signaldesc
+   Emitted before notification of multiple emails is handed to the UI to display.
+  @param subjects   Subjects of emails being notified of.
+  @param froms      Who the emails are from.
+  @param tos        Who the emails are to.
+  @param urls       The urls to view the emails.
+  @param count      Number of emails being notified of.
+ @endsignaldef
+
 */
 // vim: syntax=c tw=75 et
--- a/doc/pidgin.1.in	Thu Aug 02 04:12:57 2007 +0000
+++ b/doc/pidgin.1.in	Thu Aug 02 04:16:37 2007 +0000
@@ -539,6 +539,8 @@
 .br
  Thomas Butter (developer)
 .br
+ Ka-Hing Cheung (developer)
+.br
  Sadrul Habib Chowdhury (developer)
 .br
  Mark 'KingAnt' Doliner (developer) <\fIthekingant@users.sourceforge.net\fR>
@@ -575,8 +577,6 @@
 
 John 'rekkanoryo' Bailey
 .br
-Ka-Hing 'javabsp' Cheung
-.br
 Felipe 'shx' Contreras
 .br
 Decklin Foster
--- a/finch/gntsound.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/finch/gntsound.c	Thu Aug 02 04:16:37 2007 +0000
@@ -22,6 +22,7 @@
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
  */
+#include "internal.h"
 #include "gntsound.h"
 
 const char *finch_sound_get_active_profile(void)
--- a/finch/libgnt/gnttree.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/finch/libgnt/gnttree.c	Thu Aug 02 04:16:37 2007 +0000
@@ -984,7 +984,11 @@
 			g_param_spec_int("columns", "Columns",
 				"Number of columns in the tree.",
 				1, G_MAXINT, 1,
+#if GLIB_CHECK_VERSION(2,8,0)
 				G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
+#else
+				G_PARAM_READWRITE|G_PARAM_PRIVATE
+#endif
 			)
 		);
 
--- a/libpurple/Makefile.mingw	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/Makefile.mingw	Thu Aug 02 04:16:37 2007 +0000
@@ -127,8 +127,8 @@
 ## CLEAN RULES
 ##
 clean:
-	rm -f $(OBJECTS) $(RC_SRC)
-	rm -f $(TARGET).dll $(TARGET).dll.a $(PURPLE_VERSION_H)
+	rm -f $(OBJECTS) $(RC_SRC) $(PURPLE_VERSION_H)
+	rm -f $(TARGET).dll $(TARGET).dll.a $(TARGET).def
 	$(MAKE) -C $(PURPLE_PROTOS_TOP) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C $(PURPLE_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean
 
--- a/libpurple/core.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/core.c	Thu Aug 02 04:16:37 2007 +0000
@@ -159,8 +159,9 @@
 	/*
 	 * Call this early on to try to auto-detect our IP address and
 	 * hopefully save some time later.
+	 * TODO: do this here after purple_prefs_load() has been moved into purple_prefs_init()
 	 */
-	purple_network_get_my_ip(-1);
+	/*purple_network_get_my_ip(-1);*/
 
 	if (ops != NULL && ops->ui_init != NULL)
 		ops->ui_init();
--- a/libpurple/idle.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/idle.c	Thu Aug 02 04:16:37 2007 +0000
@@ -30,8 +30,6 @@
 #include "savedstatuses.h"
 #include "signals.h"
 
-#define IDLEMARK 600 /* 10 minutes! */
-
 typedef enum
 {
 	PURPLE_IDLE_NOT_AWAY = 0,
@@ -121,7 +119,7 @@
 	gboolean report_idle = TRUE;
 	gint away_seconds = 0;
 	gint idle_recheck_interval = 0;
-
+	gint idle_poll_seconds = purple_prefs_get_int("/purple/away/mins_before_away") * 60;
 	purple_signal_emit(purple_blist_get_handle(), "update-idle");
 
 	idle_reporting = purple_prefs_get_string("/purple/away/idle_reporting");
@@ -132,7 +130,7 @@
 	{
 		/* Use system idle time (mouse or keyboard movement, etc.) */
 		time_idle = idle_ui_ops->get_time_idle();
-		idle_recheck_interval = 60;
+		idle_recheck_interval = 1;
 	}
 	else if (!strcmp(idle_reporting, "purple"))
 	{
@@ -153,7 +151,7 @@
 			if ((idle_ui_ops != NULL) && (idle_ui_ops->get_time_idle != NULL))
 			{
 				time_idle = idle_ui_ops->get_time_idle();
-				idle_recheck_interval = 60;
+				idle_recheck_interval = 1;
 			}
 			else
 			{
@@ -173,7 +171,7 @@
 		}
 	}
 
-	time_until_next_idle_event = IDLEMARK - time_idle;
+	time_until_next_idle_event = idle_poll_seconds - time_idle;
 	if (time_until_next_idle_event < 0)
 	{
 		/* If we're already idle, check again as appropriate. */
@@ -197,7 +195,7 @@
 	}
 
 	/* Idle reporting stuff */
-	if (report_idle && (time_idle >= IDLEMARK))
+	if (report_idle && (time_idle >= idle_poll_seconds))
 	{
 		GList *l;
 		for (l = purple_connections_get_all(); l != NULL; l = l->next)
@@ -206,7 +204,7 @@
 			set_account_idle(purple_connection_get_account(gc), time_idle);
 		}
 	}
-	else if (!report_idle || (time_idle < IDLEMARK))
+	else if (!report_idle || (time_idle < idle_poll_seconds ))
 	{
 		while (idled_accts != NULL)
 			set_account_unidle(idled_accts->data);
@@ -306,6 +304,11 @@
 
 static gboolean _do_purple_idle_touch_cb(gpointer data)
 {
+	int idle_poll_minutes = purple_prefs_get_int("/purple/away/mins_before_away");
+
+	 /* +1 more for g_timeout_add_seconds rounding. */
+	idle_timer = purple_timeout_add_seconds((idle_poll_minutes * 60) + 2, check_idleness_timer, NULL);
+
 	purple_idle_touch();
 
 	return FALSE;
@@ -315,11 +318,6 @@
 void
 purple_idle_init()
 {
-	/* Add the timer to check if we're idle.
-	 * IDLEMARK + 1 as the boundary,
-	 * +1 more for g_timeout_add_seconds rounding. */
-	idle_timer = purple_timeout_add_seconds((IDLEMARK + 2), check_idleness_timer, NULL);
-
 	purple_signal_connect(purple_conversations_get_handle(), "sent-im-msg",
 						purple_idle_get_handle(),
 						PURPLE_CALLBACK(im_msg_sent_cb), NULL);
--- a/libpurple/notify.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/notify.c	Thu Aug 02 04:16:37 2007 +0000
@@ -112,6 +112,10 @@
 		info            = g_new0(PurpleNotifyInfo, 1);
 		info->type      = PURPLE_NOTIFY_EMAIL;
 		info->handle    = handle;
+
+		purple_signal_emit(purple_notify_get_handle(), "displaying-email-notification",
+							subject, from, to, url);
+
 		info->ui_handle = ops->notify_email(handle, subject, from, to, url);
 		info->cb = cb;
 		info->cb_user_data = user_data;
@@ -164,6 +168,10 @@
 		info            = g_new0(PurpleNotifyInfo, 1);
 		info->type      = PURPLE_NOTIFY_EMAILS;
 		info->handle    = handle;
+
+		purple_signal_emit(purple_notify_get_handle(), "displaying-emails-notification",
+							subjects, froms, tos, urls, count);
+
 		info->ui_handle = ops->notify_emails(handle, count, detailed, subjects,
 											 froms, tos, urls);
 		info->cb = cb;
@@ -799,6 +807,21 @@
 {
 	gpointer handle = purple_notify_get_handle();
 
+	purple_signal_register(handle, "displaying-email-notification",
+						 purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER, NULL, 4,
+						 purple_value_new(PURPLE_TYPE_STRING),
+						 purple_value_new(PURPLE_TYPE_STRING),
+						 purple_value_new(PURPLE_TYPE_STRING),
+						 purple_value_new(PURPLE_TYPE_STRING));
+
+	purple_signal_register(handle, "displaying-emails-notification",
+						 purple_marshal_VOID__POINTER_POINTER_POINTER_POINTER_UINT, NULL, 5,
+						 purple_value_new(PURPLE_TYPE_POINTER),
+						 purple_value_new(PURPLE_TYPE_POINTER),
+						 purple_value_new(PURPLE_TYPE_POINTER),
+						 purple_value_new(PURPLE_TYPE_POINTER),
+						 purple_value_new(PURPLE_TYPE_UINT));
+
 	purple_signal_register(handle, "displaying-userinfo",
 						 purple_marshal_VOID__POINTER_POINTER_POINTER, NULL, 3,
 						 purple_value_new(PURPLE_TYPE_SUBTYPE,
--- a/libpurple/plugins/log_reader.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/plugins/log_reader.c	Thu Aug 02 04:16:37 2007 +0000
@@ -874,7 +874,8 @@
 	GString *text = NULL;
 	xmlnode *message;
 
-	*flags = PURPLE_LOG_READ_NO_NEWLINE;
+	if (flags != NULL)
+		*flags = PURPLE_LOG_READ_NO_NEWLINE;
 	g_return_val_if_fail(log != NULL, g_strdup(""));
 
 	data = log->logger_data;
--- a/libpurple/plugins/signals-test.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/plugins/signals-test.c	Thu Aug 02 04:16:37 2007 +0000
@@ -522,6 +522,26 @@
 }
 
 /**************************************************************************
+ * Notify signals callbacks
+ **************************************************************************/
+static void
+notify_email_cb(char *subject, char *from, char *to, char *url) {
+	purple_debug_misc("signals test", "notify email: subject=%s, from=%s, to=%s, url=%s\n",
+					subject, from, to, url);
+}
+
+static void
+notify_emails_cb(char **subjects, char **froms, char **tos, char **urls, guint count) {
+	int i;
+	purple_debug_misc("signals test", "notify emails: count=%d\n", count);
+	for(i=0; i<count && i<5; i++) {
+		if(subjects[i]==NULL || froms[i]==NULL || tos[i]==NULL || urls[i]==NULL) continue;
+		purple_debug_misc("signals test", "notify emails[%d]: subject=%s, from=%s, to=%s, url=%s\n",
+			i, subjects[i], froms[i], tos[i], urls[i]);
+	}
+}
+
+/**************************************************************************
  * Plugin stuff
  **************************************************************************/
 static gboolean
@@ -535,6 +555,7 @@
 	void *ciphers_handle  = purple_ciphers_get_handle();
 	void *ft_handle       = purple_xfers_get_handle();
 	void *sound_handle    = purple_sounds_get_handle();
+	void *notify_handle   = purple_notify_get_handle();
 
 	/* Accounts subsystem signals */
 	purple_signal_connect(accounts_handle, "account-connecting",
@@ -666,6 +687,12 @@
 	purple_signal_connect(sound_handle, "playing-sound-event", plugin,
 	                    PURPLE_CALLBACK(sound_playing_event_cb), NULL);
 
+	/* Notify signals */
+	purple_signal_connect(notify_handle, "displaying-email-notification",
+						plugin, PURPLE_CALLBACK(notify_email_cb), NULL);
+	purple_signal_connect(notify_handle, "displaying-emails-notification",
+						plugin, PURPLE_CALLBACK(notify_emails_cb), NULL);
+
 	return TRUE;
 }
 
--- a/libpurple/protocols/bonjour/Makefile.am	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/bonjour/Makefile.am	Thu Aug 02 04:16:37 2007 +0000
@@ -17,7 +17,9 @@
 	mdns_common.h \
 	mdns_howl.c \
 	mdns_howl.h \
-	mdns_types.h
+	mdns_types.h \
+	parser.c \
+	parser.h
 
 AM_CFLAGS = $(st) -DUSE_BONJOUR_HOWL
 
@@ -36,7 +38,7 @@
 st =
 pkg_LTLIBRARIES       = libbonjour.la
 libbonjour_la_SOURCES = $(BONJOURSOURCES)
-libbonjour_la_LIBADD   = $(GLIB_LIBS) $(HOWL_LIBS)
+libbonjour_la_LIBADD   = $(GLIB_LIBS) $(HOWL_LIBS) $(LIBXML_LIBS)
 
 endif
 
@@ -46,4 +48,5 @@
 	-I$(top_builddir)/libpurple \
 	$(GLIB_CFLAGS) \
 	$(DEBUG_CFLAGS) \
-	$(HOWL_CFLAGS)
+	$(HOWL_CFLAGS) \
+	$(LIBXML_CFLAGS)
--- a/libpurple/protocols/bonjour/Makefile.mingw	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/bonjour/Makefile.mingw	Thu Aug 02 04:16:37 2007 +0000
@@ -30,12 +30,14 @@
 			-I$(GTK_TOP)/include/glib-2.0 \
 			-I$(GTK_TOP)/lib/glib-2.0/include \
 			-I$(BONJOUR_TOP)/include \
+			-I$(LIBXML2_TOP)/include \
 			-I$(PURPLE_TOP) \
 			-I$(PURPLE_TOP)/win32 \
 			-I$(PIDGIN_TREE_TOP)
 
 LIB_PATHS +=		-L$(GTK_TOP)/lib \
 			-L$(BONJOUR_TOP)/lib \
+			-L$(LIBXML2_TOP)/lib \
 			-L$(PURPLE_TOP)
 
 ##
@@ -45,6 +47,7 @@
 			buddy.c \
 			mdns_common.c \
 			mdns_win32.c \
+			parser.c \
 			jabber.c
 
 OBJECTS = $(C_SRC:%.c=%.o)
@@ -58,6 +61,7 @@
 			-lintl \
 			-ldnssd \
 			-lnetapi32 \
+			-lxml2 \
 			-lpurple
 
 include $(PIDGIN_COMMON_RULES)
--- a/libpurple/protocols/bonjour/jabber.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/bonjour/jabber.c	Thu Aug 02 04:16:37 2007 +0000
@@ -42,6 +42,7 @@
 #include "util.h"
 
 #include "jabber.h"
+#include "parser.h"
 #include "bonjour.h"
 #include "buddy.h"
 
@@ -109,9 +110,10 @@
 }
 
 static void
-_jabber_parse_and_write_message_to_ui(xmlnode *message_node, PurpleConnection *connection, PurpleBuddy *pb)
+_jabber_parse_and_write_message_to_ui(xmlnode *message_node, PurpleBuddy *pb)
 {
 	xmlnode *body_node, *html_node, *events_node;
+	PurpleConnection *gc = pb->account->gc;
 	char *body, *html_body = NULL;
 	const char *ichat_balloon_color = NULL;
 	const char *ichat_text_color = NULL;
@@ -186,7 +188,7 @@
 	/* TODO: Should we do something with "composing_event" here? */
 
 	/* Send the message to the UI */
-	serv_got_im(connection, pb->name, body, 0, time(NULL));
+	serv_got_im(gc, pb->name, body, 0, time(NULL));
 
 	g_free(body);
 	g_free(html_body);
@@ -218,37 +220,6 @@
 	}
 }
 
-static gint
-_read_data(gint socket, char **message)
-{
-	GString *data = g_string_new("");
-	char partial_data[512];
-	gint total_message_length = 0;
-	gint partial_message_length = 0;
-
-	/* Read chunks of 512 bytes till the end of the data */
-	while ((partial_message_length = recv(socket, partial_data, 512, 0)) > 0)
-	{
-		g_string_append_len(data, partial_data, partial_message_length);
-		total_message_length += partial_message_length;
-	}
-
-	if (partial_message_length == -1)
-	{
-		if (errno != EAGAIN)
-			purple_debug_warning("bonjour", "receive error: %s\n", strerror(errno));
-		if (total_message_length == 0) {
-			return -1;
-		}
-	}
-
-	*message = g_string_free(data, FALSE);
-	if (total_message_length != 0)
-		purple_debug_info("bonjour", "Receive: -%s- %d bytes\n", *message, total_message_length);
-
-	return total_message_length;
-}
-
 static void
 _send_data_write_cb(gpointer data, gint source, PurpleInputCondition cond)
 {
@@ -303,7 +274,8 @@
 	/* If we're not ready to actually send, append it to the buffer */
 	if (bconv->tx_handler != -1
 			|| bconv->connect_data != NULL
-			|| !bconv->stream_started
+			|| !bconv->sent_stream_start
+			|| !bconv->recv_stream_start
 			|| purple_circ_buffer_get_max_read(bconv->tx_buf) > 0) {
 		ret = -1;
 		errno = EAGAIN;
@@ -341,21 +313,32 @@
 	return ret;
 }
 
+void bonjour_jabber_process_packet(PurpleBuddy *pb, xmlnode *packet) {
+	if (!strcmp(packet->name, "message"))
+		_jabber_parse_and_write_message_to_ui(packet, pb);
+	else
+		purple_debug_warning("bonjour", "Unknown packet: %s\n",
+				packet->name);
+}
+
+
 static void
 _client_socket_handler(gpointer data, gint socket, PurpleInputCondition condition)
 {
-	char *message = NULL;
-	gint message_length;
 	PurpleBuddy *pb = data;
-	PurpleAccount *account = pb->account;
-	BonjourBuddy *bb = pb->proto_data;
-	gboolean closed_conversation = FALSE;
-	xmlnode *message_node;
+	gint len, message_length;
+	static char message[4096];
+
+	/*TODO: use a static buffer */
 
 	/* Read the data from the socket */
-	if ((message_length = _read_data(socket, &message)) == -1) {
+	if ((len = recv(socket, message, sizeof(message) - 1, 0)) == -1) {
 		/* There have been an error reading from the socket */
 		if (errno != EAGAIN) {
+			BonjourBuddy *bb = pb->proto_data;
+
+			purple_debug_warning("bonjour", "receive error: %s\n", strerror(errno));
+
 			bonjour_jabber_close_conversation(bb->conversation);
 			bb->conversation = NULL;
 
@@ -363,62 +346,71 @@
 			 * If they try to send another message it'll reconnect */
 		}
 		return;
-	} else if (message_length == 0) { /* The other end has closed the socket */
-		closed_conversation = TRUE;
+	} else if (len == 0) { /* The other end has closed the socket */
+		purple_debug_warning("bonjour", "Connection closed (without stream end) by %s.\n", pb->name);
+		bonjour_jabber_stream_ended(pb);
+		return;
 	} else {
+		message_length = len;
 		message[message_length] = '\0';
 
-		while (g_ascii_iscntrl(message[message_length - 1])) {
+		while (message_length > 0 && g_ascii_iscntrl(message[message_length - 1])) {
 			message[message_length - 1] = '\0';
 			message_length--;
 		}
 	}
 
-	/* Parse the message into an XMLnode for analysis */
-	message_node = xmlnode_from_str(message, strlen(message));
+	purple_debug_info("bonjour", "Receive: -%s- %d bytes\n", message, len);
+
+	bonjour_parser_process(pb, message, message_length);
+}
 
-	/*
-	 * Check that this is not the end of the conversation.  This is
-	 * using a magic string, but xmlnode won't play nice when just
-	 * parsing an end tag
-	 */
-	if (closed_conversation || purple_str_has_prefix(message, STREAM_END)) {
-		PurpleConversation *conv;
+void bonjour_jabber_stream_ended(PurpleBuddy *pb) {
+	BonjourBuddy *bb = pb->proto_data;
+	PurpleConversation *conv;
+
+	purple_debug_info("bonjour", "Recieved conversation close notification from %s.\n", pb->name);
+
+	/* Close the socket, clear the watcher and free memory */
+	bonjour_jabber_close_conversation(bb->conversation);
+	bb->conversation = NULL;
 
-		/* Close the socket, clear the watcher and free memory */
-		bonjour_jabber_close_conversation(bb->conversation);
-		bb->conversation = NULL;
+	/* Inform the user that the conversation has been closed */
+	conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, pb->name, pb->account);
+	if (conv != NULL) {
+		char *tmp = g_strdup_printf(_("%s has closed the conversation."), pb->name);
+		purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL));
+		g_free(tmp);
+	}
+}
 
-		/* Inform the user that the conversation has been closed */
-		conv = purple_find_conversation_with_account(PURPLE_CONV_TYPE_IM, pb->name, account);
-		if (conv != NULL) {
-			char *tmp = g_strdup_printf(_("%s has closed the conversation."), pb->name);
-			purple_conversation_write(conv, NULL, tmp, PURPLE_MESSAGE_SYSTEM, time(NULL));
-			g_free(tmp);
-		}
-	} else if (message_node != NULL) {
-		/* Parse the message to get the data and send to the ui */
-		_jabber_parse_and_write_message_to_ui(message_node, account->gc, pb);
-	} else {
-		/* TODO: Deal with receiving only a partial message */
+void bonjour_jabber_stream_started(PurpleBuddy *pb) {
+	BonjourBuddy *bb = pb->proto_data;
+	BonjourJabberConversation *bconv = bb->conversation;
+
+	/* If the stream has been completely started, we can start doing stuff */
+	if (bconv->sent_stream_start && bconv->recv_stream_start && purple_circ_buffer_get_max_read(bconv->tx_buf) > 0) {
+		/* Watch for when we can write the buffered messages */
+		bconv->tx_handler = purple_input_add(bconv->socket, PURPLE_INPUT_WRITE,
+			_send_data_write_cb, pb);
+		/* We can probably write the data right now. */
+		_send_data_write_cb(pb, bconv->socket, PURPLE_INPUT_WRITE);
 	}
 
-	g_free(message);
-	if (message_node != NULL)
-		xmlnode_free(message_node);
 }
 
 struct _stream_start_data {
 	char *msg;
-	PurpleInputFunction tx_handler_cb;
 };
 
+
 static void
 _start_stream(gpointer data, gint source, PurpleInputCondition condition)
 {
 	PurpleBuddy *pb = data;
 	BonjourBuddy *bb = pb->proto_data;
-	struct _stream_start_data *ss = bb->conversation->stream_data;
+	BonjourJabberConversation *bconv = bb->conversation;
+	struct _stream_start_data *ss = bconv->stream_data;
 	int len, ret;
 
 	len = strlen(ss->msg);
@@ -441,7 +433,7 @@
 				  _("Unable to send the message, the conversation couldn't be started."),
 				  PURPLE_MESSAGE_SYSTEM, time(NULL));
 
-		bonjour_jabber_close_conversation(bb->conversation);
+		bonjour_jabber_close_conversation(bconv);
 		bb->conversation = NULL;
 
 		return;
@@ -455,22 +447,67 @@
 		return;
 	}
 
-	/* Stream started; process the send buffer if there is one*/
-	purple_input_remove(bb->conversation->tx_handler);
-	bb->conversation->tx_handler= -1;
-
-	bb->conversation->stream_started = TRUE;
-
 	g_free(ss->msg);
 	g_free(ss);
-	bb->conversation->stream_data = NULL;
+	bconv->stream_data = NULL;
+
+	/* Stream started; process the send buffer if there is one */
+	purple_input_remove(bconv->tx_handler);
+	bconv->tx_handler= -1;
+	bconv->sent_stream_start = TRUE;
+
+	bonjour_jabber_stream_started(pb);
+
+}
+
+static gboolean bonjour_jabber_stream_init(PurpleBuddy *pb, int client_socket)
+{
+	int ret, len;
+	char *stream_start;
+	BonjourBuddy *bb = pb->proto_data;
+
+	stream_start = g_strdup_printf(DOCTYPE, purple_account_get_username(pb->account),
+								   purple_buddy_get_name(pb));
+	len = strlen(stream_start);
+
+	/* Start the stream */
+	ret = send(client_socket, stream_start, len, 0);
+
+	if (ret == -1 && errno == EAGAIN)
+		ret = 0;
+	else if (ret <= 0) {
+		const char *err = strerror(errno);
 
-	if (ss->tx_handler_cb) {
-		bb->conversation->tx_handler = purple_input_add(source, PURPLE_INPUT_WRITE,
-			ss->tx_handler_cb, pb);
-		/* We can probably write the data now. */
-		(ss->tx_handler_cb)(pb, source, PURPLE_INPUT_WRITE);
+		purple_debug_error("bonjour", "Error starting stream with buddy %s at %s:%d error: %s\n",
+				   purple_buddy_get_name(pb), bb->ip ? bb->ip : "(null)", bb->port_p2pj, err ? err : "(null)");
+
+		close(client_socket);
+		g_free(stream_start);
+
+		return FALSE;
 	}
+
+	/* This is unlikely to happen */
+	if (ret < len) {
+		struct _stream_start_data *ss = g_new(struct _stream_start_data, 1);
+		ss->msg = g_strdup(stream_start + ret);
+		bb->conversation->stream_data = ss;
+		/* Finish sending the stream start */
+		bb->conversation->tx_handler = purple_input_add(client_socket,
+			PURPLE_INPUT_WRITE, _start_stream, pb);
+	} else
+		bb->conversation->sent_stream_start = TRUE;
+
+	g_free(stream_start);
+
+	/* setup the parser fresh for each stream */
+	bonjour_parser_setup(bb->conversation);
+
+	bb->conversation->socket = client_socket;
+	bb->conversation->rx_handler = purple_input_add(client_socket,
+		PURPLE_INPUT_READ, _client_socket_handler, pb);
+
+	return TRUE;
 }
 
 static void
@@ -496,6 +533,7 @@
 
 	/* Look for the buddy that has opened the conversation and fill information */
 	address_text = inet_ntoa(their_addr.sin_addr);
+	purple_debug_info("bonjour", "Received incoming connection from %s\n.", address_text);
 	cbba = g_new0(struct _check_buddy_by_address_t, 1);
 	cbba->address = address_text;
 	cbba->pb = &pb;
@@ -513,49 +551,15 @@
 	/* Check if the conversation has been previously started */
 	if (bb->conversation == NULL)
 	{
-		int ret, len;
-		char *stream_start = g_strdup_printf(DOCTYPE, purple_account_get_username(pb->account),
-			purple_buddy_get_name(pb));
-
-		len = strlen(stream_start);
-
-		/* Start the stream */
-		ret = send(client_socket, stream_start, len, 0);
+		bb->conversation = bonjour_jabber_conv_new();
 
-		if (ret == -1 && errno == EAGAIN)
-			ret = 0;
-		else if (ret <= 0) {
-			const char *err = strerror(errno);
-
-			purple_debug_error("bonjour", "Error starting stream with buddy %s at %s:%d error: %s\n",
-					   purple_buddy_get_name(pb), bb->ip ? bb->ip : "(null)", bb->port_p2pj, err ? err : "(null)");
-
+		if (!bonjour_jabber_stream_init(pb, client_socket)) {
 			close(client_socket);
-			g_free(stream_start);
-
 			return;
 		}
 
-		bb->conversation = bonjour_jabber_conv_new();
-		bb->conversation->socket = client_socket;
-		bb->conversation->rx_handler = purple_input_add(client_socket,
-			PURPLE_INPUT_READ, _client_socket_handler, pb);
-
-		/* This is unlikely to happen */
-		if (ret < len) {
-			struct _stream_start_data *ss = g_new(struct _stream_start_data, 1);
-			ss->msg = g_strdup(stream_start + ret);
-			ss->tx_handler_cb = NULL; /* We have nothing to write yet */
-			bb->conversation->stream_data = ss;
-			/* Finish sending the stream start */
-			bb->conversation->tx_handler = purple_input_add(client_socket,
-				PURPLE_INPUT_WRITE, _start_stream, pb);
-		} else {
-			bb->conversation->stream_started = TRUE;
-		}
-
-		g_free(stream_start);
 	} else {
+		purple_debug_warning("bonjour", "Ignoring incoming connection because an existing connection exists.\n");
 		close(client_socket);
 	}
 }
@@ -637,8 +641,6 @@
 {
 	PurpleBuddy *pb = data;
 	BonjourBuddy *bb = pb->proto_data;
-	int len, ret;
-	char *stream_start = g_strdup_printf(DOCTYPE, purple_account_get_username(pb->account), purple_buddy_get_name(pb));
 
 	bb->conversation->connect_data = NULL;
 
@@ -659,14 +661,7 @@
 		return;
 	}
 
-	len = strlen(stream_start);
-
-	/* Start the stream and send queued messages */
-	ret = send(source, stream_start, len, 0);
-
-	if (ret == -1 && errno == EAGAIN)
-		ret = 0;
-	else if (ret <= 0) {
+	if (!bonjour_jabber_stream_init(pb, source)) {
 		const char *err = strerror(errno);
 		PurpleConversation *conv;
 
@@ -682,37 +677,8 @@
 		close(source);
 		bonjour_jabber_close_conversation(bb->conversation);
 		bb->conversation = NULL;
-
-		g_free(stream_start);
-
 		return;
 	}
-
-	bb->conversation->socket = source;
-	bb->conversation->rx_handler = purple_input_add(source,
-		PURPLE_INPUT_READ, _client_socket_handler, pb);
-
-	/* This is unlikely to happen */
-	if (ret < len) {
-		struct _stream_start_data *ss = g_new(struct _stream_start_data, 1);
-		ss->msg = g_strdup(stream_start + ret);
-		ss->tx_handler_cb = _send_data_write_cb;
-		bb->conversation->stream_data = ss;
-		/* Finish sending the stream start */
-		bb->conversation->tx_handler = purple_input_add(source,
-			PURPLE_INPUT_WRITE, _start_stream, pb);
-	}
-	/* Process the send buffer */
-	else {
-		bb->conversation->stream_started = TRUE;
-		/* Watch for when we can write the buffered messages */
-		bb->conversation->tx_handler = purple_input_add(source, PURPLE_INPUT_WRITE,
-			_send_data_write_cb, pb);
-		/* We can probably write the data now. */
-		_send_data_write_cb(pb, source, PURPLE_INPUT_WRITE);
-	}
-
-	g_free(stream_start);
 }
 
 int
@@ -806,7 +772,7 @@
 		/* Close the socket and remove the watcher */
 		if (bconv->socket >= 0) {
 			/* Send the end of the stream to the other end of the conversation */
-			if (bconv->stream_started)
+			if (bconv->sent_stream_start)
 				send(bconv->socket, STREAM_END, strlen(STREAM_END), 0);
 			/* TODO: We're really supposed to wait for "</stream:stream>" before closing the socket */
 			close(bconv->socket);
@@ -825,6 +791,10 @@
 			g_free(ss->msg);
 			g_free(ss);
 		}
+
+		if (bconv->context != NULL)
+			bonjour_parser_setup(bconv);
+
 		g_free(bconv);
 	}
 }
--- a/libpurple/protocols/bonjour/jabber.h	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/bonjour/jabber.h	Thu Aug 02 04:16:37 2007 +0000
@@ -26,6 +26,10 @@
 #ifndef _BONJOUR_JABBER_H_
 #define _BONJOUR_JABBER_H_
 
+#include <libxml/parser.h>
+
+#include "xmlnode.h"
+
 #include "account.h"
 #include "circbuffer.h"
 
@@ -43,9 +47,12 @@
 	guint rx_handler;
 	guint tx_handler;
 	PurpleCircBuffer *tx_buf;
-	gboolean stream_started;
+	gboolean sent_stream_start;
+	gboolean recv_stream_start;
 	PurpleProxyConnectData *connect_data;
 	gpointer stream_data;
+	xmlParserCtxt *context;
+	xmlnode *current;
 } BonjourJabberConversation;
 
 /**
@@ -60,6 +67,12 @@
 
 void bonjour_jabber_close_conversation(BonjourJabberConversation *bconv);
 
+void bonjour_jabber_stream_started(PurpleBuddy *pb);
+
+void bonjour_jabber_stream_ended(PurpleBuddy *pb);
+
+void bonjour_jabber_process_packet(PurpleBuddy *pb, xmlnode *packet);
+
 void bonjour_jabber_stop(BonjourJabber *data);
 
 #endif /* _BONJOUR_JABBER_H_ */
--- a/libpurple/protocols/bonjour/mdns_howl.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/bonjour/mdns_howl.c	Thu Aug 02 04:16:37 2007 +0000
@@ -14,6 +14,7 @@
  *  Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA.
  */
 
+#include "internal.h"
 #include "mdns_howl.h"
 
 #include "debug.h"
--- a/libpurple/protocols/bonjour/mdns_win32.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/bonjour/mdns_win32.c	Thu Aug 02 04:16:37 2007 +0000
@@ -84,6 +84,8 @@
 			buddy->txt_query_fd = purple_input_add(fd, PURPLE_INPUT_READ, _mdns_handle_event, buddy->txt_query);
 
 			bonjour_buddy_add_to_purple(buddy);
+
+			purple_debug_info("bonjour", "Found buddy %s at %s:%d\n", buddy->name, buddy->ip, buddy->port_p2pj);
 		}
 		else
 			bonjour_buddy_delete(buddy);
@@ -262,6 +264,7 @@
 		switch (type)
 		{
 			case PUBLISH_START:
+				purple_debug_info("bonjour", "Registering service on port %d\n", data->port_p2pj);
 				err = DNSServiceRegister(&data->advertisement, 0, 0, purple_account_get_username(data->account), ICHAT_SERVICE,
 					NULL, NULL, htons(data->port_p2pj), TXTRecordGetLength(&dns_data), TXTRecordGetBytesPtr(&dns_data),
 					_mdns_service_register_callback, NULL);
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/bonjour/parser.c	Thu Aug 02 04:16:37 2007 +0000
@@ -0,0 +1,194 @@
+/*
+ * purple - Bonjour Jabber XML parser stuff
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+#include "internal.h"
+
+#include <libxml/parser.h>
+
+#include "connection.h"
+#include "debug.h"
+#include "jabber.h"
+#include "parser.h"
+#include "util.h"
+#include "xmlnode.h"
+
+static void
+bonjour_parser_element_start_libxml(void *user_data,
+				   const xmlChar *element_name, const xmlChar *prefix, const xmlChar *namespace,
+				   int nb_namespaces, const xmlChar **namespaces,
+				   int nb_attributes, int nb_defaulted, const xmlChar **attributes)
+{
+	PurpleBuddy *pb = user_data;
+	BonjourBuddy *bb = pb->proto_data;
+	BonjourJabberConversation *bconv = bb->conversation;
+
+	xmlnode *node;
+	int i;
+
+	if(!element_name) {
+		return;
+	} else if(!xmlStrcmp(element_name, (xmlChar*) "stream")) {
+		bconv->recv_stream_start = TRUE;
+		bonjour_jabber_stream_started(pb);
+	} else {
+
+		if(bconv->current)
+			node = xmlnode_new_child(bconv->current, (const char*) element_name);
+		else
+			node = xmlnode_new((const char*) element_name);
+		xmlnode_set_namespace(node, (const char*) namespace);
+
+		for(i=0; i < nb_attributes * 5; i+=5) {
+			char *txt;
+			int attrib_len = attributes[i+4] - attributes[i+3];
+			char *attrib = g_malloc(attrib_len + 1);
+			char *attrib_ns = NULL;
+
+			if (attributes[i+2]) {
+				attrib_ns = g_strdup((char*)attributes[i+2]);;
+			}
+
+			memcpy(attrib, attributes[i+3], attrib_len);
+			attrib[attrib_len] = '\0';
+
+			txt = attrib;
+			attrib = purple_unescape_html(txt);
+			g_free(txt);
+			xmlnode_set_attrib_with_namespace(node, (const char*) attributes[i], attrib_ns, attrib);
+			g_free(attrib);
+			g_free(attrib_ns);
+		}
+
+		bconv->current = node;
+	}
+}
+
+static void
+bonjour_parser_element_end_libxml(void *user_data, const xmlChar *element_name,
+				 const xmlChar *prefix, const xmlChar *namespace)
+{
+	PurpleBuddy *pb = user_data;
+	BonjourBuddy *bb = pb->proto_data;
+	BonjourJabberConversation *bconv = bb->conversation;
+
+	if(!bconv->current) {
+		/* We don't keep a reference to the start stream xmlnode,
+		 * so we have to check for it here to close the conversation */
+		if(!xmlStrcmp(element_name, (xmlChar*) "stream")) {
+			bonjour_jabber_stream_ended(pb);
+		}
+		return;
+	}
+
+	if(bconv->current->parent) {
+		if(!xmlStrcmp((xmlChar*) bconv->current->name, element_name))
+			bconv->current = bconv->current->parent;
+	} else {
+		xmlnode *packet = bconv->current;
+		bconv->current = NULL;
+		bonjour_jabber_process_packet(pb, packet);
+		xmlnode_free(packet);
+	}
+}
+
+static void
+bonjour_parser_element_text_libxml(void *user_data, const xmlChar *text, int text_len)
+{
+	PurpleBuddy *pb = user_data;
+	BonjourBuddy *bb = pb->proto_data;
+	BonjourJabberConversation *bconv = bb->conversation;
+
+	if(!bconv->current)
+		return;
+
+	if(!text || !text_len)
+		return;
+
+	xmlnode_insert_data(bconv->current, (const char*) text, text_len);
+}
+
+static xmlSAXHandler bonjour_parser_libxml = {
+	.internalSubset         = NULL,
+	.isStandalone           = NULL,
+	.hasInternalSubset      = NULL,
+	.hasExternalSubset      = NULL,
+	.resolveEntity          = NULL,
+	.getEntity              = NULL,
+	.entityDecl             = NULL,
+	.notationDecl           = NULL,
+	.attributeDecl          = NULL,
+	.elementDecl            = NULL,
+	.unparsedEntityDecl     = NULL,
+	.setDocumentLocator     = NULL,
+	.startDocument          = NULL,
+	.endDocument            = NULL,
+	.startElement           = NULL,
+	.endElement             = NULL,
+	.reference              = NULL,
+	.characters             = bonjour_parser_element_text_libxml,
+	.ignorableWhitespace    = NULL,
+	.processingInstruction  = NULL,
+	.comment                = NULL,
+	.warning                = NULL,
+	.error                  = NULL,
+	.fatalError             = NULL,
+	.getParameterEntity     = NULL,
+	.cdataBlock             = NULL,
+	.externalSubset         = NULL,
+	.initialized            = XML_SAX2_MAGIC,
+	._private               = NULL,
+	.startElementNs         = bonjour_parser_element_start_libxml,
+	.endElementNs           = bonjour_parser_element_end_libxml,
+	.serror                 = NULL
+};
+
+void
+bonjour_parser_setup(BonjourJabberConversation *bconv)
+{
+
+	/* This seems backwards, but it makes sense. The libxml code creates
+	 * the parser context when you try to use it (this way, it can figure
+	 * out the encoding at creation time. So, setting up the parser is
+	 * just a matter of destroying any current parser. */
+	if (bconv->context) {
+		xmlParseChunk(bconv->context, NULL,0,1);
+		xmlFreeParserCtxt(bconv->context);
+		bconv->context = NULL;
+	}
+}
+
+
+void bonjour_parser_process(PurpleBuddy *pb, const char *buf, int len)
+{
+	BonjourBuddy *bb = pb->proto_data;
+
+	if (bb->conversation->context ==  NULL) {
+		/* libxml inconsistently starts parsing on creating the
+		 * parser, so do a ParseChunk right afterwards to force it. */
+		bb->conversation->context = xmlCreatePushParserCtxt(&bonjour_parser_libxml, pb, buf, len, NULL);
+		xmlParseChunk(bb->conversation->context, "", 0, 0);
+	} else if (xmlParseChunk(bb->conversation->context, buf, len, 0) < 0) {
+		/* TODO: What should we do here - I assume we should display an error or something (maybe just print something to the conv?) */
+		purple_debug_error("bonjour", "Error parsing xml.\n");
+	}
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/bonjour/parser.h	Thu Aug 02 04:16:37 2007 +0000
@@ -0,0 +1,33 @@
+/**
+ * @file parser.h Bonjour Jabber XML parser functions
+ *
+ * purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ */
+#ifndef _PURPLE_BONJOUR_PARSER_H_
+#define _PURPLE_BONJOUR_PARSER_H_
+
+#include "buddy.h"
+#include "jabber.h"
+
+void bonjour_parser_setup(BonjourJabberConversation *bconv);
+void bonjour_parser_process(PurpleBuddy *pb, const char *buf, int len);
+
+#endif /* _PURPLE_BONJOUR_PARSER_H_ */
--- a/libpurple/protocols/jabber/google.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/jabber/google.c	Thu Aug 02 04:16:37 2007 +0000
@@ -119,8 +119,8 @@
 	g_free(to_name);
 	g_free(tos);
 	g_free(froms);
-	for (; i >= 0; i--)
-		g_free(subjects[i]);
+	for (; i > 0; i--)
+		g_free(subjects[i - 1]);
 	g_free(subjects);
 	g_free(urls);
 
--- a/libpurple/protocols/jabber/jabber.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/jabber/jabber.c	Thu Aug 02 04:16:37 2007 +0000
@@ -1618,6 +1618,10 @@
 		const char *cmd, char **args, char **error, void *data)
 {
 	JabberChat *chat = jabber_chat_find_by_conv(conv);
+
+	if (!chat)
+		return PURPLE_CMD_RET_FAILED;
+
 	jabber_chat_request_room_configure(chat);
 	return PURPLE_CMD_RET_OK;
 }
@@ -1626,6 +1630,10 @@
 		const char *cmd, char **args, char **error, void *data)
 {
 	JabberChat *chat = jabber_chat_find_by_conv(conv);
+
+	if (!chat)
+		return PURPLE_CMD_RET_FAILED;
+
 	jabber_chat_register(chat);
 	return PURPLE_CMD_RET_OK;
 }
@@ -1634,6 +1642,10 @@
 		const char *cmd, char **args, char **error, void *data)
 {
 	JabberChat *chat = jabber_chat_find_by_conv(conv);
+
+	if (!chat)
+		return PURPLE_CMD_RET_FAILED;
+
 	jabber_chat_change_topic(chat, args ? args[0] : NULL);
 	return PURPLE_CMD_RET_OK;
 }
@@ -1643,7 +1655,7 @@
 {
 	JabberChat *chat = jabber_chat_find_by_conv(conv);
 
-	if(!args || !args[0])
+	if(!chat || !args || !args[0])
 		return PURPLE_CMD_RET_FAILED;
 
 	jabber_chat_change_nick(chat, args[0]);
@@ -1654,6 +1666,10 @@
 		const char *cmd, char **args, char **error, void *data)
 {
 	JabberChat *chat = jabber_chat_find_by_conv(conv);
+
+	if (!chat)
+		return PURPLE_CMD_RET_FAILED;
+
 	jabber_chat_part(chat, args ? args[0] : NULL);
 	return PURPLE_CMD_RET_OK;
 }
@@ -1663,7 +1679,7 @@
 {
 	JabberChat *chat = jabber_chat_find_by_conv(conv);
 
-	if(!args || !args[0])
+	if(!chat || !args || !args[0])
 		return PURPLE_CMD_RET_FAILED;
 
 	if(!jabber_chat_ban_user(chat, args[0], args[1])) {
@@ -1679,7 +1695,7 @@
 {
 	JabberChat *chat = jabber_chat_find_by_conv(conv);
 
-	if (!args || !args[0] || !args[1])
+	if (!chat || !args || !args[0] || !args[1])
 		return PURPLE_CMD_RET_FAILED;
 
 	if (strcmp(args[1], "owner") != 0 && 
@@ -1704,7 +1720,7 @@
 {
 	JabberChat *chat;
 
-	if (!args || !args[0] || !args[1])
+	if (!chat || !args || !args[0] || !args[1])
 		return PURPLE_CMD_RET_FAILED;
 
 	if (strcmp(args[1], "moderator") != 0 &&
@@ -1745,7 +1761,7 @@
 	JabberChat *chat = jabber_chat_find_by_conv(conv);
 	GHashTable *components;
 
-	if(!args || !args[0])
+	if(!chat || !args || !args[0])
 		return PURPLE_CMD_RET_FAILED;
 
 	components = g_hash_table_new_full(g_str_hash, g_str_equal, NULL, NULL);
@@ -1767,7 +1783,7 @@
 {
 	JabberChat *chat = jabber_chat_find_by_conv(conv);
 
-	if(!args || !args[0])
+	if(!chat || !args || !args[0])
 		return PURPLE_CMD_RET_FAILED;
 
 	if(!jabber_chat_kick_user(chat, args[0], args[1])) {
@@ -1784,6 +1800,9 @@
 	JabberChat *chat = jabber_chat_find_by_conv(conv);
 	char *who;
 
+	if (!chat)
+		return PURPLE_CMD_RET_FAILED;
+
 	who = g_strdup_printf("%s@%s/%s", chat->room, chat->server, args[0]);
 
 	jabber_message_send_im(purple_conversation_get_gc(conv), who, args[1], 0);
--- a/libpurple/protocols/jabber/presence.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/jabber/presence.c	Thu Aug 02 04:16:37 2007 +0000
@@ -372,6 +372,12 @@
 										_("_Configure Room"), G_CALLBACK(jabber_chat_request_room_configure),
 										_("_Accept Defaults"), G_CALLBACK(jabber_chat_create_instant_room));
 						}
+					} else if(code && !strcmp(code, "210")) {
+						/*  server rewrote room-nick */
+						if((chat = jabber_chat_find(js, jid->node, jid->domain))) {
+							g_free(chat->handle);
+							chat->handle = g_strdup(jid->resource);
+						}
 					}
 				}
 				if((z = xmlnode_get_child(y, "item"))) {
@@ -407,7 +413,8 @@
 
 			if(chat->conv) {
 				title = g_strdup_printf(_("Error in chat %s"), from);
-				serv_got_chat_left(js->gc, chat->id);
+				if (g_hash_table_size(chat->members) == 0)
+					serv_got_chat_left(js->gc, chat->id);
 			} else {
 				title = g_strdup_printf(_("Error joining chat %s"), from);
 			}
@@ -415,7 +422,9 @@
 			g_free(title);
 			g_free(msg);
 
-			jabber_chat_destroy(chat);
+			if (g_hash_table_size(chat->members) == 0)
+				/* Only destroy the chat if the error happened while joining */
+				jabber_chat_destroy(chat);
 			jabber_id_free(jid);
 			g_free(status);
 			g_free(room_jid);
--- a/libpurple/protocols/jabber/xdata.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/jabber/xdata.c	Thu Aug 02 04:16:37 2007 +0000
@@ -256,7 +256,7 @@
 					continue;
 
 				if(!(lbl = xmlnode_get_attrib(optnode, "label")))
-					label = value;
+					lbl = value;
 
 				data->values = g_slist_prepend(data->values, value);
 
--- a/libpurple/protocols/oscar/family_chatnav.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/oscar/family_chatnav.c	Thu Aug 02 04:16:37 2007 +0000
@@ -427,7 +427,7 @@
 	if (snac2->type == 0x0002) /* request chat rights */
 		ret = parseinfo_perms(od, conn, mod, frame, snac, bs, snac2);
 	else if (snac2->type == 0x0003) /* request exchange info */
-		purple_debug_misc("oscar", "chatnav_parse_info: resposne to exchange info\n");
+		purple_debug_misc("oscar", "chatnav_parse_info: response to exchange info\n");
 	else if (snac2->type == 0x0004) /* request room info */
 		purple_debug_misc("oscar", "chatnav_parse_info: response to room info\n");
 	else if (snac2->type == 0x0005) /* request more room info */
--- a/libpurple/protocols/oscar/family_feedbag.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/oscar/family_feedbag.c	Thu Aug 02 04:16:37 2007 +0000
@@ -695,18 +695,6 @@
 		cur = cur->next;
 	}
 
-	/* Check if there are empty groups and delete them */
-	cur = od->ssi.local;
-	while (cur) {
-		next = cur->next;
-		if (cur->type == AIM_SSI_TYPE_GROUP) {
-			aim_tlv_t *tlv = aim_tlv_gettlv(cur->data, 0x00c8, 1);
-			if (!tlv || !tlv->length)
-				aim_ssi_itemlist_del(&od->ssi.local, cur);
-		}
-		cur = next;
-	}
-
 	/* Check if the master group is empty */
 	if ((cur = aim_ssi_itemlist_find(od->ssi.local, 0x0000, 0x0000)) && (!cur->data))
 		aim_ssi_itemlist_del(&od->ssi.local, cur);
@@ -841,18 +829,39 @@
 	/* Modify the parent group */
 	aim_ssi_itemlist_rebuildgroup(od->ssi.local, group);
 
-	/* Check if we should delete the parent group */
-	if ((del = aim_ssi_itemlist_finditem(od->ssi.local, group, NULL, AIM_SSI_TYPE_GROUP)) && (!del->data)) {
-		aim_ssi_itemlist_del(&od->ssi.local, del);
+	/* Sync our local list with the server list */
+	return aim_ssi_sync(od);
+}
+
+/**
+ * Deletes a group from the list.
+ *
+ * @param od The oscar odion.
+ * @param group The name of the group.
+ * @return Return 0 if no errors, otherwise return the error number.
+ */
+int aim_ssi_delgroup(OscarData *od, const char *group)
+{
+	struct aim_ssi_item *del;
+	aim_tlv_t *tlv;
 
-		/* Modify the parent group */
-		aim_ssi_itemlist_rebuildgroup(od->ssi.local, NULL);
+	if (!od)
+		return -EINVAL;
+
+	/* Find the group */
+	if (!(del = aim_ssi_itemlist_finditem(od->ssi.local, group, NULL, AIM_SSI_TYPE_GROUP)))
+		return -EINVAL;
 
-		/* Check if we should delete the parent's parent (the master group) */
-		if ((del = aim_ssi_itemlist_find(od->ssi.local, 0x0000, 0x0000)) && (!del->data)) {
-			aim_ssi_itemlist_del(&od->ssi.local, del);
-		}
-	}
+	/* Don't delete the group if it's not empty */
+	tlv = aim_tlv_gettlv(del->data, 0x00c8, 1);
+	if (tlv && tlv->length > 0)
+		return -EINVAL;
+
+	/* Remove the item from the list */
+	aim_ssi_itemlist_del(&od->ssi.local, del);
+
+	/* Modify the parent group */
+	aim_ssi_itemlist_rebuildgroup(od->ssi.local, group);
 
 	/* Sync our local list with the server list */
 	return aim_ssi_sync(od);
--- a/libpurple/protocols/oscar/libaim.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/oscar/libaim.c	Thu Aug 02 04:16:37 2007 +0000
@@ -78,7 +78,7 @@
 	oscar_convo_closed,		/* convo_closed */
 	oscar_normalize,		/* normalize */
 	oscar_set_icon,			/* set_buddy_icon */
-	NULL,					/* remove_group */
+	oscar_remove_group,		/* remove_group */
 	NULL,					/* get_cb_real_name */
 	NULL,					/* set_chat_topic */
 	NULL,					/* find_blist_chat */
--- a/libpurple/protocols/oscar/libicq.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/oscar/libicq.c	Thu Aug 02 04:16:37 2007 +0000
@@ -78,7 +78,7 @@
 	oscar_convo_closed,		/* convo_closed */
 	oscar_normalize,		/* normalize */
 	oscar_set_icon,			/* set_buddy_icon */
-	NULL,					/* remove_group */
+	oscar_remove_group,		/* remove_group */
 	NULL,					/* get_cb_real_name */
 	NULL,					/* set_chat_topic */
 	NULL,					/* find_blist_chat */
--- a/libpurple/protocols/oscar/oscar.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.c	Thu Aug 02 04:16:37 2007 +0000
@@ -4709,6 +4709,11 @@
 	}
 }
 
+void oscar_remove_group(PurpleConnection *gc, PurpleGroup *group)
+{
+	aim_ssi_delgroup(gc->proto_data, group->name);
+}
+
 static gboolean purple_ssi_rerequestdata(gpointer data) {
 	OscarData *od = data;
 
@@ -4902,29 +4907,34 @@
 
 	/* Add from server list to local list */
 	for (curitem=od->ssi.local; curitem; curitem=curitem->next) {
-		if ((curitem->name == NULL) || (g_utf8_validate(curitem->name, -1, NULL)))
+	  if ((curitem->name == NULL) || (g_utf8_validate(curitem->name, -1, NULL)))
 		switch (curitem->type) {
 			case 0x0000: { /* Buddy */
 				if (curitem->name) {
-					char *gname = aim_ssi_itemlist_findparentname(od->ssi.local, curitem->name);
+					struct aim_ssi_item *groupitem = aim_ssi_itemlist_find(od->ssi.local, curitem->gid, 0x0000);
+					char *gname = groupitem ? groupitem->name : NULL;
 					char *gname_utf8 = gname ? oscar_utf8_try_convert(gc->account, gname) : NULL;
 					char *alias = aim_ssi_getalias(od->ssi.local, gname, curitem->name);
 					char *alias_utf8;
 
+					g = purple_find_group(gname_utf8 ? gname_utf8 : _("Orphans"));
+					if (g == NULL) {
+						g = purple_group_new(gname_utf8 ? gname_utf8 : _("Orphans"));
+						purple_blist_add_group(g, NULL);
+					}
+
 					if (alias != NULL)
 					{
 						if (g_utf8_validate(alias, -1, NULL))
 							alias_utf8 = g_strdup(alias);
 						else
 							alias_utf8 = oscar_utf8_try_convert(account, alias);
+						g_free(alias);
 					}
 					else
 						alias_utf8 = NULL;
 
-					b = purple_find_buddy(gc->account, curitem->name);
-					/* Should gname be freed here? -- elb */
-					/* Not with the current code, but that might be cleaner -- med */
-					g_free(alias);
+					b = purple_find_buddy_in_group(gc->account, curitem->name, g);
 					if (b) {
 						/* Get server stored alias */
 						if (alias_utf8) {
@@ -4934,13 +4944,8 @@
 					} else {
 						b = purple_buddy_new(gc->account, curitem->name, alias_utf8);
 
-						if (!(g = purple_find_group(gname_utf8 ? gname_utf8 : _("Orphans")))) {
-							g = purple_group_new(gname_utf8 ? gname_utf8 : _("Orphans"));
-							purple_blist_add_group(g, NULL);
-						}
-
 						purple_debug_info("oscar",
-								   "ssi: adding buddy %s to group %s to local list\n", curitem->name, gname_utf8 ? gname_utf8 : _("Orphans"));
+								   "ssi: adding buddy %s to group %s to local list\n", curitem->name, g->name);
 						purple_blist_add_buddy(b, NULL, g, NULL);
 					}
 					if (!aim_sncmp(curitem->name, account->username)) {
@@ -4957,7 +4962,12 @@
 			} break;
 
 			case 0x0001: { /* Group */
-				/* Shouldn't add empty groups */
+				char *gname = curitem->name;
+				char *gname_utf8 = gname ? oscar_utf8_try_convert(gc->account, gname) : NULL;
+				if (gname_utf8 != NULL) {
+					g = purple_group_new(gname_utf8);
+					purple_blist_add_group(g, NULL);
+				}
 			} break;
 
 			case 0x0002: { /* Permit buddy */
--- a/libpurple/protocols/oscar/oscar.h	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/oscar/oscar.h	Thu Aug 02 04:16:37 2007 +0000
@@ -1211,6 +1211,7 @@
 int aim_ssi_addpermit(OscarData *od, const char *name);
 int aim_ssi_adddeny(OscarData *od, const char *name);
 int aim_ssi_delbuddy(OscarData *od, const char *name, const char *group);
+int aim_ssi_delgroup(OscarData *od, const char *group);
 int aim_ssi_delpermit(OscarData *od, const char *name);
 int aim_ssi_deldeny(OscarData *od, const char *name);
 int aim_ssi_movebuddy(OscarData *od, const char *oldgn, const char *newgn, const char *sn);
--- a/libpurple/protocols/oscar/oscarcommon.h	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/oscar/oscarcommon.h	Thu Aug 02 04:16:37 2007 +0000
@@ -82,6 +82,7 @@
 void oscar_convo_closed(PurpleConnection *gc, const char *who);
 const char *oscar_normalize(const PurpleAccount *account, const char *str);
 void oscar_set_icon(PurpleConnection *gc, PurpleStoredImage *img);
+void oscar_remove_group(PurpleConnection *gc, PurpleGroup *group);
 gboolean oscar_can_receive_file(PurpleConnection *gc, const char *who);
 void oscar_send_file(PurpleConnection *gc, const char *who, const char *file);
 PurpleXfer *oscar_new_xfer(PurpleConnection *gc, const char *who);
--- a/libpurple/protocols/oscar/tlv.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/oscar/tlv.c	Thu Aug 02 04:16:37 2007 +0000
@@ -423,25 +423,6 @@
 }
 
 /**
- * Adds the given userinfo struct to a TLV chain.
- *
- * @param list Destination chain.
- * @param type TLV type to add.
- * @return The size of the value added.
- */
-int aim_tlvlist_add_userinfo(GSList **list, guint16 type, aim_userinfo_t *userinfo)
-{
-	guint8 buf[1024]; /* TODO: Don't use a fixed length buffer */
-	ByteStream bs;
-
-	byte_stream_init(&bs, buf, sizeof(buf));
-
-	aim_putuserinfo(&bs, userinfo);
-
-	return aim_tlvlist_add_raw(list, type, byte_stream_curpos(&bs), buf);
-}
-
-/**
  * Adds the given chatroom info to a TLV chain.
  *
  * @param list Destination chain.
--- a/libpurple/protocols/qq/qq.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/qq/qq.c	Thu Aug 02 04:16:37 2007 +0000
@@ -747,10 +747,7 @@
 {
 	PurpleAccountOption *option;
 
-	option = purple_account_option_bool_new(_("Login in TCP"), "use_tcp", FALSE);
-	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
-
-	option = purple_account_option_bool_new(_("Login Hidden"), "hidden", FALSE);
+	option = purple_account_option_bool_new(_("Connect using TCP"), "use_tcp", FALSE);
 	prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 
 	option = purple_account_option_string_new(_("Server"), "server", NULL);
--- a/libpurple/protocols/yahoo/Makefile.am	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/yahoo/Makefile.am	Thu Aug 02 04:16:37 2007 +0000
@@ -9,6 +9,8 @@
 	yahoo.h \
 	yahoochat.h \
 	yahoochat.c \
+	yahoo_aliases.c \
+	yahoo_alisaes.h \
 	yahoo_auth.c \
 	yahoo_auth.h \
 	yahoo_crypt.h \
--- a/libpurple/protocols/yahoo/Makefile.mingw	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/yahoo/Makefile.mingw	Thu Aug 02 04:16:37 2007 +0000
@@ -40,6 +40,7 @@
 C_SRC =			util.c \
 			yahoo.c \
 			yahoochat.c \
+			yahoo_aliases.c \
 			yahoo_auth.c \
 			yahoo_crypt.c \
 			yahoo_doodle.c \
--- a/libpurple/protocols/yahoo/yahoo.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo.c	Thu Aug 02 04:16:37 2007 +0000
@@ -41,6 +41,7 @@
 
 #include "yahoo.h"
 #include "yahoochat.h"
+#include "yahoo_aliases.h"
 #include "yahoo_auth.h"
 #include "yahoo_crypt.h"
 #include "yahoo_doodle.h"
@@ -196,6 +197,8 @@
 	GSList *l = pkt->hash;
 	YahooFriend *f = NULL;
 	char *name = NULL;
+	gboolean unicode = FALSE;
+	char *message = NULL;
 
 	if (pkt->service == YAHOO_SERVICE_LOGOFF && pkt->status == -1) {
 		gc->wants_to_die = TRUE;
@@ -269,7 +272,7 @@
 			break;
 		case 19: /* custom message */
 			if (f)
-				yahoo_friend_set_status_message(f, yahoo_string_decode(gc, pair->value, FALSE));
+				message = pair->value;
 			break;
 		case 11: /* this is the buddy's session id */
 			break;
@@ -380,6 +383,10 @@
 				g_free(tmp);
 			}
 			break;
+		case 97: /* Unicode status message */
+			unicode = !strcmp(pair->value, "1");
+			break;
+
 		default:
 			purple_debug(PURPLE_DEBUG_ERROR, "yahoo",
 					   "Unknown status key %d\n", pair->key);
@@ -389,6 +396,9 @@
 		l = l->next;
 	}
 
+	if (message && f)
+		yahoo_friend_set_status_message(f, yahoo_string_decode(gc, message, unicode));
+
 	if (name && f) /* update the last buddy */
 		yahoo_update_status(gc, name, f);
 }
@@ -484,7 +494,8 @@
 		if (yd->cookie_t)
 			g_free(yd->cookie_t);
 		yd->cookie_t = _getcookie(c);
-	}
+	} else
+		purple_debug_info("yahoo", "Ignoring unrecognized cookie '%c'\n", c[0]);
 }
 
 static void yahoo_process_list_15(PurpleConnection *gc, struct yahoo_packet *pkt)
@@ -508,7 +519,7 @@
 		l = l->next;
 
 		switch (pair->key) {
-		case 302: 
+		case 302:
 			/* This is always 318 before a group, 319 before the first s/n in a group, 320 before any ignored s/n.
 			 * It is not sent for s/n's in a group after the first.
 			 * All ignored s/n's are listed last, so when we see a 320 we clear the group and begin marking the
@@ -548,7 +559,7 @@
 
 			} else {
 				/* This buddy is on the ignore list (and therefore in no group) */
-				purple_privacy_deny_add(account, norm_bud, 1);				
+				purple_privacy_deny_add(account, norm_bud, 1);
 			}
 			break;
 		case 241: /* another protocol user */
@@ -702,6 +713,8 @@
 		yd->tmp_serv_plist = NULL;
 
 	}
+	/* Now that we've got the list, request aliases */
+	yahoo_fetch_aliases(gc);
 }
 
 static void yahoo_process_notify(PurpleConnection *gc, struct yahoo_packet *pkt)
@@ -816,7 +829,7 @@
 	{
 		g_hash_table_replace(yd->imvironments, g_strdup(im->from), g_strdup(imv));
 
-		if (strcmp(imv, "doodle;11") == 0)
+		if (strstr(imv, "doodle;") != NULL)
 		{
 			PurpleWhiteboard *wb;
 
@@ -825,6 +838,8 @@
 				return;
 			}
 
+			/* I'm not sure the following ever happens -DAA */
+
 			wb = purple_whiteboard_get_session(gc->account, im->from);
 
 			/* If a Doodle session doesn't exist between this user */
@@ -868,17 +883,17 @@
 			PurpleAccount *account;
 			PurpleConversation *c;
 			char *username, *str;
-			
+
 			account = purple_connection_get_account(gc);
 			c = purple_conversation_new(PURPLE_CONV_TYPE_IM, account, im->from);
-			
+
 			if ((buddy = purple_find_buddy(account, im->from)) != NULL)
 				username = g_markup_escape_text(purple_buddy_get_alias(buddy), -1);
 			else
 				username = g_markup_escape_text(im->from, -1);
-			
+
 			str = g_strdup_printf(_("%s just sent you a Buzz!"), username);
-			
+
 			purple_conversation_write(c, NULL, str, PURPLE_MESSAGE_SYSTEM|PURPLE_MESSAGE_NOTIFY, im->time);
 
 			g_free(username);
@@ -984,7 +999,7 @@
 static void
 yahoo_buddy_add_deny_reason_cb(struct yahoo_add_request *add_req) {
 	purple_request_input(add_req->gc, NULL, _("Authorization denied message:"),
-			NULL, _("No reason given."), TRUE, FALSE, NULL, 
+			NULL, _("No reason given."), TRUE, FALSE, NULL,
 			_("OK"), G_CALLBACK(yahoo_buddy_add_deny_cb),
 			_("Cancel"), G_CALLBACK(yahoo_buddy_add_deny_noreason_cb),
 			purple_connection_get_account(add_req->gc), add_req->who, NULL,
@@ -1027,7 +1042,7 @@
 		 */
 		 purple_account_request_authorization(purple_connection_get_account(gc), add_req->who, add_req->id,
                                                     NULL, add_req->msg, purple_find_buddy(purple_connection_get_account(gc),add_req->who) != NULL,
-						    G_CALLBACK(yahoo_buddy_add_authorize_cb), 
+						    G_CALLBACK(yahoo_buddy_add_authorize_cb),
 						    G_CALLBACK(yahoo_buddy_add_deny_reason_cb),
                                                     add_req);
 	} else {
@@ -1152,10 +1167,10 @@
 {
 	PurpleAccount *account = purple_connection_get_account(gc);
 	struct yahoo_data *yd = gc->proto_data;
-	char *who = NULL;
-	char *email = NULL;
-	char *subj = NULL;
-	char *yahoo_mail_url = (yd->jp? YAHOOJP_MAIL_URL: YAHOO_MAIL_URL);
+	const char *who = NULL;
+	const char *email = NULL;
+	const char *subj = NULL;
+	const char *yahoo_mail_url = (yd->jp? YAHOOJP_MAIL_URL: YAHOO_MAIL_URL);
 	int count = 0;
 	GSList *l = pkt->hash;
 
@@ -1917,6 +1932,7 @@
 	char *msg;
 	char *url = NULL;
 	char *fullmsg;
+	PurpleAccount *account = gc->account;
 
 	while (l) {
 		struct yahoo_pair *pair = l->data;
@@ -1949,6 +1965,9 @@
 			return;
 		}
 #endif
+		if (!purple_account_get_remember_password(account))
+			purple_account_set_password(account, NULL);
+
 		msg = g_strdup(_("Incorrect password."));
 		break;
 	case 14:
@@ -3238,11 +3257,79 @@
 	purple_connection_set_display_name(gc, entry);
 }
 
+static void
+yahoo_get_inbox_token_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,
+		const gchar *token, size_t len, const gchar *error_message)
+{
+	PurpleConnection *gc = user_data;
+	gboolean set_cookie = FALSE;
+	char *url;
+
+	g_return_if_fail(PURPLE_CONNECTION_IS_VALID(gc));
+
+	if (error_message != NULL)
+		purple_debug_error("yahoo", "Requesting mail login token failed: %s\n", error_message);
+	else if (len > 0 && token && *token) {
+	 	/* Should we not be hardcoding the rd url? */
+		url = g_strdup_printf(
+			"http://login.yahoo.com/config/reset_cookies_token?"
+			".token=%s"
+			"&.done=http://us.rd.yahoo.com/messenger/client/%%3fhttp://mail.yahoo.com/",
+			token);
+		set_cookie = TRUE;
+	}
+
+	if (!set_cookie) {
+		struct yahoo_data *yd = gc->proto_data;
+		purple_debug_error("yahoo", "No mail login token; forwarding to login screen.");
+		url = g_strdup(yd->jp ? YAHOOJP_MAIL_URL : YAHOO_MAIL_URL);
+	}
+
+	/* Open the mailbox with the parsed url data */
+	purple_notify_uri(gc, url);
+
+	g_free(url);
+}
+
+
+static void yahoo_show_inbox(PurplePluginAction *action)
+{
+	/* Setup a cookie that can be used by the browser */
+	/* XXX I have no idea how this will work with Yahoo! Japan. */
+
+	PurpleConnection *gc = action->context;
+	struct yahoo_data *yd = gc->proto_data;
+
+	PurpleUtilFetchUrlData *url_data;
+	const char* base_url = "http://login.yahoo.com";
+	char *request = g_strdup_printf(
+		"POST /config/cookie_token HTTP/1.0\r\n"
+		"Cookie: T=%s; path=/; domain=.yahoo.com; Y=%s;\r\n"
+		"User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n"
+		"Host: login.yahoo.com\r\n"
+		"Content-Length: 0\r\n\r\n",
+		yd->cookie_t, yd->cookie_y);
+
+	url_data = purple_util_fetch_url_request(base_url, FALSE,
+			"Mozilla/4.0 (compatible; MSIE 5.5)", TRUE, request, FALSE,
+			yahoo_get_inbox_token_cb, gc);
+
+	g_free(request);
+
+	if (url_data == NULL) {
+		const char *yahoo_mail_url = (yd->jp ? YAHOOJP_MAIL_URL : YAHOO_MAIL_URL);
+		purple_debug_error("yahoo",
+				   "Unable to request mail login token; forwarding to login screen.");
+		purple_notify_uri(gc, yahoo_mail_url);
+	}
+
+}
+
+
 static void yahoo_show_act_id(PurplePluginAction *action)
 {
 	PurpleConnection *gc = (PurpleConnection *) action->context;
-	/* XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over */
-	purple_request_input(gc, NULL, _("Active which ID?"), NULL,
+	purple_request_input(gc, NULL, _("Activate which ID?"), NULL,
 					   purple_connection_get_display_name(gc), FALSE, FALSE, NULL,
 					   _("OK"), G_CALLBACK(yahoo_act_id),
 					   _("Cancel"), NULL,
@@ -3273,6 +3360,11 @@
 			yahoo_show_chat_goto);
 	m = g_list_append(m, act);
 
+	m = g_list_append(m, NULL);
+	act = purple_plugin_action_new(_("Open Inbox"),
+			yahoo_show_inbox);
+	m = g_list_append(m, act);
+
 	return m;
 }
 
@@ -3311,7 +3403,7 @@
 	 */
 	wb = purple_whiteboard_get_session(gc->account, who);
 	if (wb)
-		yahoo_packet_hash_str(pkt, 63, "doodle;11");
+		yahoo_packet_hash_str(pkt, 63, DOODLE_IMV_KEY);
 	else
 	{
 		const char *imv;
@@ -3373,6 +3465,7 @@
 	const char *msg = NULL;
 	char *tmp = NULL;
 	char *conv_msg = NULL;
+	gboolean utf8 = TRUE;
 
 	if (!purple_status_is_active(status))
 		return;
@@ -3389,13 +3482,13 @@
 		msg = purple_status_get_attr_string(status, "message");
 
 		if (purple_status_is_available(status)) {
-			tmp = yahoo_string_encode(gc, msg, NULL);
+			tmp = yahoo_string_encode(gc, msg, &utf8);
 			conv_msg = purple_markup_strip_html(tmp);
 			g_free(tmp);
 		} else {
 			if ((msg == NULL) || (*msg == '\0'))
 				msg = _("Away");
-			tmp = yahoo_string_encode(gc, msg, NULL);
+			tmp = yahoo_string_encode(gc, msg, &utf8);
 			conv_msg = purple_markup_strip_html(tmp);
 			g_free(tmp);
 		}
@@ -3413,6 +3506,7 @@
 	yahoo_packet_hash_int(pkt, 10, yd->current_status);
 
 	if (yd->current_status == YAHOO_STATUS_CUSTOM) {
+		yahoo_packet_hash_str(pkt, 97, utf8 ? "1" : 0);
 		yahoo_packet_hash_str(pkt, 19, conv_msg);
 	} else {
 		yahoo_packet_hash_str(pkt, 19, "");
@@ -4013,7 +4107,7 @@
 	NULL, /* register_user */
 	NULL, /* get_cb_info */
 	NULL, /* get_cb_away */
-	NULL, /* alias_buddy */
+	yahoo_update_alias, /* alias_buddy */
 	yahoo_change_buddys_group,
 	yahoo_rename_group,
 	NULL, /* buddy_free */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/yahoo/yahoo_aliases.c	Thu Aug 02 04:16:37 2007 +0000
@@ -0,0 +1,245 @@
+/*
+ * purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+
+#include "internal.h"
+
+#include "account.h"
+#include "accountopt.h"
+#include "blist.h"
+#include "debug.h"
+#include "util.h"
+#include "version.h"
+#include "yahoo.h"
+#include "yahoo_aliases.h"
+#include "yahoo_packet.h"
+
+/* I hate hardcoding this stuff, but Yahoo never sends us anything to use.  Someone in the know may be able to tweak this URL */
+#define YAHOO_ALIAS_FETCH_URL "http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&diffs=1&t=0&tags=short&rt=0&prog-ver=8.1.0.249&useutf8=1&legenc=codepage-1252"
+#define YAHOO_ALIAS_UPDATE_URL "http://address.yahoo.com/yab/us?v=XM&prog=ymsgr&.intl=us&sync=1&tags=short&noclear=1&useutf8=1&legenc=codepage-1252"
+
+void yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias);
+
+/**
+ * Stuff we want passed to the callback function
+ */
+struct callback_data {
+	PurpleConnection *gc;
+	const char *id;
+};
+
+
+/**************************************************************************
+ * Alias Fetch Functions
+ **************************************************************************/
+
+static void
+yahoo_fetch_aliases_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,const gchar *url_text, size_t len, const gchar *error_message)
+{
+	if (len == 0) {
+		purple_debug_info("yahoo","No Aliases to process\n");
+	} else {
+		const char *yid, *full_name, *nick_name, *alias, *id, *fn, *ln, *nn;
+		struct callback_data *cb = user_data;
+		PurpleBuddy *b = NULL;
+		xmlnode *item, *contacts;
+
+		/* Put our web response into a xmlnode for easy management */
+		contacts = xmlnode_from_str(url_text, -1);
+
+		if (contacts == NULL) {
+			purple_debug_error("yahoo_aliases","Badly formed XML\n");
+			return;
+		}
+		purple_debug_info("yahoo", "Fetched %i bytes of alias data\n", len);
+
+		/* Loop around and around and around until we have gone through all the received aliases  */
+		for(item = xmlnode_get_child(contacts, "ct"); item; item = xmlnode_get_next_twin(item)) {
+			/* Yahoo replies with two types of contact (ct) record, we are only interested in the alias ones */
+			if ((yid = xmlnode_get_attrib(item, "yi"))) {
+		                /* Grab all the bits of information we can */
+				fn = xmlnode_get_attrib(item,"fn");
+				ln = xmlnode_get_attrib(item,"ln");
+				nn = xmlnode_get_attrib(item,"nn");
+				id = xmlnode_get_attrib(item,"id");
+
+		                /* Yahoo stores first and last names separately, lets put them together into a full name */
+				full_name = g_strstrip(g_strdup_printf("%s %s", (fn != NULL ? fn : "") , (ln != NULL ? ln : "")));
+				nick_name = (nn != NULL ? g_strstrip(g_strdup_printf("%s", nn)) : NULL);
+
+				if (nick_name != NULL)
+					alias = nick_name;   /* If we have a nickname from Yahoo, let's use it */
+				else if (strlen(full_name) != 0)
+					alias = full_name;  /* If no Yahoo nickname, we can use the full_name created above */
+				else
+					alias = NULL;  /* No nickname, first name or last name, then you get no alias !!  */
+
+				/*  Find the local buddy that matches */
+				b = purple_find_buddy(cb->gc->account, yid);
+
+				/*  If we don't find a matching buddy, ignore the alias !!  */
+				if (b != NULL) {
+					/* Create an object that we can attach to the buddies proto_data pointer */
+					struct YahooUser *yu;
+					yu = g_new0(struct YahooUser, 1);
+					yu->id = g_strdup(id);
+					yu->firstname = g_strdup(fn);
+					yu->lastname = g_strdup(ln);
+					yu->nickname = g_strdup(nn);
+					b->proto_data=yu;
+
+					/* Finally, if we received an alias, we better update the buddy list */
+					if (alias != NULL) {
+						serv_got_alias(cb->gc, yid, alias);
+						purple_debug_info("yahoo","Fetched alias '%s' (%s)\n",alias,id);
+					} else if (g_strcasecmp((alias!=NULL?alias:""),(b->alias!=NULL?b->alias:"")) != 0) {
+					/* Or if we have an alias that Yahoo doesn't, send it up */
+						yahoo_update_alias(cb->gc, yid, b->alias);
+						purple_debug_info("yahoo","Sent alias '%s'\n", b->alias);
+					}
+				} else {
+					purple_debug_info("yahoo", "Bizarre, received alias for %s, but they are not on your list...\n", yid);
+				}
+			}
+		}
+		xmlnode_free(contacts);
+		g_free(cb);
+	}
+}
+
+void
+yahoo_fetch_aliases(PurpleConnection *gc)
+{
+	struct yahoo_data *yd = gc->proto_data;
+	struct callback_data *cb;
+	char *url, *request, *webpage, *webaddress, *strtmp;
+	int inttmp;
+
+	/* Using callback_data so I have access to gc in the callback function */
+	cb = g_new0(struct callback_data, 1);
+	cb->gc = gc;
+
+	/*  Build all the info to make the web request */
+	url = g_strdup(YAHOO_ALIAS_FETCH_URL);
+	purple_url_parse(url, &webaddress, &inttmp, &webpage, &strtmp, &strtmp);
+	request = g_strdup_printf("GET /%s HTTP/1.1\r\n"
+				 "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n"
+				 "Cookie: T=%s; Y=%s\r\n"
+				 "Host: %s\r\n"
+				 "Cache-Control: no-cache\r\n\r\n",
+				 webpage, yd->cookie_t,yd->cookie_y, webaddress);
+
+	/* We have a URL and some header information, let's connect and get some aliases  */
+	purple_util_fetch_url_request(url, FALSE, NULL, TRUE, request, FALSE, yahoo_fetch_aliases_cb, cb);
+
+	g_free(url);
+	g_free(request);
+}
+
+/**************************************************************************
+ * Alias Update Functions
+ **************************************************************************/
+
+static void
+yahoo_update_alias_cb(PurpleUtilFetchUrlData *url_data, gpointer user_data,const gchar *url_text, size_t len, const gchar *error_message)
+{
+	xmlnode *node, *result;
+	struct callback_data *cb = user_data;
+
+	result = xmlnode_from_str(url_text, -1);
+
+	purple_debug_info("yahoo", "ID: %s, Return data: %s\n",cb->id, url_text);
+
+	if (result == NULL) {
+		purple_debug_error("yahoo","Alias update faild: Badly formed response\n");
+		return;
+	}
+
+	if ((node = xmlnode_get_child(result, "ct"))) {
+		if (g_ascii_strncasecmp(xmlnode_get_attrib(node, "id"), cb->id, strlen(cb->id))==0)
+			purple_debug_info("yahoo", "Alias update succeeded\n");
+		else
+			purple_debug_error("yahoo", "Alias update failed (Contact record return mismatch)\n");
+	} else {
+		purple_debug_info("yahoo", "Alias update failed (No contact record returned)\n");
+	}
+
+	g_free(cb);
+	xmlnode_free(result);
+}
+
+void
+yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias)
+{
+	struct yahoo_data *yd;
+	struct YahooUser *yu;
+	char *content, *url, *request, *webpage, *webaddress, *strtmp;
+	int inttmp;
+	struct callback_data *cb;
+	PurpleBuddy *buddy;
+   
+	g_return_if_fail(alias!= NULL);
+	g_return_if_fail(who!=NULL);
+	g_return_if_fail(gc!=NULL);
+
+	purple_debug_info("yahoo", "Sending '%s' as new alias for user '%s'.\n",alias, who);
+
+	buddy = purple_find_buddy(gc->account, who);
+	if (buddy->proto_data == NULL) {
+		purple_debug_info("yahoo", "Missing proto_data (get_yahoo_aliases must have failed), bailing out\n");
+		return;
+	}
+
+	yd = gc->proto_data;
+	yu = buddy->proto_data;
+
+	/* Using callback_data so I have access to gc in the callback function */
+	cb = g_new0(struct callback_data, 1);
+	cb->id = g_strdup(yu->id);
+
+	/*  Build all the info to make the web request */
+	url = g_strdup(YAHOO_ALIAS_UPDATE_URL);
+	purple_url_parse(url, &webaddress, &inttmp, &webpage, &strtmp, &strtmp);
+
+	content = g_strdup_printf("<?xml version=\"1.0\" encoding=\"utf-8\"?><ab k=\"%s\" cc=\"1\">\n"
+				  "<ct e=\"1\"  yi='%s' id='%s' nn='%s' pr='0' />\n</ab>\r\n",
+				  gc->account->username, who, yu->id, g_markup_escape_text(alias, strlen(alias)));
+
+	request = g_strdup_printf("POST /%s HTTP/1.1\r\n"
+				  "User-Agent: Mozilla/4.0 (compatible; MSIE 5.5)\r\n"
+				  "Cookie: T=%s; Y=%s\r\n"
+				  "Host: %s\r\n"
+				  "Content-Length: %" G_GSIZE_FORMAT "\r\n"
+				  "Cache-Control: no-cache\r\n\r\n"
+				  "%s",
+				  webpage, yd->cookie_t,yd->cookie_y, webaddress,
+			 	  strlen(content), content);
+
+	/* We have a URL and some header information, let's connect and update the alias  */
+	purple_util_fetch_url_request(url, FALSE, NULL, TRUE, request, FALSE, yahoo_update_alias_cb, cb);
+
+	g_free(content);
+	g_free(url);
+	g_free(request);
+}
+
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/libpurple/protocols/yahoo/yahoo_aliases.h	Thu Aug 02 04:16:37 2007 +0000
@@ -0,0 +1,50 @@
+/*
+ * purple
+ *
+ * Purple is the legal property of its developers, whose names are too numerous
+ * to list here.  Please refer to the COPYRIGHT file distributed with this
+ * source distribution.
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *
+ */
+
+
+#include "internal.h"
+
+#include "account.h"
+#include "accountopt.h"
+#include "blist.h"
+#include "debug.h"
+#include "util.h"
+#include "version.h"
+#include "yahoo.h"
+#include "yahoo_packet.h"
+
+
+/**
+ * The additional protocol specific info attached to each buddy.  We need
+ * to store the unique numeric id number to allow us to push alias changes.
+ */
+struct YahooUser
+{
+    const char *id;             /* The yahoo accountid for this buddy (not YahooID but numeric value) */
+    char *firstname;            /* Storing this information for no real reason, just because */
+    char *lastname;             /* Storing this information for no real reason, just because */
+    char *nickname;             /* Storing this information for no real reason, just because */
+};
+
+void yahoo_update_alias(PurpleConnection *gc, const char *who, const char *alias);
+void yahoo_fetch_aliases(PurpleConnection *gc);
--- a/libpurple/protocols/yahoo/yahoo_doodle.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo_doodle.c	Thu Aug 02 04:16:37 2007 +0000
@@ -125,47 +125,12 @@
 	 * sessions
 	 */
 
+	yahoo_doodle_command_send_ready(gc, to);
 	yahoo_doodle_command_send_request(gc, to);
-	yahoo_doodle_command_send_ready(gc, to);
 
 }
 
-void yahoo_doodle_process(PurpleConnection *gc, const char *me, const char *from,
-						  const char *command, const char *message)
-{
-	if(!command)
-		return;
-
-	/* Now check to see what sort of Doodle message it is */
-	switch(atoi(command))
-	{
-		case DOODLE_CMD_REQUEST:
-			yahoo_doodle_command_got_request(gc, from);
-			break;
-
-		case DOODLE_CMD_READY:
-			yahoo_doodle_command_got_ready(gc, from);
-			break;
-
-		case DOODLE_CMD_CLEAR:
-			yahoo_doodle_command_got_clear(gc, from);
-			break;
-
-		case DOODLE_CMD_DRAW:
-			yahoo_doodle_command_got_draw(gc, from, message);
-			break;
-
-		case DOODLE_CMD_EXTRA:
-			yahoo_doodle_command_got_extra(gc, from, message);
-			break;
-
-		case DOODLE_CMD_CONFIRM:
-			yahoo_doodle_command_got_confirm(gc, from);
-			break;
-	}
-}
-
-void yahoo_doodle_command_got_request(PurpleConnection *gc, const char *from)
+static void yahoo_doodle_command_got_request(PurpleConnection *gc, const char *from)
 {
 	PurpleAccount *account;
 	PurpleWhiteboard *wb;
@@ -197,7 +162,7 @@
 
 		purple_whiteboard_create(account, from, DOODLE_STATE_REQUESTED);
 
-		yahoo_doodle_command_send_request(gc, from);
+		yahoo_doodle_command_send_ready(gc, from);
 	}
 
 	/* TODO Might be required to clear the canvas of an existing doodle
@@ -205,12 +170,12 @@
 	 */
 }
 
-void yahoo_doodle_command_got_ready(PurpleConnection *gc, const char *from)
+static void yahoo_doodle_command_got_ready(PurpleConnection *gc, const char *from)
 {
 	PurpleAccount *account;
 	PurpleWhiteboard *wb;
 
-	purple_debug_info("yahoo", "doodle: Got Ready (%s)\n", from);
+	purple_debug_info("yahoo", "doodle: Got Ready(%s)\n", from);
 
 	account = purple_connection_get_account(gc);
 
@@ -230,8 +195,7 @@
 
 		yahoo_doodle_command_send_confirm(gc, from);
 	}
-
-	if(wb->state == DOODLE_STATE_ESTABLISHED)
+	else if(wb->state == DOODLE_STATE_ESTABLISHED)
 	{
 		/* TODO Ask whether to save picture too */
 		purple_whiteboard_clear(wb);
@@ -239,16 +203,16 @@
 
 	/* NOTE Not sure about this... I am trying to handle if the remote user
 	 * already thinks we're in a session with them (when their chat message
-	 * contains the doodle;11 imv key)
+	 * contains the doodle imv key)
 	 */
-	if(wb->state == DOODLE_STATE_REQUESTED)
+	else if(wb->state == DOODLE_STATE_REQUESTED)
 	{
 		/* purple_whiteboard_start(wb); */
-		yahoo_doodle_command_send_request(gc, from);
+		yahoo_doodle_command_send_ready(gc, from);
 	}
 }
 
-void yahoo_doodle_command_got_draw(PurpleConnection *gc, const char *from, const char *message)
+static void yahoo_doodle_command_got_draw(PurpleConnection *gc, const char *from, const char *message)
 {
 	PurpleAccount *account;
 	PurpleWhiteboard *wb;
@@ -304,7 +268,8 @@
 	g_list_free(d_list);
 }
 
-void yahoo_doodle_command_got_clear(PurpleConnection *gc, const char *from)
+
+static void yahoo_doodle_command_got_clear(PurpleConnection *gc, const char *from)
 {
 	PurpleAccount *account;
 	PurpleWhiteboard *wb;
@@ -329,7 +294,8 @@
 	}
 }
 
-void
+
+static void
 yahoo_doodle_command_got_extra(PurpleConnection *gc, const char *from, const char *message)
 {
 	purple_debug_info("yahoo", "doodle: Got Extra (%s)\n", from);
@@ -340,7 +306,7 @@
 	yahoo_doodle_command_send_extra(gc, from, DOODLE_EXTRA_NONE);
 }
 
-void yahoo_doodle_command_got_confirm(PurpleConnection *gc, const char *from)
+static void yahoo_doodle_command_got_confirm(PurpleConnection *gc, const char *from)
 {
 	PurpleAccount *account;
 	PurpleWhiteboard *wb;
@@ -361,14 +327,14 @@
 	/* TODO Combine the following IF's? */
 
 	/* Check if we requested a doodle session */
-	if(wb->state == DOODLE_STATE_REQUESTING)
+	/*if(wb->state == DOODLE_STATE_REQUESTING)
 	{
 		wb->state = DOODLE_STATE_ESTABLISHED;
 
 		purple_whiteboard_start(wb);
 
 		yahoo_doodle_command_send_confirm(gc, from);
-	}
+	}*/
 
 	/* Check if we accepted a request for a doodle session */
 	if(wb->state == DOODLE_STATE_REQUESTED)
@@ -395,25 +361,21 @@
 	 */
 	wb = purple_whiteboard_get_session(account, from);
 
-	/* TODO Ask if user wants to save picture before the session is closed */
-
-	/* If this session doesn't exist, don't try and kill it */
 	if(wb == NULL)
 		return;
-	else
-	{
-		purple_whiteboard_destroy(wb);
+
+	/* TODO Ask if user wants to save picture before the session is closed */
 
-		/* yahoo_doodle_command_send_shutdown(gc, from); */
-	}
+	wb->state = DOODLE_STATE_CANCELED;
+	purple_whiteboard_destroy(wb);
 }
 
 static void yahoo_doodle_command_send_generic(const char *type,
 											  PurpleConnection *gc,
 											  const char *to,
 											  const char *message,
-											  const char *thirteen,
-											  const char *sixtythree,
+											  int command,
+											  const char *imv,
 											  const char *sixtyfour)
 {
 	struct yahoo_data *yd;
@@ -428,48 +390,48 @@
 	yahoo_packet_hash_str(pkt, 49,  "IMVIRONMENT");
 	yahoo_packet_hash_str(pkt, 1,    purple_account_get_username(gc->account));
 	yahoo_packet_hash_str(pkt, 14,   message);
-	yahoo_packet_hash_str(pkt, 13,   thirteen);
+	yahoo_packet_hash_int(pkt, 13,   command);
 	yahoo_packet_hash_str(pkt, 5,    to);
-	yahoo_packet_hash_str(pkt, 63,   sixtythree ? sixtythree : "doodle;11");
+	yahoo_packet_hash_str(pkt, 63,   imv ? imv : DOODLE_IMV_KEY);
 	yahoo_packet_hash_str(pkt, 64,   sixtyfour);
 	yahoo_packet_hash_str(pkt, 1002, "1");
 
 	yahoo_packet_send_and_free(pkt, yd);
 }
 
+void yahoo_doodle_command_send_ready(PurpleConnection *gc, const char *to)
+{
+	yahoo_doodle_command_send_generic("Ready", gc, to, "1", DOODLE_CMD_READY, NULL, "1");
+}
+
 void yahoo_doodle_command_send_request(PurpleConnection *gc, const char *to)
 {
-	yahoo_doodle_command_send_generic("Request", gc, to, "1", "1", NULL, "1");
-}
-
-void yahoo_doodle_command_send_ready(PurpleConnection *gc, const char *to)
-{
-	yahoo_doodle_command_send_generic("Ready", gc, to, "", "0", NULL, "0");
+	yahoo_doodle_command_send_generic("Request", gc, to, "", DOODLE_CMD_REQUEST, NULL, "0");
 }
 
 void yahoo_doodle_command_send_draw(PurpleConnection *gc, const char *to, const char *message)
 {
-	yahoo_doodle_command_send_generic("Draw", gc, to, message, "3", NULL, "1");
+	yahoo_doodle_command_send_generic("Draw", gc, to, message, DOODLE_CMD_DRAW, NULL, "1");
 }
 
 void yahoo_doodle_command_send_clear(PurpleConnection *gc, const char *to)
 {
-	yahoo_doodle_command_send_generic("Clear", gc, to, " ", "2", NULL, "1");
+	yahoo_doodle_command_send_generic("Clear", gc, to, " ", DOODLE_CMD_CLEAR, NULL, "1");
 }
 
 void yahoo_doodle_command_send_extra(PurpleConnection *gc, const char *to, const char *message)
 {
-	yahoo_doodle_command_send_generic("Extra", gc, to, message, "4", NULL, "1");
+	yahoo_doodle_command_send_generic("Extra", gc, to, message, DOODLE_CMD_EXTRA, NULL, "1");
 }
 
 void yahoo_doodle_command_send_confirm(PurpleConnection *gc, const char *to)
 {
-	yahoo_doodle_command_send_generic("Confirm", gc, to, "1", "5", NULL, "1");
+	yahoo_doodle_command_send_generic("Confirm", gc, to, "1", DOODLE_CMD_CONFIRM, NULL, "1");
 }
 
 void yahoo_doodle_command_send_shutdown(PurpleConnection *gc, const char *to)
 {
-	yahoo_doodle_command_send_generic("Shutdown", gc, to, "", "0", ";0", "0");
+	yahoo_doodle_command_send_generic("Shutdown", gc, to, "", DOODLE_CMD_SHUTDOWN, ";0", "0");
 }
 
 void yahoo_doodle_start(PurpleWhiteboard *wb)
@@ -491,7 +453,7 @@
 
 	/* g_debug_debug("yahoo", "doodle: yahoo_doodle_end()\n"); */
 
-	if (gc)
+	if (gc && wb->state != DOODLE_STATE_CANCELED)
 		yahoo_doodle_command_send_shutdown(gc, wb->who);
 
 	g_free(wb->proto_data);
@@ -530,7 +492,7 @@
 	g_return_if_fail(draw_list != NULL);
 
 	message = yahoo_doodle_build_draw_string(ds, draw_list);
-		yahoo_doodle_command_send_draw(wb->account->gc, wb->who, message);
+	yahoo_doodle_command_send_draw(wb->account->gc, wb->who, message);
 	g_free(message);
 }
 
@@ -604,3 +566,37 @@
 	purple_whiteboard_set_brush(wb, size, color);
 }
 
+void yahoo_doodle_process(PurpleConnection *gc, const char *me, const char *from,
+						  const char *command, const char *message)
+{
+	if(!command)
+		return;
+
+	/* Now check to see what sort of Doodle message it is */
+	switch(atoi(command))
+	{
+		case DOODLE_CMD_REQUEST:
+			yahoo_doodle_command_got_request(gc, from);
+			break;
+
+		case DOODLE_CMD_READY:
+			yahoo_doodle_command_got_ready(gc, from);
+			break;
+
+		case DOODLE_CMD_CLEAR:
+			yahoo_doodle_command_got_clear(gc, from);
+			break;
+
+		case DOODLE_CMD_DRAW:
+			yahoo_doodle_command_got_draw(gc, from, message);
+			break;
+
+		case DOODLE_CMD_EXTRA:
+			yahoo_doodle_command_got_extra(gc, from, message);
+			break;
+
+		case DOODLE_CMD_CONFIRM:
+			yahoo_doodle_command_got_confirm(gc, from);
+			break;
+	}
+}
--- a/libpurple/protocols/yahoo/yahoo_doodle.h	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo_doodle.h	Thu Aug 02 04:16:37 2007 +0000
@@ -31,17 +31,19 @@
 #include "whiteboard.h"
 #include "cmds.h"
 
+#define DOODLE_IMV_KEY "doodle;103"
+
 /******************************************************************************
  * Defines
  *****************************************************************************/
 /* Doodle communication commands */
 /* TODO: Should be an enum. */
-#define DOODLE_CMD_REQUEST  0
-#define DOODLE_CMD_READY    1
-#define DOODLE_CMD_CLEAR    2
-#define DOODLE_CMD_DRAW     3
-#define DOODLE_CMD_EXTRA    4
-#define DOODLE_CMD_CONFIRM  5
+#define DOODLE_CMD_REQUEST	0
+#define DOODLE_CMD_CLEAR	1
+#define DOODLE_CMD_DRAW		2
+#define DOODLE_CMD_EXTRA	3
+#define DOODLE_CMD_READY	4
+#define DOODLE_CMD_CONFIRM	5
 /* Doodle communication command for shutting down (also 0) */
 #define DOODLE_CMD_SHUTDOWN 0
 
@@ -54,6 +56,7 @@
 #define DOODLE_STATE_REQUESTING  0
 #define DOODLE_STATE_REQUESTED   1
 #define DOODLE_STATE_ESTABLISHED 2
+#define DOODLE_STATE_CANCELED    3
 
 /* Doodle canvas dimensions */
 #define DOODLE_CANVAS_WIDTH  368
@@ -104,12 +107,6 @@
 						  const char *command, const char *message);
 void yahoo_doodle_initiate(PurpleConnection *gc, const char *to);
 
-void yahoo_doodle_command_got_request(PurpleConnection *gc, const char *from);
-void yahoo_doodle_command_got_ready(PurpleConnection *gc, const char *from);
-void yahoo_doodle_command_got_draw(PurpleConnection *gc, const char *from, const char *message);
-void yahoo_doodle_command_got_clear(PurpleConnection *gc, const char *from);
-void yahoo_doodle_command_got_extra(PurpleConnection *gc, const char *from, const char *message);
-void yahoo_doodle_command_got_confirm(PurpleConnection *gc, const char *from);
 void yahoo_doodle_command_got_shutdown(PurpleConnection *gc, const char *from);
 
 void yahoo_doodle_command_send_request(PurpleConnection *gc, const char *to);
--- a/libpurple/protocols/yahoo/yahoo_filexfer.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo_filexfer.c	Thu Aug 02 04:16:37 2007 +0000
@@ -484,7 +484,7 @@
 	if(service != NULL && imv != NULL && !strcmp(service, "IMVIRONMENT"))
 	{
 		/* Check for a Doodle packet and handle it accordingly */
-		if(!strcmp(imv, "doodle;11"))
+		if(strstr(imv, "doodle;") != NULL)
 			yahoo_doodle_process(gc, me, from, command, message);
 
 		/* If an IMVIRONMENT packet comes without a specific imviroment name */
@@ -622,12 +622,12 @@
 {
 	PurpleXfer *xfer;
 	struct yahoo_xfer_data *xfer_data;
-	
+
 	g_return_val_if_fail(who != NULL, NULL);
-	
+
 	xfer_data = g_new0(struct yahoo_xfer_data, 1);
 	xfer_data->gc = gc;
-	
+
 	/* Build the file transfer handle. */
 	xfer = purple_xfer_new(gc->account, PURPLE_XFER_SEND, who);
 	if (xfer)
--- a/libpurple/protocols/yahoo/yahoo_packet.h	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/protocols/yahoo/yahoo_packet.h	Thu Aug 02 04:16:37 2007 +0000
@@ -117,7 +117,7 @@
 };
 
 #define YAHOO_WEBMESSENGER_PROTO_VER 0x0065
-#define YAHOO_PROTO_VER 0x000c
+#define YAHOO_PROTO_VER 0x000f
 #define YAHOO_PROTO_VER_JAPAN 0x000c
 
 #define YAHOO_PACKET_HDRLEN (4 + 2 + 2 + 2 + 2 + 4 + 4)
--- a/libpurple/savedstatuses.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/savedstatuses.c	Thu Aug 02 04:16:37 2007 +0000
@@ -869,9 +869,9 @@
 		purple_idle_touch();
 
 	old = purple_savedstatus_get_current();
-	purple_prefs_set_bool("/purple/savedstatus/isidleaway", idleaway);
 	saved_status = idleaway ? purple_savedstatus_get_idleaway()
 			: purple_savedstatus_get_default();
+	purple_prefs_set_bool("/purple/savedstatus/isidleaway", idleaway);
 
 	if (idleaway && (purple_savedstatus_get_type(old) != PURPLE_STATUS_AVAILABLE))
 		/* Our global status is already "away," so don't change anything */
--- a/libpurple/stringref.h	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/stringref.h	Thu Aug 02 04:16:37 2007 +0000
@@ -1,3 +1,5 @@
+/* TODO: Can we just replace this whole thing with a GCache */
+
 /**
  * @file stringref.h Reference-counted immutable strings
  * @ingroup core
--- a/libpurple/stun.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/libpurple/stun.c	Thu Aug 02 04:16:37 2007 +0000
@@ -429,5 +429,4 @@
 
 void purple_stun_init() {
 	purple_prefs_add_string("/purple/network/stun_server", "");
-	purple_stun_discover(NULL);
 }
--- a/pidgin.spec.in	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin.spec.in	Thu Aug 02 04:16:37 2007 +0000
@@ -244,6 +244,7 @@
 
 # Delete files that we don't want to put in any of the RPMs
 rm -f $RPM_BUILD_ROOT%{_libdir}/finch/*.la
+rm -f $RPM_BUILD_ROOT%{_libdir}/gnt/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/pidgin/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/*.la
 rm -f $RPM_BUILD_ROOT%{_libdir}/purple-2/liboscar.so
@@ -297,8 +298,6 @@
 
 # files -f file can only take one filename :(
 cat %{name}.lang >> %{name}-%{version}-purpleplugins
-cat %{name}.lang >> %{name}-%{version}-pidginplugins
-cat %{name}.lang >> %{name}-%{version}-finchplugins
 
 %clean
 rm -rf %{buildroot}
@@ -442,6 +441,8 @@
 %doc %{_mandir}/man1/finch.*
 %{_bindir}/finch
 %{_libdir}/libgnt.so.*
+%{_libdir}/gnt/irssi.so
+%{_libdir}/gnt/s.so
 
 %files -n finch-devel
 %defattr(-, root, root)
--- a/pidgin/Makefile.mingw	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/Makefile.mingw	Thu Aug 02 04:16:37 2007 +0000
@@ -167,8 +167,9 @@
 clean:
 	$(MAKE) -C $(PIDGIN_IDLETRACK_TOP) -f $(MINGW_MAKEFILE) clean
 	$(MAKE) -C $(PIDGIN_PLUGINS_TOP) -f $(MINGW_MAKEFILE) clean
+	$(MAKE) -C $(PIDGIN_PIXMAPS_TOP) -f $(MINGW_MAKEFILE) clean
 	rm -f $(PIDGIN_OBJECTS) $(PIDGIN_RC_SRC) $(EXE_OBJECTS) $(EXE_RC_SRC)
-	rm -f $(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a
+	rm -f $(PIDGIN_TARGET).dll $(PIDGIN_TARGET).dll.a $(PIDGIN_TARGET).def
 	rm -f $(EXE_TARGET).exe
 
 include $(PIDGIN_COMMON_TARGETS)
--- a/pidgin/gtkaccount.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/gtkaccount.c	Thu Aug 02 04:16:37 2007 +0000
@@ -1162,6 +1162,11 @@
 	{
 		const char *screenname;
 
+		if (purple_accounts_get_all() == NULL) {
+			/* We're adding our first account.  Be polite and show the buddy list */
+			purple_blist_set_visible(TRUE);
+		}
+
 		screenname = gtk_entry_get_text(GTK_ENTRY(dialog->screenname_entry));
 		account = purple_account_new(screenname, dialog->protocol_id);
 		new = TRUE;
--- a/pidgin/gtkblist.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/gtkblist.c	Thu Aug 02 04:16:37 2007 +0000
@@ -136,8 +136,6 @@
 static void pidgin_blist_collapse_contact_cb(GtkWidget *w, PurpleBlistNode *node);
 static char *pidgin_get_group_title(PurpleBlistNode *gnode, gboolean expanded);
 
-static void pidgin_blist_tooltip_destroy(void);
-
 struct _pidgin_blist_node {
 	GtkTreeRowReference *row;
 	gboolean contact_expanded;
@@ -629,8 +627,7 @@
 
 	gc = purple_account_get_connection(data->account);
 
-	while ((tmp = gtk_container_get_children(GTK_CONTAINER(data->entries_box))))
-		gtk_widget_destroy(tmp->data);
+	gtk_container_foreach(GTK_CONTAINER(data->entries_box), (GtkCallback)gtk_widget_destroy, NULL);
 
 	g_list_free(data->entries);
 	data->entries = NULL;
@@ -1151,7 +1148,8 @@
 	pidgin_new_item_from_stock(menu, _("Add Buddy _Pounce"), NULL,
 			G_CALLBACK(gtk_blist_menu_bp_cb), buddy, 0, 0, NULL);
 
-	if(((PurpleBlistNode*)buddy)->parent->child->next && !sub && !contact_expanded) {
+	if (((PurpleBlistNode*)buddy)->parent && ((PurpleBlistNode*)buddy)->parent->child->next && 
+	      !sub && !contact_expanded) {
 		pidgin_new_item_from_stock(menu, _("View _Log"), NULL,
 				G_CALLBACK(gtk_blist_menu_showlog_cb),
 				contact, 0, 0, NULL);
@@ -1165,7 +1163,8 @@
 										  (PurpleBlistNode *)buddy);
 	pidgin_append_blist_node_extended_menu(menu, (PurpleBlistNode *)buddy);
 
-	if (((PurpleBlistNode*)buddy)->parent->child->next && !sub && !contact_expanded) {
+	if (((PurpleBlistNode*)buddy)->parent && ((PurpleBlistNode*)buddy)->parent->child->next && 
+              !sub && !contact_expanded) {
 		pidgin_separator(menu);
 		pidgin_append_blist_node_privacy_menu(menu, (PurpleBlistNode *)buddy);
 		pidgin_new_item_from_stock(menu, _("_Alias..."), PIDGIN_STOCK_ALIAS,
@@ -1247,7 +1246,8 @@
 
 
 static GtkWidget *
-create_chat_menu(PurpleBlistNode *node, PurpleChat *c) {
+create_chat_menu(PurpleBlistNode *node, PurpleChat *c)
+{
 	GtkWidget *menu;
 	gboolean autojoin;
 
@@ -1305,7 +1305,8 @@
 }
 
 static GtkWidget *
-create_buddy_menu(PurpleBlistNode *node, PurpleBuddy *b) {
+create_buddy_menu(PurpleBlistNode *node, PurpleBuddy *b)
+{
 	struct _pidgin_blist_node *gtknode = (struct _pidgin_blist_node *)node->ui_data;
 	GtkWidget *menu;
 	GtkWidget *menuitem;
@@ -2495,7 +2496,7 @@
 }
 
 
-static void pidgin_blist_tooltip_destroy()
+void pidgin_blist_tooltip_destroy()
 {
 	while(gtkblist->tooltipdata) {
 		struct tooltip_data *td = gtkblist->tooltipdata->data;
@@ -2583,6 +2584,22 @@
 	GtkTreeIter iter;
 	PurpleBlistNode *node;
 	GValue val;
+
+	if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(tv), gtkblist->tip_rect.x, gtkblist->tip_rect.y, &path, NULL, NULL, NULL))
+		return FALSE;
+	gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), &iter, path);
+	val.g_type = 0;
+	gtk_tree_model_get_value (GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &val);
+	node = g_value_get_pointer(&val);
+
+	pidgin_blist_draw_tooltip(node, gtkblist->window);
+
+	gtk_tree_path_free(path);
+	return FALSE;
+}
+
+void pidgin_blist_draw_tooltip(PurpleBlistNode *node, GtkWidget *widget)
+{
 	int scr_w, scr_h, w, h, x, y;
 #if GTK_CHECK_VERSION(2,2,0)
 	int mon_num;
@@ -2591,6 +2608,9 @@
 	gboolean tooltip_top = FALSE;
 	struct _pidgin_blist_node *gtknode;
 	GdkRectangle mon_size;
+	
+	if (node == NULL)
+		return;
 
 	/*
 	 * Attempt to free the previous tooltip.  I have a feeling
@@ -2598,14 +2618,6 @@
 	 */
 	pidgin_blist_tooltip_destroy();
 
-	if (!gtk_tree_view_get_path_at_pos(GTK_TREE_VIEW(tv), gtkblist->tip_rect.x, gtkblist->tip_rect.y, &path, NULL, NULL, NULL))
-		return FALSE;
-	gtk_tree_model_get_iter(GTK_TREE_MODEL(gtkblist->treemodel), &iter, path);
-	val.g_type = 0;
-	gtk_tree_model_get_value (GTK_TREE_MODEL(gtkblist->treemodel), &iter, NODE_COLUMN, &val);
-	node = g_value_get_pointer(&val);
-
-	gtk_tree_path_free(path);
 
 	gtkblist->tipwindow = gtk_window_new(GTK_WINDOW_POPUP);
 
@@ -2643,13 +2655,13 @@
 	} else {
 		gtk_widget_destroy(gtkblist->tipwindow);
 		gtkblist->tipwindow = NULL;
-		return FALSE;
+		return;
 	}
 
 	if (gtkblist->tooltipdata == NULL) {
 		gtk_widget_destroy(gtkblist->tipwindow);
 		gtkblist->tipwindow = NULL;
-		return FALSE;
+		return;
 	}
 
 	gtknode = node->ui_data;
@@ -2685,9 +2697,6 @@
 	  h = mon_size.height - 10;
 #endif
 
-	if (GTK_WIDGET_NO_WINDOW(gtkblist->window))
-		y+=gtkblist->window->allocation.y;
-
 	x -= ((w >> 1) + 4);
 
 	if ((y + h + 4) > scr_h || tooltip_top)
@@ -2713,7 +2722,7 @@
 	gtk_window_move(GTK_WINDOW(gtkblist->tipwindow), x, y);
 	gtk_widget_show(gtkblist->tipwindow);
 
-	return FALSE;
+	return;
 }
 
 static gboolean pidgin_blist_drag_motion_cb(GtkWidget *tv, GdkDragContext *drag_context,
@@ -3329,7 +3338,7 @@
 
 	presence = purple_buddy_get_presence(b);
 
-	if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons"))
+	if (!purple_prefs_get_bool(PIDGIN_PREFS_ROOT "/blist/show_buddy_icons") && aliased)
 	{
 		if (!selected && purple_presence_is_idle(presence))
 		{
@@ -4000,6 +4009,7 @@
 	char *primary;
 	const char *text;
 	gboolean enabled;
+	GList *list;
 
 	account = user_data;
 	primary = g_strdup_printf(_("%s disconnected"),
@@ -4018,8 +4028,10 @@
 	g_free(primary);
 	gtk_widget_destroy(GTK_WIDGET(widget));
 	g_hash_table_remove(gtkblist->connection_errors, account);
-	if (gtk_container_get_children(GTK_CONTAINER(gtkblist->error_buttons)) == NULL) {
+	if ((list = gtk_container_get_children(GTK_CONTAINER(gtkblist->error_buttons))) == NULL) {
 		gtk_widget_hide(gtkblist->error_buttons);
+	} else {
+		g_list_free(list);
 	}
 }
 
@@ -4089,7 +4101,7 @@
 	/* Remove the old error buttons */
 	for (l = gtk_container_get_children(GTK_CONTAINER(gtkblist->error_buttons));
 			l != NULL;
-			l = l->next)
+			l = g_list_delete_link(l, l))
 	{
 		gtk_widget_destroy(GTK_WIDGET(l->data));
 	}
@@ -5648,8 +5660,7 @@
 
 	gc = purple_account_get_connection(data->account);
 
-	while ((tmp = gtk_container_get_children(GTK_CONTAINER(data->entries_box))))
-		gtk_widget_destroy(tmp->data);
+	gtk_container_foreach(GTK_CONTAINER(data->entries_box), (GtkCallback)gtk_widget_destroy, NULL);
 
 	g_list_free(data->entries);
 
@@ -6526,7 +6537,7 @@
 		return;
 
 	/* Clear the old Accounts menu */
-	for (l = gtk_container_get_children(GTK_CONTAINER(accountmenu)); l; l = l->next) {
+	for (l = gtk_container_get_children(GTK_CONTAINER(accountmenu)); l; l = g_list_delete_link(l, l)) {
 		menuitem = l->data;
 
 		if (menuitem != gtk_item_factory_get_widget(gtkblist->ift, N_("/Accounts/Add\\/Edit")))
@@ -6737,7 +6748,7 @@
 		return;
 
 	/* Clear the old menu */
-	for (l = gtk_container_get_children(GTK_CONTAINER(sortmenu)); l; l = l->next) {
+	for (l = gtk_container_get_children(GTK_CONTAINER(sortmenu)); l; l = g_list_delete_link(l, l)) {
 		menuitem = l->data;
 		gtk_widget_destroy(GTK_WIDGET(menuitem));
 	}
--- a/pidgin/gtkblist.h	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/gtkblist.h	Thu Aug 02 04:16:37 2007 +0000
@@ -365,9 +365,26 @@
  *
  * @param buddy The buddy to return markup from
  * @param selected  Whether this buddy is selected. If TRUE, the markup will not change the color.
- * @param aliased  TRUE to return the appropriate alias of this buddy, FALSE to return its screenname
+ * @param aliased  TRUE to return the appropriate alias of this buddy, FALSE to return its screenname and status information
  * @return The markup for this buddy
  */
 gchar *pidgin_blist_get_name_markup(PurpleBuddy *buddy, gboolean selected, gboolean aliased);
 
+/**
+ * Creates the Buddy List tooltip at the current pointer location for the given buddy list node.
+ *
+ * This tooltip will be destroyed the next time this function is called, or when XXXX
+ * is called
+ *
+ * @param buddy The buddy to show a tooltip for
+ * @param widget The widget to draw the tooltip on
+ */
+void pidgin_blist_draw_tooltip(PurpleBlistNode *node, GtkWidget *widget);
+
+/**
+ * Destroys the current (if any) Buddy List tooltip
+ */
+void pidgin_blist_tooltip_destroy(void);
+
+
 #endif /* _PIDGINBLIST_H_ */
--- a/pidgin/gtkconv.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/gtkconv.c	Thu Aug 02 04:16:37 2007 +0000
@@ -2365,6 +2365,8 @@
 			&(gtkconv->infopane_iter),
 			CONV_EMBLEM_COLUMN, emblem, -1);
 
+	/* XXX seanegan Why do I have to do this? */
+	gtk_widget_queue_draw(gtkconv->infopane);
 
 	if (status != NULL)
 		g_object_unref(status);
@@ -2911,22 +2913,19 @@
 	}
 }
 
-static void
-regenerate_options_items(PidginWindow *win)
-{
-	GtkWidget *menu;
+/* Returns TRUE if some items were added to the menu, FALSE otherwise */
+static gboolean
+populate_menu_with_options(GtkWidget *menu, PidginConversation *gtkconv, gboolean all)
+{
 	GList *list;
-	PidginConversation *gtkconv;
 	PurpleConversation *conv;
 	PurpleBlistNode *node = NULL;
 	PurpleChat *chat = NULL;
 	PurpleBuddy *buddy = NULL;
-
-	gtkconv = pidgin_conv_window_get_active_gtkconv(win);
+	gboolean ret;
+
 	conv = gtkconv->active_conv;
 
-	menu = gtk_item_factory_get_widget(win->menu.item_factory, N_("/Conversation/More"));
-
 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
 		chat = purple_blist_find_chat(conv->account, conv->name);
 
@@ -2971,23 +2970,43 @@
 	else if (buddy)
 		node = (PurpleBlistNode *)buddy;
 
+	/* Now add the stuff */
+	if (all && buddy) {
+		pidgin_blist_make_buddy_menu(menu, buddy, TRUE);
+	} else if (node) {
+		if (purple_account_is_connected(conv->account))
+			pidgin_append_blist_node_proto_menu(menu, conv->account->gc, node);
+		pidgin_append_blist_node_extended_menu(menu, node);
+	}
+
+	if ((list = gtk_container_get_children(GTK_CONTAINER(menu))) == NULL) {
+		ret = FALSE;
+	} else {
+		g_list_free(list);
+		ret = TRUE;
+	}
+	return ret;
+}
+
+static void
+regenerate_options_items(PidginWindow *win)
+{
+	GtkWidget *menu;
+	PidginConversation *gtkconv;
+	GList *list;
+
+	gtkconv = pidgin_conv_window_get_active_gtkconv(win);
+	menu = gtk_item_factory_get_widget(win->menu.item_factory, N_("/Conversation/More"));
+
 	/* Remove the previous entries */
 	for (list = gtk_container_get_children(GTK_CONTAINER(menu)); list; )
 	{
 		GtkWidget *w = list->data;
-		list = list->next;
+		list = g_list_delete_link(list, list);
 		gtk_widget_destroy(w);
 	}
 
-	/* Now add the stuff */
-	if (node)
-	{
-		if (purple_account_is_connected(conv->account))
-			pidgin_append_blist_node_proto_menu(menu, conv->account->gc, node);
-		pidgin_append_blist_node_extended_menu(menu, node);
-	}
-
-	if ((list = gtk_container_get_children(GTK_CONTAINER(menu))) == NULL)
+	if (!populate_menu_with_options(menu, gtkconv, FALSE))
 	{
 		GtkWidget *item = gtk_menu_item_new_with_label(_("No actions available"));
 		gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
@@ -3368,12 +3387,11 @@
 
 	gtk_widget_show(win->menu.send_to);
 
-	menu = gtk_menu_item_get_submenu(
-		GTK_MENU_ITEM(win->menu.send_to));
+	menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(win->menu.send_to));
 
 	for (child = gtk_container_get_children(GTK_CONTAINER(menu));
 		 child != NULL;
-		 child = child->next) {
+		 child = g_list_delete_link(child, child)) {
 
 		GtkWidget *item = child->data;
 		PurpleBuddy *item_buddy;
@@ -4390,6 +4408,50 @@
 	gtk_container_add(GTK_CONTAINER(sw), list);
 }
 
+static int tooltip_timeout = 0;
+
+static gboolean
+pidgin_conv_tooltip_timeout(PidginConversation *gtkconv)
+{
+	PurpleBlistNode *node = NULL;
+	PurpleConversation *conv = gtkconv->active_conv;
+ 	if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT) {
+                node = (PurpleBlistNode*)(purple_blist_find_chat(conv->account, conv->name));
+	} else {
+                node = (PurpleBlistNode*)(purple_find_buddy(conv->account, conv->name));
+	}
+
+	if (node) 
+		pidgin_blist_draw_tooltip(node, gtkconv->infopane);
+	return FALSE;
+}
+
+static void 
+pidgin_conv_leave_cb (GtkWidget *w, GdkEventCrossing *e, PidginConversation *gtkconv)
+{
+	pidgin_blist_tooltip_destroy();
+	if (tooltip_timeout) {
+		g_source_remove(tooltip_timeout);
+		tooltip_timeout = 0;
+	}
+}
+
+static gboolean 
+pidgin_conv_motion_cb (GtkWidget *infopane, GdkEventMotion *event, PidginConversation *gtkconv)
+{
+	int delay = purple_prefs_get_int(PIDGIN_PREFS_ROOT "/blist/tooltip_delay");
+	
+	pidgin_blist_tooltip_destroy();
+	if (delay == 0)
+		return FALSE;
+
+	if (tooltip_timeout != 0) 
+		g_source_remove(tooltip_timeout);
+
+	tooltip_timeout = g_timeout_add(delay, (GSourceFunc)pidgin_conv_tooltip_timeout, gtkconv);
+	return FALSE;
+}
+
 static GtkWidget *
 setup_common_pane(PidginConversation *gtkconv)
 {
@@ -4419,10 +4481,15 @@
 	gtk_container_add(GTK_CONTAINER(event_box), gtkconv->infopane_hbox);
 	gtk_widget_show(gtkconv->infopane_hbox);
 	gtk_widget_add_events(event_box,
-	                      GDK_BUTTON1_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK);
+	                      GDK_POINTER_MOTION_MASK | GDK_LEAVE_NOTIFY_MASK);
 	g_signal_connect(G_OBJECT(event_box), "button_press_event",
 	                 G_CALLBACK(infopane_press_cb), gtkconv);
 
+        g_signal_connect(G_OBJECT(event_box), "motion-notify-event", 
+			 G_CALLBACK(pidgin_conv_motion_cb), gtkconv);
+        g_signal_connect(G_OBJECT(event_box), "leave-notify-event", 
+			 G_CALLBACK(pidgin_conv_leave_cb), gtkconv);
+
 
 	gtkconv->infopane = gtk_cell_view_new();
 	gtkconv->infopane_model = gtk_list_store_new(CONV_NUM_COLUMNS, GDK_TYPE_PIXBUF, G_TYPE_STRING, GDK_TYPE_PIXBUF);
@@ -5223,7 +5290,7 @@
 		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))))
-		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", gtk_font_options_all);
+		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), "<BR>", gtk_font_options_all | GTK_IMHTML_NO_SCROLL);
 
 	/* First message in a conversation. */
 	if (gtkconv->newday == 0)
@@ -5411,7 +5478,7 @@
 				   color, sml_attrib ? sml_attrib : "", mdate, str);
 		}
 
-		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, gtk_font_options_all);
+		gtk_imhtml_append_text(GTK_IMHTML(gtkconv->imhtml), buf2, gtk_font_options_all | GTK_IMHTML_NO_SCROLL);
 
 		if (purple_conversation_get_type(conv) == PURPLE_CONV_TYPE_CHAT &&
 		    !(flags & PURPLE_MESSAGE_SEND)) {
@@ -7642,52 +7709,40 @@
 static gboolean
 infopane_press_cb(GtkWidget *widget, GdkEventButton *e, PidginConversation *gtkconv)
 {
-	int nb_x, nb_y;
-
 	if (e->type != GDK_BUTTON_PRESS)
 		return FALSE;
 
 	if (e->button == 3) {
 		/* Right click was pressed. Popup the Send To menu. */
-		GtkWidget *menu = gtk_menu_item_get_submenu(GTK_MENU_ITEM(gtkconv->win->menu.send_to));
-		if (menu)
-			gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, e->button, e->time);
-		else
+		GtkWidget *menu = gtk_menu_new(), *sub;
+		sub = gtk_menu_item_get_submenu(GTK_MENU_ITEM(gtkconv->win->menu.send_to));
+
+		if (populate_menu_with_options(menu, gtkconv, TRUE))
+			pidgin_separator(menu);
+		else if (!sub ||
+				!GTK_WIDGET_IS_SENSITIVE(gtkconv->win->menu.send_to)) {
+			gtk_widget_destroy(menu);
 			return FALSE;
-		return TRUE;
-	} else if (e->button != 1) {
-		return FALSE;
-	}
-
-	if (gtkconv->win->in_drag) {
-		purple_debug(PURPLE_DEBUG_WARNING, "gtkconv",
-				"Already in the middle of a window drag at tab_press_cb\n");
+		} else {
+			menu = sub;
+			sub = NULL;
+		}
+
+		if (sub) {
+			GtkWidget *item = gtk_menu_item_new_with_mnemonic(_("_Send To"));
+			gtk_menu_shell_append(GTK_MENU_SHELL(menu), item);
+			gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), sub);
+			gtk_widget_show(item);
+			gtk_widget_show_all(sub);
+		}
+
+		gtk_widget_show_all(menu);
+		gtk_menu_popup(GTK_MENU(menu), NULL, NULL, NULL, NULL, e->button, e->time);
 		return TRUE;
 	}
-
-	gtkconv->win->in_predrag = TRUE;
-	gtkconv->win->drag_tab = gtk_notebook_page_num(GTK_NOTEBOOK(gtkconv->win->notebook), gtkconv->tab_cont);
-
-	gdk_window_get_origin(gtkconv->infopane_hbox->window, &nb_x, &nb_y);
-
-	gtkconv->win->drag_min_x = gtkconv->infopane_hbox->allocation.x      + nb_x;
-	gtkconv->win->drag_min_y = gtkconv->infopane_hbox->allocation.y      + nb_y;
-	gtkconv->win->drag_max_x = gtkconv->infopane_hbox->allocation.width  + gtkconv->win->drag_min_x;
-	gtkconv->win->drag_max_y = gtkconv->infopane_hbox->allocation.height + gtkconv->win->drag_min_y;
-
-	/* Connect the new motion signals. */
-	gtkconv->win->drag_motion_signal =
-		g_signal_connect(G_OBJECT(gtkconv->win->notebook), "motion_notify_event",
-				G_CALLBACK(notebook_motion_cb), gtkconv->win);
-
-	gtkconv->win->drag_leave_signal =
-		g_signal_connect(G_OBJECT(gtkconv->win->notebook), "leave_notify_event",
-				G_CALLBACK(notebook_leave_cb), gtkconv->win);
-
 	return FALSE;
-
-}
-
+}
+ 
 static gboolean
 notebook_press_cb(GtkWidget *widget, GdkEventButton *e, PidginWindow *win)
 {
--- a/pidgin/gtkdebug.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/gtkdebug.c	Thu Aug 02 04:16:37 2007 +0000
@@ -183,7 +183,7 @@
 	gtk_container_add(GTK_CONTAINER(GTK_DIALOG(win->find)->vbox),
 					  hbox);
 	img = gtk_image_new_from_stock(PIDGIN_STOCK_DIALOG_QUESTION,
-								   GTK_ICON_SIZE_DIALOG);
+				       gtk_icon_size_from_name(PIDGIN_ICON_SIZE_TANGO_HUGE));
 	gtk_box_pack_start(GTK_BOX(hbox), img, FALSE, FALSE, 0);
 
 	gtk_misc_set_alignment(GTK_MISC(img), 0, 0);
--- a/pidgin/gtkdialogs.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/gtkdialogs.c	Thu Aug 02 04:16:37 2007 +0000
@@ -72,9 +72,9 @@
 	{"Daniel 'datallah' Atallah",	N_("developer"), NULL},
 	{"Ethan 'Paco-Paco' Blanton",	N_("developer"), NULL},
 	{"Thomas Butter",				N_("developer"), NULL},
+	{"Ka-Hing Cheung",				N_("developer"), NULL},
 	{"Sadrul Habib Chowdhury",		N_("developer"), NULL},
 	{"Mark 'KingAnt' Doliner",		N_("developer"), NULL},
-	{"Christian 'ChipX86' Hammond",	N_("developer & webmaster"), NULL},
 	{"Casey Harkins",               N_("developer"),   NULL},
 	{"Gary 'grim' Kramlich",		N_("developer"), NULL},
 	{"Richard 'rlaager' Laager",	N_("developer"), NULL},
@@ -94,12 +94,7 @@
 /* Order: Alphabetical by Last Name */
 static struct developer patch_writers[] = {
 	{"John 'rekkanoryo' Bailey",	NULL,	NULL},
-	{"Ka-Hing 'javabsp' Cheung",	NULL,	NULL},
-	{"Felipe 'shx' Contreras",		NULL,	NULL},
-	{"Decklin Foster",				NULL,	NULL},
 	{"Peter 'Bleeter' Lawler",      NULL,   NULL},
-	{"Robert 'Robot101' McQueen",	NULL,	NULL},
-	{"Benjamin Miller",				NULL,	NULL},
 	{"Kevin 'SimGuy' Stange",		NULL,	NULL},
 	{NULL, NULL, NULL}
 };
@@ -110,6 +105,7 @@
 	{"Jim Duchek",			N_("maintainer"), "jim@linuxpimps.com"},
 	{"Rob Flynn",			N_("maintainer"), NULL},
 	{"Adam Fritzler",		N_("libfaim maintainer"), NULL},
+	{"Christian 'ChipX86' Hammond",	N_("developer & webmaster"), NULL},
 	/* If "lazy bum" translates literally into a serious insult, use something else or omit it. */
 	{"Syd Logan",			N_("hacker and designated driver [lazy bum]"), NULL},
 	{"Jim Seymour",			N_("XMPP developer"), NULL},
@@ -118,6 +114,15 @@
 	{NULL, NULL, NULL}
 };
 
+/* Order: Alphabetical by Last Name */
+static struct developer retired_patch_writers[] = {
+	{"Felipe 'shx' Contreras",		NULL,	NULL},
+	{"Decklin Foster",				NULL,	NULL},
+	{"Robert 'Robot101' McQueen",	NULL,	NULL},
+	{"Benjamin Miller",				NULL,	NULL},
+	{NULL, NULL, NULL}
+};
+
 /* Order: Code, then Alphabetical by Last Name */
 static struct translator current_translators[] = {
 	{N_("Afrikaans"),           "af", "Friedel Wolff", "friedel@translate.org.za"},
@@ -432,6 +437,21 @@
 	}
 	g_string_append(str, "<BR/>");
 
+	/* Retired Crazy Patch Writers */
+	g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>",
+						   _("Retired Crazy Patch Writers"));
+	for (i = 0; retired_patch_writers[i].name != NULL; i++) {
+		if (retired_patch_writers[i].email != NULL) {
+			g_string_append_printf(str, "  %s &lt;<a href=\"mailto:%s\">%s</a>&gt;<br/>",
+					retired_patch_writers[i].name,
+					retired_patch_writers[i].email, patch_writers[i].email);
+		} else {
+			g_string_append_printf(str, "  %s<br/>",
+					retired_patch_writers[i].name);
+		}
+	}
+	g_string_append(str, "<BR/>");
+
 	/* Artists */
         g_string_append_printf(str, "<FONT SIZE=\"4\">%s:</FONT><BR/>",
                                                    _("Artists"));
--- a/pidgin/gtkimhtml.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/gtkimhtml.c	Thu Aug 02 04:16:37 2007 +0000
@@ -348,13 +348,28 @@
 	}
 }
 
-static void gtk_size_allocate_cb(GtkIMHtml *widget, GtkAllocation *alloc, gpointer user_data)
+static void (*parent_size_allocate)(GtkWidget *widget, GtkAllocation *alloc);
+
+static void gtk_imhtml_size_allocate(GtkWidget *widget, GtkAllocation *alloc)
 {
+	GtkIMHtml *imhtml = GTK_IMHTML(widget);
 	GdkRectangle rect;
 	int xminus;
+	int height = 0, y = 0;
+	GtkTextIter iter;
+	gboolean scroll = TRUE;
+
+        gtk_text_buffer_get_end_iter(imhtml->text_buffer, &iter);
 
 	gtk_text_view_get_visible_rect(GTK_TEXT_VIEW(widget), &rect);
-	if(widget->old_rect.width != rect.width || widget->old_rect.height != rect.height){
+        gtk_text_view_get_line_yrange(GTK_TEXT_VIEW(imhtml), &iter, &y, &height);
+
+	if(((y + height) - (rect.y + rect.height)) > height
+           && gtk_text_buffer_get_char_count(imhtml->text_buffer)){
+                scroll = FALSE;
+        }
+
+	if(imhtml->old_rect.width != rect.width || imhtml->old_rect.height != rect.height){
 		GList *iter = GTK_IMHTML(widget)->scalables;
 
 		xminus = gtk_text_view_get_left_margin(GTK_TEXT_VIEW(widget)) +
@@ -369,8 +384,12 @@
 		}
 	}
 
-	widget->old_rect = rect;
-	return;
+	imhtml->old_rect = rect;
+	parent_size_allocate(widget, alloc);
+	
+	/* Don't scroll here if we're in the middle of a smooth scroll */
+	if (scroll && imhtml->scroll_time == NULL)
+		gtk_imhtml_scroll_to_end(imhtml, FALSE);	
 }
 
 static gint
@@ -1345,6 +1364,9 @@
 	gobject_class->finalize = gtk_imhtml_finalize;
 	widget_class->drag_motion = gtk_text_view_drag_motion;
 	widget_class->expose_event = gtk_imhtml_expose_event;
+	parent_size_allocate = widget_class->size_allocate;
+	widget_class->size_allocate = gtk_imhtml_size_allocate;
+
 	gtk_widget_class_install_style_property(widget_class, g_param_spec_boxed("hyperlink-color",
 	                                        _("Hyperlink color"),
 	                                        _("Color to draw hyperlinks."),
@@ -1409,7 +1431,6 @@
 			g_free, (GDestroyNotify)gtk_smiley_tree_destroy);
 	imhtml->default_smilies = gtk_smiley_tree_new();
 
-	g_signal_connect(G_OBJECT(imhtml), "size-allocate", G_CALLBACK(gtk_size_allocate_cb), NULL);
 	g_signal_connect(G_OBJECT(imhtml), "motion-notify-event", G_CALLBACK(gtk_motion_event_notify), NULL);
 	g_signal_connect(G_OBJECT(imhtml), "leave-notify-event", G_CALLBACK(gtk_leave_event_notify), NULL);
 	g_signal_connect(G_OBJECT(imhtml), "enter-notify-event", G_CALLBACK(gtk_enter_event_notify), NULL);
@@ -2249,10 +2270,11 @@
 	GtkIMHtml *imhtml = data;
 	GtkAdjustment *adj = GTK_TEXT_VIEW(imhtml)->vadjustment;
 	gdouble max_val = adj->upper - adj->page_size;
+	gdouble scroll_val = gtk_adjustment_get_value(adj) + ((max_val - gtk_adjustment_get_value(adj)) / 3);
 
 	g_return_val_if_fail(imhtml->scroll_time != NULL, FALSE);
 
-	if (g_timer_elapsed(imhtml->scroll_time, NULL) > MAX_SCROLL_TIME) {
+	if (g_timer_elapsed(imhtml->scroll_time, NULL) > MAX_SCROLL_TIME || scroll_val >= max_val) {
 		/* time's up. jump to the end and kill the timer */
 		gtk_adjustment_set_value(adj, max_val);
 		g_timer_destroy(imhtml->scroll_time);
@@ -2261,7 +2283,7 @@
 	}
 
 	/* scroll by 1/3rd the remaining distance */
-	gtk_adjustment_set_value(adj, gtk_adjustment_get_value(adj) + ((max_val - gtk_adjustment_get_value(adj)) / 3));
+	gtk_adjustment_set_value(adj, scroll_val);
 	return TRUE;
 }
 
--- a/pidgin/gtkimhtmltoolbar.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/gtkimhtmltoolbar.c	Thu Aug 02 04:16:37 2007 +0000
@@ -902,8 +902,10 @@
 
 static void pidgin_menu_clicked(GtkWidget *button, GtkMenu *menu)
 {
-	gtk_widget_show_all(GTK_WIDGET(menu));
-	gtk_menu_popup(menu, NULL, NULL, menu_position_func, button, 0, gtk_get_current_event_time());
+	if (gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(button))) {
+		gtk_widget_show_all(GTK_WIDGET(menu));
+		gtk_menu_popup(menu, NULL, NULL, menu_position_func, button, 0, gtk_get_current_event_time());
+	}
 }
 
 static void pidgin_menu_deactivate(GtkWidget *menu, GtkToggleButton *button)
--- a/pidgin/gtkmain.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/gtkmain.c	Thu Aug 02 04:16:37 2007 +0000
@@ -31,6 +31,7 @@
 #include "eventloop.h"
 #include "ft.h"
 #include "log.h"
+#include "network.h"
 #include "notify.h"
 #include "prefs.h"
 #include "prpl.h"
@@ -760,7 +761,6 @@
 #endif
 		return 0;
 	}
-		
 
 	/* TODO: Move blist loading into purple_blist_init() */
 	purple_set_blist(purple_blist_new());
@@ -777,6 +777,10 @@
 	/* TODO: Move pounces loading into purple_pounces_init() */
 	purple_pounces_load();
 
+	/* Call this early on to try to auto-detect our IP address and
+	 * hopefully save some time later.
+	 * TODO: move this (back) into purple_core_init() when purple_prefs_load() is in purple_prefs_init() */
+	 purple_network_get_my_ip(-1);
 
 	/* HACK BY SEANEGAN:
 	 * We've renamed prpl-oscar to prpl-aim and prpl-icq, accordingly.
--- a/pidgin/gtkpounce.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/gtkpounce.c	Thu Aug 02 04:16:37 2007 +0000
@@ -565,7 +565,7 @@
 
 	dialog->buddy_entry = gtk_entry_new();
 
-	pidgin_setup_screenname_autocomplete(dialog->buddy_entry, dialog->account_menu, FALSE);
+	pidgin_setup_screenname_autocomplete_with_filter(dialog->buddy_entry, dialog->account_menu, pidgin_screenname_autocomplete_default_filter, GINT_TO_POINTER(FALSE));
 
 	gtk_box_pack_start(GTK_BOX(hbox), dialog->buddy_entry, TRUE, TRUE, 0);
 	gtk_widget_show(dialog->buddy_entry);
--- a/pidgin/gtkprefs.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/gtkprefs.c	Thu Aug 02 04:16:37 2007 +0000
@@ -994,7 +994,7 @@
 	pidgin_prefs_checkbox(_("Show _formatting on incoming messages"),
 				PIDGIN_PREFS_ROOT "/conversations/show_incoming_formatting", vbox);
 
-	iconpref1 = pidgin_prefs_checkbox(strchr(_("/Buddies/Show Buddy _Details")+1,'/')+1,
+	iconpref1 = pidgin_prefs_checkbox(_("Show _detailed information"),
 			PIDGIN_PREFS_ROOT "/conversations/im/show_buddy_icons", vbox);
 	iconpref2 = pidgin_prefs_checkbox(_("Enable buddy ic_on animation"),
 			PIDGIN_PREFS_ROOT "/conversations/im/animate_buddy_icons", vbox);
@@ -1947,7 +1947,7 @@
 						   "/purple/away/away_when_idle", vbox);
 
 	select = pidgin_prefs_labeled_spin_button(vbox,
-			_("_Minutes before changing status:"), "/purple/away/mins_before_away",
+			_("_Minutes before becoming idle:"), "/purple/away/mins_before_away",
 			1, 24 * 60, sg);
 	g_signal_connect(G_OBJECT(button), "clicked",
 					 G_CALLBACK(pidgin_toggle_sensitive), select);
--- a/pidgin/gtkrequest.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/gtkrequest.c	Thu Aug 02 04:16:37 2007 +0000
@@ -711,7 +711,7 @@
 					}
 				}
 			}
-			pidgin_setup_screenname_autocomplete(entry, optmenu, !strcmp(type_hint, "screenname-all"));
+			pidgin_setup_screenname_autocomplete_with_filter(entry, optmenu, pidgin_screenname_autocomplete_default_filter, GINT_TO_POINTER(!strcmp(type_hint, "screenname-all")));
 		}
 	}
 }
@@ -1003,9 +1003,6 @@
 	if (purple_request_field_list_get_multi_select(field))
 		gtk_tree_selection_set_mode(sel, GTK_SELECTION_MULTIPLE);
 
-	g_signal_connect(G_OBJECT(sel), "changed",
-					 G_CALLBACK(list_field_select_changed_cb), field);
-
 	column = gtk_tree_view_column_new();
 	gtk_tree_view_insert_column(GTK_TREE_VIEW(treeview), column, -1);
 
@@ -1028,6 +1025,17 @@
 			gtk_tree_selection_select_iter(sel, &iter);
 	}
 
+	/*
+	 * We only want to catch changes made by the user, so it's important
+	 * that we wait until after the list is created to connect this
+	 * handler.  If we connect the handler before the loop above and
+	 * there are multiple items selected, then selecting the first iter
+	 * in the tree causes list_field_select_changed_cb to be triggered
+	 * which clears out the rest of the list of selected items.
+	 */
+	g_signal_connect(G_OBJECT(sel), "changed",
+					 G_CALLBACK(list_field_select_changed_cb), field);
+
 	gtk_container_add(GTK_CONTAINER(sw), treeview);
 	gtk_widget_show(treeview);
 
--- a/pidgin/gtkstatusbox.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/gtkstatusbox.c	Thu Aug 02 04:16:37 2007 +0000
@@ -1016,8 +1016,8 @@
 	}
 }
 
-static gboolean
-pidgin_status_box_regenerate_real(PidginStatusBox *status_box)
+static void
+pidgin_status_box_regenerate(PidginStatusBox *status_box)
 {
 	GdkPixbuf *pixbuf, *pixbuf2, *pixbuf3, *pixbuf4, *pixbuf5;
 	GtkIconSize icon_size;
@@ -1081,21 +1081,11 @@
 	}
 	gtk_tree_view_set_model(GTK_TREE_VIEW(status_box->tree_view), GTK_TREE_MODEL(status_box->dropdown_store));
 	gtk_tree_view_set_search_column(GTK_TREE_VIEW(status_box->tree_view), TEXT_COLUMN);
-
-	return FALSE;
-}
-
-static void
-pidgin_status_box_regenerate(PidginStatusBox *status_box)
-{
-	/* we have to do this in a timeout, so we avoid recursing
-	 * to infinity (and beyond) */
-	purple_timeout_add(0, (GSourceFunc)pidgin_status_box_regenerate_real, status_box);
 }
 
 static gboolean combo_box_scroll_event_cb(GtkWidget *w, GdkEventScroll *event, GtkIMHtml *imhtml)
 {
-	pidgin_status_box_popup(PIDGIN_STATUS_BOX(w));
+  	pidgin_status_box_popup(PIDGIN_STATUS_BOX(w));
 	return TRUE;
 }
 
--- a/pidgin/gtkutils.c	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/gtkutils.c	Thu Aug 02 04:16:37 2007 +0000
@@ -1747,16 +1747,22 @@
 # define NEW_STYLE_COMPLETION
 #endif
 
-#ifndef NEW_STYLE_COMPLETION
 typedef struct
 {
+	GtkWidget *entry;
+	GtkWidget *accountopt;
+
+	PidginFilterBuddyCompletionEntryFunc filter_func;
+	gpointer filter_func_user_data;
+
+#ifdef NEW_STYLE_COMPLETION
+	GtkListStore *store;
+#else
 	GCompletion *completion;
-
 	gboolean completion_started;
-	gboolean all;
-
+	GList *log_items;
+#endif /* NEW_STYLE_COMPLETION */
 } PidginCompletionData;
-#endif
 
 #ifndef NEW_STYLE_COMPLETION
 static gboolean
@@ -1874,15 +1880,15 @@
 }
 
 static gboolean screenname_completion_match_selected_cb(GtkEntryCompletion *completion,
-		GtkTreeModel *model, GtkTreeIter *iter, gpointer *user_data)
+		GtkTreeModel *model, GtkTreeIter *iter, PidginCompletionData *data)
 {
 	GValue val;
-	GtkWidget *optmenu = user_data[1];
+	GtkWidget *optmenu = data->accountopt;
 	PurpleAccount *account;
 
 	val.g_type = 0;
 	gtk_tree_model_get_value(model, iter, 1, &val);
-	gtk_entry_set_text(GTK_ENTRY(user_data[0]), g_value_get_string(&val));
+	gtk_entry_set_text(GTK_ENTRY(data->entry), g_value_get_string(&val));
 	g_value_unset(&val);
 
 	gtk_tree_model_get_value(model, iter, 4, &val);
@@ -1975,83 +1981,47 @@
 }
 #endif /* NEW_STYLE_COMPLETION */
 
-static void get_log_set_name(PurpleLogSet *set, gpointer value, gpointer **set_hash_data)
+static void get_log_set_name(PurpleLogSet *set, gpointer value, PidginCompletionData *data)
 {
-	/* 1. Don't show buddies because we will have gotten them already.
-	 * 2. Only show those with non-NULL accounts that are currently connected.
-	 * 3. The boxes that use this autocomplete code handle only IMs. */
-	if (!set->buddy &&
-	    (GPOINTER_TO_INT(set_hash_data[1]) ||
-	     (set->account != NULL && purple_account_is_connected(set->account))) &&
-		set->type == PURPLE_LOG_IM) {
+	PidginFilterBuddyCompletionEntryFunc filter_func = data->filter_func;
+	gpointer user_data = data->filter_func_user_data;
+
+ 	/* 1. Don't show buddies because we will have gotten them already.
+ 	 * 2. The boxes that use this autocomplete code handle only IMs. */
+	if (!set->buddy && set->type == PURPLE_LOG_IM) {
+		PidginBuddyCompletionEntry entry;
+		entry.is_buddy = FALSE;
+		entry.entry.logged_buddy = set;
+
+		if (filter_func(&entry, user_data)) {
 #ifdef NEW_STYLE_COMPLETION
-			add_screenname_autocomplete_entry((GtkListStore *)set_hash_data[0],
-											  NULL, NULL, set->account, set->name);
+			add_screenname_autocomplete_entry(data->store,
+												NULL, NULL, set->account, set->name);
 #else
-			GList **items = ((GList **)set_hash_data[0]);
 			/* Steal the name for the GCompletion. */
-			*items = g_list_append(*items, set->name);
+			data->log_items = g_list_append(data->log_items, set->name);
 			set->name = set->normalized_name = NULL;
 #endif /* NEW_STYLE_COMPLETION */
+		}
 	}
 }
 
-#ifdef NEW_STYLE_COMPLETION
-static void
-add_completion_list(GtkListStore *store)
-{
-	PurpleBlistNode *gnode, *cnode, *bnode;
-	gboolean all = GPOINTER_TO_INT(g_object_get_data(G_OBJECT(store), "screenname-all"));
-	GHashTable *sets;
-	gpointer set_hash_data[] = {store, GINT_TO_POINTER(all)};
-
-	gtk_list_store_clear(store);
-
-	for (gnode = purple_get_blist()->root; gnode != NULL; gnode = gnode->next)
-	{
-		if (!PURPLE_BLIST_NODE_IS_GROUP(gnode))
-			continue;
-
-		for (cnode = gnode->child; cnode != NULL; cnode = cnode->next)
-		{
-			if (!PURPLE_BLIST_NODE_IS_CONTACT(cnode))
-				continue;
-
-			for (bnode = cnode->child; bnode != NULL; bnode = bnode->next)
-			{
-				PurpleBuddy *buddy = (PurpleBuddy *)bnode;
-
-				if (!all && !purple_account_is_connected(buddy->account))
-					continue;
-
-				add_screenname_autocomplete_entry(store,
-												  ((PurpleContact *)cnode)->alias,
-												  purple_buddy_get_contact_alias(buddy),
-												  buddy->account,
-												  buddy->name
-												 );
-			}
-		}
-	}
-
-	sets = purple_log_get_log_sets();
-	g_hash_table_foreach(sets, (GHFunc)get_log_set_name, &set_hash_data);
-	g_hash_table_destroy(sets);
-}
-#else
 static void
 add_completion_list(PidginCompletionData *data)
 {
 	PurpleBlistNode *gnode, *cnode, *bnode;
-	GCompletion *completion;
-	GList *item = g_list_append(NULL, NULL);
+	PidginFilterBuddyCompletionEntryFunc filter_func = data->filter_func;
+	gpointer user_data = data->filter_func_user_data;
 	GHashTable *sets;
-	gpointer set_hash_data[2];
-
-	completion = data->completion;
-
-	g_list_foreach(completion->items, (GFunc)g_free, NULL);
-	g_completion_clear_items(completion);
+
+#ifdef NEW_STYLE_COMPLETION
+	gtk_list_store_clear(data->store);
+#else
+	GList *item = g_list_append(NULL, NULL);
+
+	g_list_foreach(data->completion->items, (GFunc)g_free, NULL);
+	g_completion_clear_items(data->completion);
+#endif /* NEW_STYLE_COMPLETION */
 
 	for (gnode = purple_get_blist()->root; gnode != NULL; gnode = gnode->next)
 	{
@@ -2065,28 +2035,41 @@
 
 			for (bnode = cnode->child; bnode != NULL; bnode = bnode->next)
 			{
-				PurpleBuddy *buddy = (PurpleBuddy *)bnode;
-
-				if (!data->all && !purple_account_is_connected(buddy->account))
-					continue;
-
+				PidginBuddyCompletionEntry entry;
+				entry.is_buddy = TRUE;
+				entry.entry.buddy = (PurpleBuddy *) bnode;
+
+				if (filter_func(&entry, user_data)) {
+#ifdef NEW_STYLE_COMPLETION
+					add_screenname_autocomplete_entry(data->store,
+														((PurpleContact *)cnode)->alias,
+														purple_buddy_get_contact_alias(entry.entry.buddy),
+														entry.entry.buddy->account,
+														entry.entry.buddy->name
+													 );
+				}
+#else
 				item->data = g_strdup(buddy->name);
 				g_completion_add_items(data->completion, item);
+#endif /* NEW_STYLE_COMPLETION */
 			}
 		}
 	}
+
+#ifndef NEW_STYLE_COMPLETION
 	g_list_free(item);
+	data->log_items = NULL;
+#endif /* NEW_STYLE_COMPLETION */
 
 	sets = purple_log_get_log_sets();
-	item = NULL;
-	set_hash_data[0] = &item;
-	set_hash_data[1] = GINT_TO_POINTER(data->all);
-	g_hash_table_foreach(sets, (GHFunc)get_log_set_name, &set_hash_data);
+	g_hash_table_foreach(sets, (GHFunc)get_log_set_name, data);
 	g_hash_table_destroy(sets);
-	g_completion_add_items(data->completion, item);
-	g_list_free(item);
+
+#ifndef NEW_STYLE_COMPLETION
+	g_completion_add_items(data->completion, data->log_items);
+	g_list_free(data->log_items);
+#endif /* NEW_STYLE_COMPLETION */
 }
-#endif
 
 static void
 screenname_autocomplete_destroyed_cb(GtkWidget *widget, gpointer data)
@@ -2101,23 +2084,34 @@
 	add_completion_list(data);
 }
 
+
 void
-pidgin_setup_screenname_autocomplete(GtkWidget *entry, GtkWidget *accountopt, gboolean all)
+pidgin_setup_screenname_autocomplete_with_filter(GtkWidget *entry, GtkWidget *accountopt, PidginFilterBuddyCompletionEntryFunc filter_func, gpointer user_data)
 {
-	gpointer cb_data = NULL;
+	PidginCompletionData *data;
 
 #ifdef NEW_STYLE_COMPLETION
 	/* Store the displayed completion value, the screenname, the UTF-8 normalized & casefolded screenname,
 	 * the UTF-8 normalized & casefolded value for comparison, and the account. */
-	GtkListStore *store = gtk_list_store_new(5, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER);
+	GtkListStore *store;
 
 	GtkEntryCompletion *completion;
-	gpointer *data;
-
-	g_object_set_data(G_OBJECT(store), "screenname-all", GINT_TO_POINTER(all));
-	add_completion_list(store);
-
-	cb_data = store;
+
+	data = g_new0(PidginCompletionData, 1);
+	store = gtk_list_store_new(5, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_STRING, G_TYPE_POINTER);
+
+	data->entry = entry;
+	data->accountopt = accountopt;
+	if (filter_func == NULL) {
+		data->filter_func = pidgin_screenname_autocomplete_default_filter;
+		data->filter_func_user_data = NULL;
+	} else {
+		data->filter_func = filter_func;
+		data->filter_func_user_data = user_data;
+	}
+	data->store = store;
+
+	add_completion_list(data);
 
 	/* Sort the completion list by screenname. */
 	gtk_tree_sortable_set_sort_column_id(GTK_TREE_SORTABLE(store),
@@ -2126,9 +2120,6 @@
 	completion = gtk_entry_completion_new();
 	gtk_entry_completion_set_match_func(completion, screenname_completion_match_func, NULL, NULL);
 
-	data = g_new0(gpointer, 2);
-	data[0] = entry;
-	data[1] = accountopt;
 	g_signal_connect(G_OBJECT(completion), "match-selected",
 		G_CALLBACK(screenname_completion_match_selected_cb), data);
 
@@ -2141,18 +2132,25 @@
 	gtk_entry_completion_set_text_column(completion, 0);
 
 #else /* !NEW_STYLE_COMPLETION */
-	PidginCompletionData *data;
 
 	data = g_new0(PidginCompletionData, 1);
 
+	data->entry = entry;
+	data->accountopt = accountopt;
+	if (filter_func == NULL) {
+		data->filter_func = pidgin_screenname_autocomplete_default_filter;
+		data->filter_func_user_data = NULL;
+	} else {
+		data->filter_func = filter_func;
+		data->filter_func_user_data = user_data;
+	}
 	data->completion = g_completion_new(NULL);
-	data->all = all;
+	data->completion_started = FALSE;
+
+	add_completion_list(data);
 
 	g_completion_set_compare(data->completion, g_ascii_strncasecmp);
 
-	add_completion_list(data);
-	cb_data = data;
-
 	g_signal_connect(G_OBJECT(entry), "event",
 					 G_CALLBACK(completion_entry_event), data);
 	g_signal_connect(G_OBJECT(entry), "destroy",
@@ -2160,22 +2158,37 @@
 
 #endif /* !NEW_STYLE_COMPLETION */
 
-	if (!all)
-	{
-		purple_signal_connect(purple_connections_get_handle(), "signed-on", entry,
-							PURPLE_CALLBACK(repopulate_autocomplete), cb_data);
-		purple_signal_connect(purple_connections_get_handle(), "signed-off", entry,
-							PURPLE_CALLBACK(repopulate_autocomplete), cb_data);
-	}
+	purple_signal_connect(purple_connections_get_handle(), "signed-on", entry,
+						PURPLE_CALLBACK(repopulate_autocomplete), data);
+	purple_signal_connect(purple_connections_get_handle(), "signed-off", entry,
+						PURPLE_CALLBACK(repopulate_autocomplete), data);
 
 	purple_signal_connect(purple_accounts_get_handle(), "account-added", entry,
-						PURPLE_CALLBACK(repopulate_autocomplete), cb_data);
+						PURPLE_CALLBACK(repopulate_autocomplete), data);
 	purple_signal_connect(purple_accounts_get_handle(), "account-removed", entry,
-						PURPLE_CALLBACK(repopulate_autocomplete), cb_data);
+						PURPLE_CALLBACK(repopulate_autocomplete), data);
 
 	g_signal_connect(G_OBJECT(entry), "destroy", G_CALLBACK(screenname_autocomplete_destroyed_cb), data);
 }
 
+gboolean
+pidgin_screenname_autocomplete_default_filter(const PidginBuddyCompletionEntry *completion_entry, gpointer all_accounts) {
+	gboolean all = GPOINTER_TO_INT(all_accounts);
+
+	if (completion_entry->is_buddy) {
+		return all || purple_account_is_connected(completion_entry->entry.buddy->account);
+	} else {
+		return all || (completion_entry->entry.logged_buddy->account != NULL && purple_account_is_connected(completion_entry->entry.logged_buddy->account));
+	}
+}
+
+void
+pidgin_setup_screenname_autocomplete(GtkWidget *entry, GtkWidget *accountopt, gboolean all) {
+	pidgin_setup_screenname_autocomplete_with_filter(entry, accountopt, pidgin_screenname_autocomplete_default_filter, GINT_TO_POINTER(all));
+}
+
+
+
 void pidgin_set_cursor(GtkWidget *widget, GdkCursorType cursor_type)
 {
 	GdkCursor *cursor;
--- a/pidgin/gtkutils.h	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/gtkutils.h	Thu Aug 02 04:16:37 2007 +0000
@@ -30,6 +30,10 @@
 #include "prpl.h"
 #include "util.h"
 
+
+
+
+
 typedef enum
 {
 	PIDGIN_BUTTON_HORIZONTAL,
@@ -64,6 +68,17 @@
 } PidginBrowserPlace;
 #endif /* _WIN32 */
 
+typedef struct {
+	gboolean is_buddy;
+	union {
+		PurpleBuddy *buddy;
+		PurpleLogSet *logged_buddy;
+	} entry;
+} PidginBuddyCompletionEntry;
+
+typedef gboolean (*PidginFilterBuddyCompletionEntryFunc) (const PidginBuddyCompletionEntry *completion_entry, gpointer user_data);
+
+
 /**
  * Sets up a gtkimhtml widget, loads it with smileys, and sets the
  * default signal handlers.
@@ -280,13 +295,39 @@
 void pidgin_account_option_menu_set_selected(GtkWidget *optmenu, PurpleAccount *account);
 
 /**
+ * Add autocompletion of screenames to an entry, supporting a filtering function.
+ *
+ * @param entry       The GtkEntry on which to setup autocomplete.
+ * @param optmenu     A menu for accounts, returned by gaim_gtk_account_option_menu_new().
+ *                    If @a optmenu is not @c NULL, it'll be updated when a screenname is chosen
+ *                    from the autocomplete list.
+ * @param filter_func A function for checking if an autocomplete entry
+ *                    should be shown. This can be @c NULL.
+ * @param user_data  The data to be passed to the filter_func function.
+ */
+void pidgin_setup_screenname_autocomplete_with_filter(GtkWidget *entry, GtkWidget *optmenu, PidginFilterBuddyCompletionEntryFunc filter_func, gpointer user_data);
+
+/**
+ * The default filter function for screenname autocomplete.
+ *
+ * @param completion_entry The completion entry to filter.
+ * @param online_accounts  If this is @c FALSE, only the autocompletion entries
+ *                         which belong to an online account will be filtered.
+ * @return Returns @c TRUE if the autocompletion entry is filtered.
+ */
+gboolean pidgin_screenname_autocomplete_default_filter(const PidginBuddyCompletionEntry *completion_entry, gpointer all_accounts);
+
+/**
+ * @deprecated
  * Add autocompletion of screenames to an entry.
+ * The usage of this function is deprecated. For new code, use the equivalent:
+ * pidgin_setup_screenname_autocomplete_with_filter(entry, optmenu, pidgin_screenname_autocomplete_default_filter, GINT_TO_POINTER(all))
  *
  * @param entry     The GtkEntry on which to setup autocomplete.
  * @param optmenu   A menu for accounts, returned by pidgin_account_option_menu_new().
  *                  If @a optmenu is not @c NULL, it'll be updated when a screenname is chosen
  *                  from the autocomplete list.
- * @param all       Whether to include screennames from disconnected accounts.
+ * @param all       Whether to include screennames from disconnected accounts. 
  */
 void pidgin_setup_screenname_autocomplete(GtkWidget *entry, GtkWidget *optmenu, gboolean all);
 
--- a/pidgin/pixmaps/Makefile.mingw	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/pixmaps/Makefile.mingw	Thu Aug 02 04:16:37 2007 +0000
@@ -10,7 +10,7 @@
 datadir := $(PIDGIN_INSTALL_DIR)
 include ./Makefile.am
 
-.PHONY: install
+.PHONY: install clean
 
 install:
 	if test '$(SUBDIRS)'; then \
@@ -27,3 +27,5 @@
 	  cp $(pidgindistpix_DATA) $(pidgindistpixdir); \
 	fi;
 
+clean:
+	$(MAKE) -C emotes -f $(MINGW_MAKEFILE) clean || exit 1 ;\
--- a/pidgin/pixmaps/emotes/Makefile.mingw	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/pixmaps/emotes/Makefile.mingw	Thu Aug 02 04:16:37 2007 +0000
@@ -6,7 +6,7 @@
 
 include ./Makefile.am
 
-.PHONY: install
+.PHONY: install clean
 
 install:
 	if test '$(SUBDIRS)'; then \
@@ -14,3 +14,10 @@
 	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
 	  done; \
 	fi;
+
+clean:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f Makefile.mingw clean || exit 1; \
+	  done; \
+	fi;
--- a/pidgin/pixmaps/emotes/default/Makefile.mingw	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/pixmaps/emotes/default/Makefile.mingw	Thu Aug 02 04:16:37 2007 +0000
@@ -6,7 +6,7 @@
 
 include ./Makefile.am
 
-.PHONY: install
+.PHONY: install clean
 
 install:
 	if test '$(SUBDIRS)'; then \
@@ -14,3 +14,11 @@
 	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
 	  done; \
 	fi;
+
+clean:
+	if test '$(SUBDIRS)'; then \
+	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	    $(MAKE) -C $$subdir -f Makefile.mingw clean || exit 1; \
+	  done; \
+	fi;
+
--- a/pidgin/pixmaps/icons/Makefile.am	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/pixmaps/icons/Makefile.am	Thu Aug 02 04:16:37 2007 +0000
@@ -1,4 +1,4 @@
-SUBDIRS = 16 24 32 48
+SUBDIRS = 16 22 24 32 48
 
 EXTRA_DIST = \
 	Makefile.mingw \
--- a/pidgin/pixmaps/icons/Makefile.mingw	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/pixmaps/icons/Makefile.mingw	Thu Aug 02 04:16:37 2007 +0000
@@ -11,7 +11,9 @@
 install_real:
 	if test '$(SUBDIRS)'; then \
 	  list='$(SUBDIRS)'; for subdir in $$list; do \
+	  if [ "$$subdir" != "22" ]; then \
 	    $(MAKE) -C $$subdir -f Makefile.mingw install || exit 1; \
+	  fi; \
 	  done; \
 	fi;
 
--- a/pidgin/win32/nsis/translations/german.nsh	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/win32/nsis/translations/german.nsh	Thu Aug 02 04:16:37 2007 +0000
@@ -1,82 +1,82 @@
-;; vim:syn=winbatch:encoding=cp1252:
-;;
-;;  german.nsh
-;;
-;;  German language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Author: Bjoern Voigt <bjoern@cs.tu-berlin.de>, 2007.
-;;  Version 5
-;;
- 
-; Startup checks
-!define INSTALLER_IS_RUNNING			"Der Installer l�uft schon."
-!define PIDGIN_IS_RUNNING			"Eine Instanz von Pidgin l�uft momentan schon. Beenden Sie Pidgin und versuchen Sie es nochmal."
-!define GTK_INSTALLER_NEEDED			"Die GTK+ Runtime Umgebung fehlt entweder oder muss aktualisiert werden.$\rBitte installieren Sie v${GTK_MIN_VERSION} oder h�her der GTK+ Runtime"
- 
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"Weiter >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) wird unter der GNU General Public License (GPL) ver�ffentlicht. Die Lizenz dient hier nur der Information. $_CLICK"
- 
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (erforderlich)"
-!define GTK_SECTION_TITLE			"GTK+ Runtime Umgebung (erforderlich)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE	"Verkn�pfungen"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Startmen�"
-!define PIDGIN_SECTION_DESCRIPTION		"Pidgin-Basisdateien und -DLLs"
-!define GTK_SECTION_DESCRIPTION		"Ein Multi-Plattform-GUI-Toolkit, verwendet von Pidgin"
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Verkn�pfungen zum Starten von Pidgin"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC	"Erstellt eine Verkn�pfung zu Pidgin auf dem Desktop"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC	"Erstellt einen Eintrag f�r Pidgin im Startmen�"
- 
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"Eine alte Version der GTK+ Runtime wurde gefunden. M�chten Sie aktualisieren?$\rHinweis: $(^Name) funktioniert evtl. nicht, wenn Sie nicht aktualisieren."
-!define GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me sind inkompatibel zu GTK+ 2.8.0 oder neuer.  GTK+ ${GTK_INSTALL_VERSION} wird nicht installiert.$\rWenn Sie nicht GTK+ ${GTK_MIN_VERSION} oder neuer installiert haben, wird die Installation jetzt abgebrochent."
- 
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE	"Besuchen Sie die Windows Pidgin Webseite"
- 
-; Pidgin Section Prompts and Texts
-!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Die aktuell installierte Version von Pidgin kann nicht deinstalliert werden. Die neue Version wird installiert, ohne dass die aktuell installierte Version gel�scht wird."
- 
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Fehler beim Installieren der GTK+ Runtime."
-!define GTK_BAD_INSTALL_PATH			"Der Pfad, den Sie eingegeben haben, existiert nicht und kann nicht erstellt werden."
-
-; URL Handler section
-!define URI_HANDLERS_SECTION_TITLE		"URI-Behandlung"
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1		"Der Deinstaller konnte keine Registrierungsschl�ssel f�r Pidgin finden.$\rEs ist wahrscheinlich, da� ein anderer Benutzer diese Anwendung installiert hat."
-!define un.PIDGIN_UNINSTALL_ERROR_2		"Sie haben keine Berechtigung, diese Anwendung zu deinstallieren."
-
-; Spellcheck Section Prompts
-!define PIDGIN_SPELLCHECK_SECTION_TITLE	"Unterst�tzung f�r Rechtschreibkontrolle"
-!define PIDGIN_SPELLCHECK_ERROR		"Fehler bei der Installation der Rechtschreibkontrolle"
-!define PIDGIN_SPELLCHECK_DICT_ERROR	"Fehler bei der Installation des W�rterbuches f�r die Rechtschreibkontrolle"
-!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Unterst�tzung f�r Rechtschreibkontrolle.  (F�r die Installation ist eine Internet-Verbindung n�tig)"
-!define ASPELL_INSTALL_FAILED			"Installation gescheitert"
-!define PIDGIN_SPELLCHECK_BRETON		"Bretonisch"
-!define PIDGIN_SPELLCHECK_CATALAN		"Katalanisch"
-!define PIDGIN_SPELLCHECK_CZECH		"Tschechisch"
-!define PIDGIN_SPELLCHECK_WELSH		"Walisisch"
-!define PIDGIN_SPELLCHECK_DANISH		"D�nisch"
-!define PIDGIN_SPELLCHECK_GERMAN		"Deutsch"
-!define PIDGIN_SPELLCHECK_GREEK		"Griechisch"
-!define PIDGIN_SPELLCHECK_ENGLISH		"Englisch"
-!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
-!define PIDGIN_SPELLCHECK_SPANISH		"Spanisch"
-!define PIDGIN_SPELLCHECK_FAROESE		"Far�ersprache"
-!define PIDGIN_SPELLCHECK_FRENCH		"Franz�sisch"
-!define PIDGIN_SPELLCHECK_ITALIAN		"Italienisch"
-!define PIDGIN_SPELLCHECK_DUTCH		"Holl�ndisch"
-!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norwegisch"
-!define PIDGIN_SPELLCHECK_POLISH		"Polnisch"
-!define PIDGIN_SPELLCHECK_PORTUGUESE	"Portugiesisch"
-!define PIDGIN_SPELLCHECK_ROMANIAN		"Rum�nisch"
-!define PIDGIN_SPELLCHECK_RUSSIAN		"Russisch"
-!define PIDGIN_SPELLCHECK_SLOVAK		"Slowakisch"
-!define PIDGIN_SPELLCHECK_SWEDISH		"Schwedisch"
-!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrainisch"
+;; vim:syn=winbatch:encoding=cp1252:
+;;
+;;  german.nsh
+;;
+;;  German language strings for the Windows Pidgin NSIS installer.
+;;  Windows Code page: 1252
+;;
+;;  Author: Bjoern Voigt <bjoern@cs.tu-berlin.de>, 2007.
+;;  Version 6
+;;
+ 
+; Startup checks
+!define INSTALLER_IS_RUNNING			"Der Installer l�uft schon."
+!define PIDGIN_IS_RUNNING			"Eine Instanz von Pidgin l�uft momentan schon. Beenden Sie Pidgin und versuchen Sie es nochmal."
+!define GTK_INSTALLER_NEEDED			"Die GTK+ Runtime Umgebung fehlt entweder oder muss aktualisiert werden.$\rBitte installieren Sie v${GTK_MIN_VERSION} oder h�her der GTK+ Runtime"
+ 
+; License Page
+!define PIDGIN_LICENSE_BUTTON			"Weiter >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) wird unter der GNU General Public License (GPL) ver�ffentlicht. Die Lizenz dient hier nur der Information. $_CLICK"
+ 
+; Components Page
+!define PIDGIN_SECTION_TITLE			"Pidgin Instant Messaging Client (erforderlich)"
+!define GTK_SECTION_TITLE			"GTK+ Runtime Umgebung (erforderlich)"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE	"Verkn�pfungen"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE	"Desktop"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE	"Startmen�"
+!define PIDGIN_SECTION_DESCRIPTION		"Pidgin-Basisdateien und -DLLs"
+!define GTK_SECTION_DESCRIPTION		"Ein Multi-Plattform-GUI-Toolkit, verwendet von Pidgin"
+
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION	"Verkn�pfungen zum Starten von Pidgin"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC	"Erstellt eine Verkn�pfung zu Pidgin auf dem Desktop"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC	"Erstellt einen Eintrag f�r Pidgin im Startmen�"
+ 
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"Eine alte Version der GTK+ Runtime wurde gefunden. M�chten Sie aktualisieren?$\rHinweis: $(^Name) funktioniert evtl. nicht, wenn Sie nicht aktualisieren."
+!define GTK_WINDOWS_INCOMPATIBLE		"Windows 95/98/Me sind inkompatibel zu GTK+ 2.8.0 oder neuer.  GTK+ ${GTK_INSTALL_VERSION} wird nicht installiert.$\rWenn Sie nicht GTK+ ${GTK_MIN_VERSION} oder neuer installiert haben, wird die Installation jetzt abgebrochent."
+ 
+; Installer Finish Page
+!define PIDGIN_FINISH_VISIT_WEB_SITE	"Besuchen Sie die Pidgin Webseite"
+ 
+; Pidgin Section Prompts and Texts
+!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Die aktuell installierte Version von Pidgin kann nicht deinstalliert werden. Die neue Version wird installiert, ohne dass die aktuell installierte Version gel�scht wird."
+ 
+; GTK+ Section Prompts
+!define GTK_INSTALL_ERROR			"Fehler beim Installieren der GTK+ Runtime."
+!define GTK_BAD_INSTALL_PATH			"Der Pfad, den Sie eingegeben haben, existiert nicht und kann nicht erstellt werden."
+
+; URL Handler section
+!define URI_HANDLERS_SECTION_TITLE		"URI-Behandlung"
+
+; Uninstall Section Prompts
+!define un.PIDGIN_UNINSTALL_ERROR_1		"Der Deinstaller konnte keine Registrierungsschl�ssel f�r Pidgin finden.$\rEs ist wahrscheinlich, da� ein anderer Benutzer diese Anwendung installiert hat."
+!define un.PIDGIN_UNINSTALL_ERROR_2		"Sie haben keine Berechtigung, diese Anwendung zu deinstallieren."
+
+; Spellcheck Section Prompts
+!define PIDGIN_SPELLCHECK_SECTION_TITLE	"Unterst�tzung f�r Rechtschreibkontrolle"
+!define PIDGIN_SPELLCHECK_ERROR		"Fehler bei der Installation der Rechtschreibkontrolle"
+!define PIDGIN_SPELLCHECK_DICT_ERROR	"Fehler bei der Installation des W�rterbuches f�r die Rechtschreibkontrolle"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"Unterst�tzung f�r Rechtschreibkontrolle.  (F�r die Installation ist eine Internet-Verbindung n�tig)"
+!define ASPELL_INSTALL_FAILED			"Installation gescheitert"
+!define PIDGIN_SPELLCHECK_BRETON		"Bretonisch"
+!define PIDGIN_SPELLCHECK_CATALAN		"Katalanisch"
+!define PIDGIN_SPELLCHECK_CZECH		"Tschechisch"
+!define PIDGIN_SPELLCHECK_WELSH		"Walisisch"
+!define PIDGIN_SPELLCHECK_DANISH		"D�nisch"
+!define PIDGIN_SPELLCHECK_GERMAN		"Deutsch"
+!define PIDGIN_SPELLCHECK_GREEK		"Griechisch"
+!define PIDGIN_SPELLCHECK_ENGLISH		"Englisch"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
+!define PIDGIN_SPELLCHECK_SPANISH		"Spanisch"
+!define PIDGIN_SPELLCHECK_FAROESE		"Far�ersprache"
+!define PIDGIN_SPELLCHECK_FRENCH		"Franz�sisch"
+!define PIDGIN_SPELLCHECK_ITALIAN		"Italienisch"
+!define PIDGIN_SPELLCHECK_DUTCH		"Holl�ndisch"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norwegisch"
+!define PIDGIN_SPELLCHECK_POLISH		"Polnisch"
+!define PIDGIN_SPELLCHECK_PORTUGUESE	"Portugiesisch"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"Rum�nisch"
+!define PIDGIN_SPELLCHECK_RUSSIAN		"Russisch"
+!define PIDGIN_SPELLCHECK_SLOVAK		"Slowakisch"
+!define PIDGIN_SPELLCHECK_SWEDISH		"Schwedisch"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrainisch"
--- a/pidgin/win32/nsis/translations/swedish.nsh	Thu Aug 02 04:12:57 2007 +0000
+++ b/pidgin/win32/nsis/translations/swedish.nsh	Thu Aug 02 04:16:37 2007 +0000
@@ -1,48 +1,80 @@
-;;
-;;  swedish.nsh
-;;
-;;  Swedish language strings for the Windows Pidgin NSIS installer.
-;;  Windows Code page: 1252
-;;
-;;  Author: Tore Lundqvist <tlt@mima.x.se>, 2003.
-;;  Author: Peter Hjalmarsson <xake@telia.com>, 2005.
-;;  Version 3
-
-; Make sure to update the PIDGIN_MACRO_LANGUAGEFILE_END macro in
-; langmacros.nsh when updating this file
-
-; Startup Checks
-!define INSTALLER_IS_RUNNING			"Installationsprogrammet k�rs redan."
-!define PIDGIN_IS_RUNNING			"En instans av Pidgin k�rs redan. Avsluta Pidgin och f�rs�k igen."
-!define GTK_INSTALLER_NEEDED			"K�rmilj�n GTK+ �r antingen inte installerat eller beh�ver uppgraderas.$\rVar god installera v${GTK_MIN_VERSION} eller h�gre av GTK+-k�rmilj�n."
-
-; License Page
-!define PIDGIN_LICENSE_BUTTON			"N�sta >"
-!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) �r utgivet under GPL. Licensen finns tillg�nglig h�r f�r infromationssyften enbart. $_CLICK"
-
-; Components Page
-!define PIDGIN_SECTION_TITLE			"Pidgin Snabbmeddelandeklient (obligatorisk)"
-!define GTK_SECTION_TITLE			"GTK+-k�rmilj� (obligatorisk)"
-!define PIDGIN_SHORTCUTS_SECTION_TITLE "Genv�gar"
-!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE "Skrivbord"
-!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Startmeny"
-!define PIDGIN_SECTION_DESCRIPTION		"Pidgin k�rnfiler och DLL:er"
-!define GTK_SECTION_DESCRIPTION		"En GUI-verktygsupps�ttning f�r flera olika plattformar som Pidgin anv�nder."
-
-!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION   "Genv�gar f�r att starta Pidgin"
-!define PIDGIN_DESKTOP_SHORTCUT_DESC   "Skapar en genv�g till Pidgin p� skrivbordet"
-!define PIDGIN_STARTMENU_SHORTCUT_DESC   "Skapar ett till�gg i startmenyn f�r Pidgin"
-
-; GTK+ Directory Page
-!define GTK_UPGRADE_PROMPT			"En �ldre version av GTK+ runtime hittades, vill du uppgradera den?$\rOBS! $(^Name) kommer kanske inte att fungera om du inte uppgraderar."
-
-; Installer Finish Page
-!define PIDGIN_FINISH_VISIT_WEB_SITE		"Bes�k Windows-Pidgin hemsida"
-
-; GTK+ Section Prompts
-!define GTK_INSTALL_ERROR			"Fel vid installation av GTK+ runtime."
-!define GTK_BAD_INSTALL_PATH			"Den s�kv�g du angivit g�r inte att komma �t eller skapa."
-
-; Uninstall Section Prompts
-!define un.PIDGIN_UNINSTALL_ERROR_1         "Avinstalleraren kunde inte hitta registerv�rden f�r Pidgin.$\rAntagligen har en annan anv�ndare installerat applikationen."
-!define un.PIDGIN_UNINSTALL_ERROR_2         "Du har inte r�ttigheter att avinstallera den h�r applikationen."
+;;
+;;  swedish.nsh
+;;
+;;  Swedish language strings for the Windows Pidgin NSIS installer.
+;;  Windows Code page: 1252
+;;
+;;  Author: Tore Lundqvist <tlt@mima.x.se>, 2003.
+;;  Author: Peter Hjalmarsson <xake@telia.com>, 2005.
+;;  Version 3
+
+; Startup Checks
+!define INSTALLER_IS_RUNNING			"Installationsprogrammet k�rs redan."
+!define PIDGIN_IS_RUNNING			"En instans av Pidgin k�rs redan. Avsluta Pidgin och f�rs�k igen."
+!define GTK_INSTALLER_NEEDED			"K�rmilj�n GTK+ �r antingen inte installerat eller beh�ver uppgraderas.$\rVar  god installera v${GTK_MIN_VERSION} eller h�gre av GTK+-k�rmilj�n."
+
+; License Page
+!define PIDGIN_LICENSE_BUTTON			"N�sta >"
+!define PIDGIN_LICENSE_BOTTOM_TEXT		"$(^Name) �r utgivet under GPL. Licensen finns tillg�nglig h�r f�r informationssyften enbart. $_CLICK"
+
+; Components Page
+!define PIDGIN_SECTION_TITLE			"Pidgin Snabbmeddelandeklient (obligatorisk)"
+!define GTK_SECTION_TITLE			"GTK+-k�rmilj� (obligatorisk)"
+!define PIDGIN_SHORTCUTS_SECTION_TITLE 		"Genv�gar"
+!define PIDGIN_DESKTOP_SHORTCUT_SECTION_TITLE 	"Skrivbord"
+!define PIDGIN_STARTMENU_SHORTCUT_SECTION_TITLE "Startmeny"
+!define PIDGIN_SECTION_DESCRIPTION		"Pidgins k�rnfiler och DLL:er"
+!define GTK_SECTION_DESCRIPTION			"En GUI-verktygsupps�ttning f�r flera olika plattformar som Pidgin anv�nder."
+
+!define PIDGIN_SHORTCUTS_SECTION_DESCRIPTION   	"Genv�gar f�r att starta Pidgin"
+!define PIDGIN_DESKTOP_SHORTCUT_DESC   		"Skapar en genv�g till Pidgin p� skrivbordet"
+!define PIDGIN_STARTMENU_SHORTCUT_DESC   	"Skapar ett till�gg i startmenyn f�r Pidgin"
+
+; GTK+ Directory Page
+!define GTK_UPGRADE_PROMPT			"En �ldre version av GTK+ runtime hittades, vill du uppgradera den?$\rOBS! $(^Name) kommer kanske inte att fungera om du inte uppgraderar."
+
+; Installer Finish Page
+!define PIDGIN_FINISH_VISIT_WEB_SITE		"Bes�k Windows-Pidgin hemsida"
+
+; Pidgin Section Prompts and Texts
+!define PIDGIN_PROMPT_CONTINUE_WITHOUT_UNINSTALL	"Kunde inte avinstallera den nuvarande versionen av Pidgin. Den nya versionen kommer att installeras utan att ta bort den f�r n�rvarande installerade versionen."
+
+; GTK+ Section Prompts
+!define GTK_INSTALL_ERROR			"Fel vid installation av GTK+ runtime."
+!define GTK_BAD_INSTALL_PATH			"Den s�kv�g du angivit g�r inte att komma �t eller skapa."
+
+; URL Handler section
+!define URI_HANDLERS_SECTION_TITLE		"URI Hanterare"
+
+; Uninstall Section Prompts
+!define un.PIDGIN_UNINSTALL_ERROR_1         	"Avinstalleraren kunde inte hitta registerv�rden f�r Pidgin.$\rAntagligen har en annan anv�ndare installerat applikationen."
+!define un.PIDGIN_UNINSTALL_ERROR_2         	"Du har inte r�ttigheter att avinstallera den h�r applikationen."
+
+; Spellcheck Section Prompts
+!define PIDGIN_SPELLCHECK_SECTION_TITLE		"St�d f�r r�ttstavning"
+!define PIDGIN_SPELLCHECK_ERROR			"Fel vid installation f�r r�ttstavning"
+!define PIDGIN_SPELLCHECK_DICT_ERROR		"Fel vid installation av r�ttstavningsordlista"
+!define PIDGIN_SPELLCHECK_SECTION_DESCRIPTION	"St�d f�r R�ttstavning.  (Internetanslutning kr�vs f�r installation)"
+!define ASPELL_INSTALL_FAILED			"Installationen misslyckades"
+!define PIDGIN_SPELLCHECK_BRETON		"Bretonska"
+!define PIDGIN_SPELLCHECK_CATALAN		"Katalanska"
+!define PIDGIN_SPELLCHECK_CZECH			"Tjeckiska"
+!define PIDGIN_SPELLCHECK_WELSH			"Kymriska"
+!define PIDGIN_SPELLCHECK_DANISH		"Danska"
+!define PIDGIN_SPELLCHECK_GERMAN		"Tyska"
+!define PIDGIN_SPELLCHECK_GREEK			"Grekiska"
+!define PIDGIN_SPELLCHECK_ENGLISH		"Engelska"
+!define PIDGIN_SPELLCHECK_ESPERANTO		"Esperanto"
+!define PIDGIN_SPELLCHECK_SPANISH		"Spanska"
+!define PIDGIN_SPELLCHECK_FAROESE		"F�r�iska"
+!define PIDGIN_SPELLCHECK_FRENCH		"Franska"
+!define PIDGIN_SPELLCHECK_ITALIAN		"Italienska"
+!define PIDGIN_SPELLCHECK_DUTCH			"Nederl�ndska"
+!define PIDGIN_SPELLCHECK_NORWEGIAN		"Norska"
+!define PIDGIN_SPELLCHECK_POLISH		"Polska"
+!define PIDGIN_SPELLCHECK_PORTUGUESE		"Portugisiska"
+!define PIDGIN_SPELLCHECK_ROMANIAN		"Rum�nska"
+!define PIDGIN_SPELLCHECK_RUSSIAN		"Ryska"
+!define PIDGIN_SPELLCHECK_SLOVAK		"Slovakiska"
+!define PIDGIN_SPELLCHECK_SWEDISH		"Svenska"
+!define PIDGIN_SPELLCHECK_UKRAINIAN		"Ukrainska"
--- a/po/ChangeLog	Thu Aug 02 04:12:57 2007 +0000
+++ b/po/ChangeLog	Thu Aug 02 04:16:37 2007 +0000
@@ -6,6 +6,7 @@
 	* French translation updated (�ric Boumaour)
 	* Galician translation updated (Mar Castro)
 	* German translation updated (Bjoern Voigt)
+	* German win32 translation updated (Bjoern Voigt)
 	* Hebrew translation updated (Shalom Craimer)
 	* Italian translation updated (Claudio Satriano)
 	* Japanese translation updated (Takeshi Aihana)
@@ -14,9 +15,12 @@
 	* Norwegian Nynorsk translation updated (Yngve Spjeld Landro)
 	* Portuguese (Brazilian) win32 translation updated (Mauricio de
 	  L R Collares Neto)
-	* Romanian translation updated (Misu Moldovan)
+	* Romanian translation updated (Mi�u Moldovan)
+	* Russian translation updated (Dmitry Beloglazov)
 	* Slovenian translation updated (Martin Srebotnjak)
 	* Spanish translation updated (Javier Fernandez-Sanguino Pe単a)
+	* Swedish translation updated (Peter Hjalmarsson)
+	* Swedish win32 translation updated (Peter Hjalmarsson)
 	* Turkish Translation updated (Serdar Soytetir)
 	* Valencian-Catalan translation added (Toni Hermoso Pulido)
 
--- a/po/de.po	Thu Aug 02 04:12:57 2007 +0000
+++ b/po/de.po	Thu Aug 02 04:16:37 2007 +0000
@@ -12,8 +12,8 @@
 msgstr ""
 "Project-Id-Version: de\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-07-09 09:35+0200\n"
-"PO-Revision-Date: 2007-07-12 14:41+0200\n"
+"POT-Creation-Date: 2007-07-28 21:25+0200\n"
+"PO-Revision-Date: 2007-07-28 21:25+0200\n"
 "Last-Translator: Bjoern Voigt <bjoern@cs.tu-berlin.de>\n"
 "Language-Team: Deutsch <de@li.org>\n"
 "MIME-Version: 1.0\n"
@@ -24,17 +24,16 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../finch/finch.c:70 ../finch/finch.c:298 ../finch/finch.c:327
-#: ../finch/finch.c:404
+#: finch/finch.c:70 finch/finch.c:298 finch/finch.c:327 finch/finch.c:404
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:204
+#: finch/finch.c:204
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Versuchen Sie `%s -h' f端r weitere Informationen.\n"
 
-#: ../finch/finch.c:206
+#: finch/finch.c:206
 #, c-format
 msgid ""
 "%s\n"
@@ -55,7 +54,7 @@
 "  -n, --nologin       nicht automatisch anmelden\n"
 "  -v, --version       zeigt aktuelle Version und beendet das Programm\n"
 
-#: ../finch/finch.c:325 ../pidgin/gtkmain.c:708
+#: finch/finch.c:325 pidgin/gtkmain.c:708
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -67,494 +66,458 @@
 "Migration per Hand. Bitte melden Sie diesen Fehler auf http://developer."
 "pidgin.im"
 
-#: ../finch/gntaccount.c:122 ../finch/gntaccount.c:477 ../finch/gntblist.c:298
-#: ../finch/gntblist.c:423 ../finch/gntblist.c:436 ../finch/gntplugin.c:185
-#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:297 ../finch/gntstatus.c:305
-#: ../libpurple/protocols/jabber/buddy.c:1464
-#: ../libpurple/protocols/jabber/chat.c:677
-#: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1227
-#: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
-#: ../libpurple/protocols/silc10/ops.c:1451
+#: finch/gntaccount.c:123 finch/gntaccount.c:478 finch/gntblist.c:299
+#: finch/gntblist.c:432 finch/gntblist.c:445 finch/gntplugin.c:185
+#: finch/gntplugin.c:233 finch/gntstatus.c:300 finch/gntstatus.c:308
+#: libpurple/protocols/jabber/buddy.c:1464
+#: libpurple/protocols/jabber/chat.c:677 libpurple/protocols/jabber/chat.c:688
+#: libpurple/protocols/jabber/jabber.c:1227
+#: libpurple/protocols/qq/group_join.c:328 libpurple/protocols/silc/ops.c:57
+#: libpurple/protocols/silc/ops.c:1456 libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Fehler"
 
-#: ../finch/gntaccount.c:122
+#: finch/gntaccount.c:123
 msgid "Account was not added"
 msgstr "Konto wurde nicht hinzugef端gt"
 
-#: ../finch/gntaccount.c:123
+#: finch/gntaccount.c:124
 msgid "Screenname of an account must be non-empty."
 msgstr "Benutzername eines Kontos darf nicht leer sein."
 
-#: ../finch/gntaccount.c:430
+#: finch/gntaccount.c:431
 msgid "New mail notifications"
 msgstr "Benachrichtigung 端ber neue Mails"
 
-#: ../finch/gntaccount.c:440
+#: finch/gntaccount.c:441
 msgid "Remember password"
 msgstr "Passwort speichern"
 
-#: ../finch/gntaccount.c:478
+#: finch/gntaccount.c:479
 msgid "There's no protocol plugins installed."
 msgstr "Es sind keine Protokoll-Plugins installiert."
 
-#: ../finch/gntaccount.c:479
+#: finch/gntaccount.c:480
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Sie haben wahrscheinlich vergessen 'make install' aufzurufen.)"
 
-#: ../finch/gntaccount.c:489 ../pidgin/gtkaccount.c:1473
-#: ../pidgin/gtkblist.c:4014
+#: finch/gntaccount.c:490 pidgin/gtkaccount.c:1473 pidgin/gtkblist.c:4024
 msgid "Modify Account"
 msgstr "Konto bearbeiten"
 
-#: ../finch/gntaccount.c:489
+#: finch/gntaccount.c:490
 msgid "New Account"
 msgstr "Neues Konto"
 
-#: ../finch/gntaccount.c:514 ../pidgin/gtkft.c:695
+#: finch/gntaccount.c:515 pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../finch/gntaccount.c:522
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: finch/gntaccount.c:523 pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Benutzername:"
 
-#: ../finch/gntaccount.c:535
+#: finch/gntaccount.c:536
 msgid "Password:"
 msgstr "Passwort:"
 
-#: ../finch/gntaccount.c:545
+#: finch/gntaccount.c:546
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:568 ../finch/gntaccount.c:631
-#: ../finch/gntaccount.c:875 ../finch/gntblist.c:342 ../finch/gntblist.c:411
-#: ../finch/gntblist.c:446 ../finch/gntblist.c:793 ../finch/gntblist.c:995
-#: ../finch/gntblist.c:1091 ../finch/gntblist.c:2197 ../finch/gntplugin.c:378
-#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:264
-#: ../finch/gntstatus.c:143 ../finch/gntstatus.c:478 ../finch/gntstatus.c:603
-#: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1173
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
-#: ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:588
-#: ../libpurple/protocols/jabber/buddy.c:1826
-#: ../libpurple/protocols/jabber/buddy.c:1862
-#: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/jabber/xdata.c:337
-#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
-#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
-#: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6073
-#: ../libpurple/protocols/oscar/peer.c:1023
-#: ../libpurple/protocols/qq/buddy_info.c:484
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:409
-#: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:140
-#: ../libpurple/protocols/qq/group_join.c:365
-#: ../libpurple/protocols/qq/group_opt.c:144
-#: ../libpurple/protocols/qq/group_opt.c:399
-#: ../libpurple/protocols/qq/sys_msg.c:115
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:269
-#: ../libpurple/protocols/sametime/sametime.c:3388
-#: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5487
-#: ../libpurple/protocols/sametime/sametime.c:5612
-#: ../libpurple/protocols/silc/buddy.c:455
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc/buddy.c:1191
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc/ops.c:1816
-#: ../libpurple/protocols/silc/silc.c:823
-#: ../libpurple/protocols/silc/silc.c:1031
-#: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1084
-#: ../libpurple/protocols/silc10/buddy.c:1189
-#: ../libpurple/protocols/silc10/chat.c:600
-#: ../libpurple/protocols/silc10/chat.c:730
-#: ../libpurple/protocols/silc10/ops.c:1904
-#: ../libpurple/protocols/silc10/silc.c:736
-#: ../libpurple/protocols/silc10/silc.c:942
-#: ../libpurple/protocols/yahoo/yahoo.c:989
-#: ../libpurple/protocols/yahoo/yahoo.c:3248
-#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtkaccount.c:2502 ../pidgin/gtkblist.c:5915
-#: ../pidgin/gtkdialogs.c:725 ../pidgin/gtkdialogs.c:863
-#: ../pidgin/gtkdialogs.c:955 ../pidgin/gtkdialogs.c:975
-#: ../pidgin/gtkdialogs.c:999 ../pidgin/gtkdialogs.c:1021
-#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1110
-#: ../pidgin/gtkdialogs.c:1166 ../pidgin/gtkdialogs.c:1205
-#: ../pidgin/gtkdialogs.c:1232 ../pidgin/gtkimhtmltoolbar.c:425
-#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
-#: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1582
+#: finch/gntaccount.c:569 finch/gntaccount.c:632 finch/gntaccount.c:878
+#: finch/gntblist.c:343 finch/gntblist.c:420 finch/gntblist.c:455
+#: finch/gntblist.c:802 finch/gntblist.c:1004 finch/gntblist.c:1100
+#: finch/gntblist.c:2209 finch/gntplugin.c:378 finch/gntpounce.c:458
+#: finch/gntpounce.c:656 finch/gntprefs.c:264 finch/gntstatus.c:144
+#: finch/gntstatus.c:481 finch/gntstatus.c:606 libpurple/account.c:984
+#: libpurple/account.c:1234 libpurple/account.c:1269
+#: libpurple/conversation.c:1173 libpurple/plugins/buddynote.c:51
+#: libpurple/protocols/gg/gg.c:502 libpurple/protocols/gg/gg.c:661
+#: libpurple/protocols/gg/gg.c:798 libpurple/protocols/gg/gg.c:879
+#: libpurple/protocols/jabber/buddy.c:588
+#: libpurple/protocols/jabber/buddy.c:1826
+#: libpurple/protocols/jabber/buddy.c:1862
+#: libpurple/protocols/jabber/chat.c:786
+#: libpurple/protocols/jabber/jabber.c:882
+#: libpurple/protocols/jabber/jabber.c:1384
+#: libpurple/protocols/jabber/si.c:868 libpurple/protocols/jabber/xdata.c:337
+#: libpurple/protocols/msn/msn.c:259 libpurple/protocols/msn/msn.c:276
+#: libpurple/protocols/msn/msn.c:293 libpurple/protocols/msn/msn.c:310
+#: libpurple/protocols/msn/msn.c:331 libpurple/protocols/oscar/oscar.c:6073
+#: libpurple/protocols/oscar/peer.c:1023
+#: libpurple/protocols/qq/buddy_info.c:484
+#: libpurple/protocols/qq/buddy_opt.c:214
+#: libpurple/protocols/qq/buddy_opt.c:409 libpurple/protocols/qq/group.c:124
+#: libpurple/protocols/qq/group_join.c:140
+#: libpurple/protocols/qq/group_join.c:365
+#: libpurple/protocols/qq/group_opt.c:144
+#: libpurple/protocols/qq/group_opt.c:399 libpurple/protocols/qq/sys_msg.c:115
+#: libpurple/protocols/qq/sys_msg.c:174 libpurple/protocols/qq/sys_msg.c:269
+#: libpurple/protocols/sametime/sametime.c:3389
+#: libpurple/protocols/sametime/sametime.c:3475
+#: libpurple/protocols/sametime/sametime.c:3646
+#: libpurple/protocols/sametime/sametime.c:5398
+#: libpurple/protocols/sametime/sametime.c:5488
+#: libpurple/protocols/sametime/sametime.c:5613
+#: libpurple/protocols/silc/buddy.c:455 libpurple/protocols/silc/buddy.c:1076
+#: libpurple/protocols/silc/buddy.c:1191 libpurple/protocols/silc/chat.c:616
+#: libpurple/protocols/silc/chat.c:746 libpurple/protocols/silc/ops.c:1816
+#: libpurple/protocols/silc/silc.c:823 libpurple/protocols/silc/silc.c:1031
+#: libpurple/protocols/silc10/buddy.c:468
+#: libpurple/protocols/silc10/buddy.c:1084
+#: libpurple/protocols/silc10/buddy.c:1189
+#: libpurple/protocols/silc10/chat.c:600 libpurple/protocols/silc10/chat.c:730
+#: libpurple/protocols/silc10/ops.c:1904 libpurple/protocols/silc10/silc.c:736
+#: libpurple/protocols/silc10/silc.c:942 libpurple/protocols/yahoo/yahoo.c:989
+#: libpurple/protocols/yahoo/yahoo.c:3252
+#: libpurple/protocols/yahoo/yahoo.c:3263 pidgin/gtkaccount.c:1912
+#: pidgin/gtkaccount.c:2506 pidgin/gtkblist.c:5926 pidgin/gtkdialogs.c:727
+#: pidgin/gtkdialogs.c:865 pidgin/gtkdialogs.c:957 pidgin/gtkdialogs.c:977
+#: pidgin/gtkdialogs.c:1001 pidgin/gtkdialogs.c:1023 pidgin/gtkdialogs.c:1071
+#: pidgin/gtkdialogs.c:1112 pidgin/gtkdialogs.c:1168 pidgin/gtkdialogs.c:1207
+#: pidgin/gtkdialogs.c:1234 pidgin/gtkimhtmltoolbar.c:425 pidgin/gtklog.c:327
+#: pidgin/gtkplugin.c:288 pidgin/gtkpounce.c:1115 pidgin/gtkprivacy.c:562
+#: pidgin/gtkprivacy.c:578 pidgin/gtkprivacy.c:603 pidgin/gtkprivacy.c:617
+#: pidgin/gtkrequest.c:270 pidgin/gtksavedstatuses.c:344
+#: pidgin/gtkstatusbox.c:1572
 msgid "Cancel"
 msgstr "Abbrechen"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:572 ../finch/gntplugin.c:378 ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:264 ../finch/gntstatus.c:481 ../finch/gntstatus.c:591
-#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
-#: ../pidgin/gtkrequest.c:276
+#: finch/gntaccount.c:573 finch/gntplugin.c:378 finch/gntpounce.c:464
+#: finch/gntprefs.c:264 finch/gntstatus.c:484 finch/gntstatus.c:594
+#: libpurple/account.c:1268 libpurple/plugins/buddynote.c:50
+#: libpurple/protocols/jabber/buddy.c:587 pidgin/gtkdebug.c:748
+#: pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Speichern"
 
-#: ../finch/gntaccount.c:625 ../pidgin/gtkaccount.c:1900
-#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1576
+#: finch/gntaccount.c:626 pidgin/gtkaccount.c:1904
+#: pidgin/gtksavedstatuses.c:332 pidgin/gtkstatusbox.c:1566
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Wollen Sie %s wirklich l旦schen?"
 
-#: ../finch/gntaccount.c:628
+#: finch/gntaccount.c:629
 msgid "Delete Account"
 msgstr "Konto l旦schen"
 
 #. Delete button
-#: ../finch/gntaccount.c:630 ../finch/gntaccount.c:699
-#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:715 ../finch/gntstatus.c:142
-#: ../finch/gntstatus.c:207 ../pidgin/gtkaccount.c:1907 ../pidgin/gtklog.c:301
-#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1581
+#: finch/gntaccount.c:631 finch/gntaccount.c:701 finch/gntpounce.c:655
+#: finch/gntpounce.c:718 finch/gntstatus.c:143 finch/gntstatus.c:209
+#: pidgin/gtkaccount.c:1911 pidgin/gtklog.c:326 pidgin/gtkpounce.c:1114
+#: pidgin/gtkrequest.c:273 pidgin/gtksavedstatuses.c:343
+#: pidgin/gtkstatusbox.c:1571
 msgid "Delete"
 msgstr "L旦schen"
 
-#: ../finch/gntaccount.c:662 ../finch/gntblist.c:2103 ../finch/gntui.c:77
-#: ../pidgin/gtkaccount.c:2328 ../pidgin/gtkdocklet.c:522
+#: finch/gntaccount.c:663 finch/gntblist.c:2115 finch/gntui.c:77
+#: pidgin/gtkaccount.c:2329 pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Konten"
 
-#: ../finch/gntaccount.c:668
+#: finch/gntaccount.c:669
 msgid "You can enable/disable accounts from the following list."
 msgstr "Sie k旦nnen Konten auf der folgenden Liste (de)aktivieren."
 
 #. Add button
-#: ../finch/gntaccount.c:691 ../finch/gntaccount.c:874 ../finch/gntblist.c:341
-#: ../finch/gntblist.c:411 ../finch/gntblist.c:446 ../finch/gntnotify.c:379
-#: ../finch/gntpounce.c:700 ../finch/gntstatus.c:197
-#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
-#: ../libpurple/protocols/qq/sys_msg.c:175
-#: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2501
-#: ../pidgin/gtkblist.c:5914 ../pidgin/gtkconv.c:1652
-#: ../pidgin/gtkrequest.c:274
+#: finch/gntaccount.c:692 finch/gntaccount.c:877 finch/gntblist.c:342
+#: finch/gntblist.c:420 finch/gntblist.c:455 finch/gntnotify.c:379
+#: finch/gntpounce.c:702 finch/gntstatus.c:198 libpurple/protocols/gg/gg.c:878
+#: libpurple/protocols/qq/sys_msg.c:116 libpurple/protocols/qq/sys_msg.c:175
+#: libpurple/protocols/qq/sys_msg.c:270
+#: libpurple/protocols/sametime/sametime.c:5487
+#: libpurple/protocols/silc/chat.c:615 libpurple/protocols/silc10/chat.c:599
+#: pidgin/gtkaccount.c:2505 pidgin/gtkblist.c:5925 pidgin/gtkconv.c:1650
+#: pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Hinzuf端gen"
 
 #. Modify button
-#: ../finch/gntaccount.c:695 ../finch/gntpounce.c:707
+#: finch/gntaccount.c:697 finch/gntpounce.c:710
 msgid "Modify"
 msgstr "Bearbeiten"
 
-#: ../finch/gntaccount.c:797 ../pidgin/gtkaccount.c:2448
+#: finch/gntaccount.c:800 pidgin/gtkaccount.c:2452
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s hat %s zu seinem Buddy gemacht%s%s"
 
-#: ../finch/gntaccount.c:870 ../pidgin/gtkaccount.c:2500
+#: finch/gntaccount.c:873 pidgin/gtkaccount.c:2504
 msgid "Add buddy to your list?"
 msgstr "Benutzer zu Ihrer Buddy-Liste hinzuf端gen?"
 
-#: ../finch/gntaccount.c:924 ../pidgin/gtkaccount.c:2552
+#: finch/gntaccount.c:927 pidgin/gtkaccount.c:2556
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s m旦chte %s zu seiner oder ihrer Buddy-Liste hinzuf端gen%s%s"
 
-#: ../finch/gntaccount.c:949 ../finch/gntaccount.c:952
-#: ../finch/gntaccount.c:979 ../pidgin/gtkaccount.c:2575
-#: ../pidgin/gtkaccount.c:2581
+#: finch/gntaccount.c:952 finch/gntaccount.c:955 finch/gntaccount.c:982
+#: pidgin/gtkaccount.c:2579 pidgin/gtkaccount.c:2585
 msgid "Authorize buddy?"
 msgstr "Buddy autorisieren?"
 
-#: ../finch/gntaccount.c:956 ../finch/gntaccount.c:983
-#: ../pidgin/gtkaccount.c:2576 ../pidgin/gtkaccount.c:2582
+#: finch/gntaccount.c:959 finch/gntaccount.c:986 pidgin/gtkaccount.c:2580
+#: pidgin/gtkaccount.c:2586
 msgid "Authorize"
 msgstr "Autorisieren"
 
-#: ../finch/gntaccount.c:957 ../finch/gntaccount.c:984
-#: ../pidgin/gtkaccount.c:2577 ../pidgin/gtkaccount.c:2583
+#: finch/gntaccount.c:960 finch/gntaccount.c:987 pidgin/gtkaccount.c:2581
+#: pidgin/gtkaccount.c:2587
 msgid "Deny"
 msgstr "Sperren"
 
-#: ../finch/gntblist.c:287
+#: finch/gntblist.c:288
 msgid "You must provide a screename for the buddy."
 msgstr "Sie m端ssen einen Benutzernamen f端r den Buddy angeben."
 
-#: ../finch/gntblist.c:289
+#: finch/gntblist.c:290
 msgid "You must provide a group."
 msgstr "Sie m端ssen eine Gruppe angeben."
 
-#: ../finch/gntblist.c:291
+#: finch/gntblist.c:292
 msgid "You must select an account."
 msgstr "Sie m端ssen ein Konto ausw辰hlen."
 
-#: ../finch/gntblist.c:293
+#: finch/gntblist.c:294
 msgid "The selected account is not online."
 msgstr "Das gew辰hlte Konto ist nicht online."
 
-#: ../finch/gntblist.c:298
+#: finch/gntblist.c:299
 msgid "Error adding buddy"
 msgstr "Fehler beim Hinzuf端gen des Buddys"
 
-#: ../finch/gntblist.c:323 ../libpurple/protocols/oscar/oscar.c:2864
-#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtksavedstatuses.c:979
+#: finch/gntblist.c:324 libpurple/protocols/oscar/oscar.c:2860
+#: pidgin/gtkaccount.c:1985 pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Benutzername"
 
-#: ../finch/gntblist.c:326 ../finch/gntblist.c:403 ../finch/gntblist.c:1239
-#: ../libpurple/protocols/msn/msn.c:1364
-#: ../libpurple/protocols/silc/chat.c:606
-#: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
-#: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:974
-#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
-#: ../pidgin/gtkrequest.c:277
+#: finch/gntblist.c:327 finch/gntblist.c:409 finch/gntblist.c:1249
+#: libpurple/protocols/msn/msn.c:1364 libpurple/protocols/silc/chat.c:606
+#: libpurple/protocols/silc10/chat.c:590
+#: libpurple/protocols/yahoo/yahoo_profile.c:704
+#: libpurple/protocols/zephyr/zephyr.c:788
+#: libpurple/protocols/zephyr/zephyr.c:1207 pidgin/gtkdialogs.c:976
+#: pidgin/gtkdialogs.c:1000 pidgin/gtkdialogs.c:1022 pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:329 ../finch/gntblist.c:406
+#: finch/gntblist.c:330 finch/gntblist.c:412
 msgid "Group"
 msgstr "Gruppe"
 
-#: ../finch/gntblist.c:333 ../finch/gntblist.c:394 ../finch/gntblist.c:1291
-#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:569
-#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2974 ../pidgin/gtknotify.c:482
-#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:443
+#: finch/gntblist.c:334 finch/gntblist.c:400 finch/gntblist.c:1301
+#: finch/gntnotify.c:173 finch/gntstatus.c:572 libpurple/plugins/idle.c:153
+#: libpurple/plugins/idle.c:190 pidgin/gtkblist.c:2983 pidgin/gtknotify.c:482
+#: pidgin/gtkpounce.c:1282 pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Konto"
 
-#: ../finch/gntblist.c:339 ../finch/gntblist.c:842
-#: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/buddy.c:1072
-#: ../libpurple/protocols/silc/buddy.c:1182
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/buddy.c:1080
-#: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5420
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
+#: finch/gntblist.c:340 finch/gntblist.c:851
+#: libpurple/protocols/silc/buddy.c:725 libpurple/protocols/silc/buddy.c:1027
+#: libpurple/protocols/silc/buddy.c:1072 libpurple/protocols/silc/buddy.c:1182
+#: libpurple/protocols/silc10/buddy.c:737
+#: libpurple/protocols/silc10/buddy.c:1033
+#: libpurple/protocols/silc10/buddy.c:1080
+#: libpurple/protocols/silc10/buddy.c:1180
+#: libpurple/protocols/yahoo/yahoo.c:3165 pidgin/gtkblist.c:5432
+#: pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Buddy hinzuf端gen"
 
-#: ../finch/gntblist.c:339
+#: finch/gntblist.c:340
 msgid "Please enter buddy information."
 msgstr "Bitte Buddy-Informationen angeben."
 
-#: ../finch/gntblist.c:366 ../libpurple/blist.c:1190
+#: finch/gntblist.c:369 libpurple/blist.c:1190
 msgid "Chats"
 msgstr "Chats"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:400 ../libpurple/protocols/jabber/jabber.c:813
-#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
-#: ../libpurple/protocols/msn/msn.c:1645
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
-#: ../pidgin/gtkroomlist.c:617
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
+#: finch/gntblist.c:406 libpurple/protocols/jabber/jabber.c:813
+#: libpurple/protocols/msn/msn.c:1553 libpurple/protocols/msn/msn.c:1618
+#: libpurple/protocols/msn/msn.c:1645 libpurple/protocols/qq/buddy_info.c:44
+#: pidgin/gtkplugin.c:581 pidgin/gtkroomlist.c:617
+#: pidgin/plugins/gevolution/add_buddy_dialog.c:132
+#: pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Name"
 
-#: ../finch/gntblist.c:409 ../finch/gntblist.c:844 ../pidgin/gtkblist.c:5800
+#: finch/gntblist.c:415 finch/gntblist.c:818
+msgid "Auto-join"
+msgstr "Automatisch beitreten"
+
+#: finch/gntblist.c:418 finch/gntblist.c:853 pidgin/gtkblist.c:5811
 msgid "Add Chat"
 msgstr "Chat hinzuf端gen"
 
-#: ../finch/gntblist.c:410
+#: finch/gntblist.c:419
 msgid "You can edit more information from the context menu later."
 msgstr "Sie k旦nnen sp辰ter mehr Informationen 端ber das Kontextmen端 bearbeiten."
 
-#: ../finch/gntblist.c:423 ../finch/gntblist.c:436
+#: finch/gntblist.c:432 finch/gntblist.c:445
 msgid "Error adding group"
 msgstr "Fehler beim Hinzuf端gen der Gruppe"
 
-#: ../finch/gntblist.c:424
+#: finch/gntblist.c:433
 msgid "You must give a name for the group to add."
 msgstr "Bitte geben Sie den Namen der Gruppe ein, die hinzugef端gt werden soll."
 
-#: ../finch/gntblist.c:437
+#: finch/gntblist.c:446
 msgid "A group with the name already exists."
 msgstr "Es gibt schon eine Gruppe mit diesem Namen."
 
-#: ../finch/gntblist.c:444 ../finch/gntblist.c:846
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5911
+#: finch/gntblist.c:453 finch/gntblist.c:855
+#: libpurple/protocols/sametime/sametime.c:5397
+#: libpurple/protocols/sametime/sametime.c:5485 pidgin/gtkblist.c:5922
 msgid "Add Group"
 msgstr "Gruppe hinzuf端gen"
 
-#: ../finch/gntblist.c:444
+#: finch/gntblist.c:453
 msgid "Enter the name of the group"
 msgstr "Bitte geben Sie den Namen der Gruppe ein"
 
-#: ../finch/gntblist.c:792
+#: finch/gntblist.c:801
 msgid "Edit Chat"
 msgstr "Chat bearbeiten"
 
-#: ../finch/gntblist.c:792
+#: finch/gntblist.c:801
 msgid "Please Update the necessary fields."
 msgstr "Bitte aktualisieren Sie die erforderlichen Felder."
 
-#: ../finch/gntblist.c:793 ../finch/gntstatus.c:202
+#: finch/gntblist.c:802 finch/gntstatus.c:204
 msgid "Edit"
 msgstr "Bearbeiten"
 
-#: ../finch/gntblist.c:809
-msgid "Auto-join"
-msgstr "Automatisch beitreten"
-
-#: ../finch/gntblist.c:818
+#: finch/gntblist.c:827
 msgid "Edit Settings"
 msgstr "Einstellungen bearbeiten"
 
-#: ../finch/gntblist.c:854 ../pidgin/gtkutils.c:920
+#: finch/gntblist.c:863 pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "Information"
 
-#: ../finch/gntblist.c:854 ../pidgin/gtkutils.c:920
+#: finch/gntblist.c:863 pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr "Empfange..."
 
-#: ../finch/gntblist.c:894 ../finch/gntconv.c:407
-#: ../libpurple/protocols/silc/chat.c:899
-#: ../libpurple/protocols/silc10/chat.c:883
+#: finch/gntblist.c:903 finch/gntconv.c:407
+#: libpurple/protocols/silc/chat.c:899 libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Benutzer-Info"
 
-#: ../finch/gntblist.c:898
+#: finch/gntblist.c:907
 msgid "Add Buddy Pounce"
 msgstr "Buddy-Alarm hinzuf端gen"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:905 ../finch/gntconv.c:419
-#: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1600
+#: finch/gntblist.c:914 finch/gntconv.c:419
+#: libpurple/protocols/jabber/si.c:868 libpurple/protocols/oscar/oscar.c:654
+#: libpurple/protocols/qq/qq.c:585 pidgin/gtkconv.c:1598
 msgid "Send File"
 msgstr "Datei versenden"
 
-#: ../finch/gntblist.c:909
+#: finch/gntblist.c:918
 msgid "View Log"
 msgstr "Mitschnitt anzeigen"
 
-#: ../finch/gntblist.c:990
+#: finch/gntblist.c:999
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Bitte geben Sie den neuen Namen f端r %s ein"
 
-#: ../finch/gntblist.c:992 ../finch/gntblist.c:1239
+#: finch/gntblist.c:1001 finch/gntblist.c:1249
 msgid "Rename"
 msgstr "Umbenennen"
 
-#: ../finch/gntblist.c:992
+#: finch/gntblist.c:1001
 msgid "Set Alias"
 msgstr "Alias setzen"
 
-#: ../finch/gntblist.c:993
+#: finch/gntblist.c:1002
 msgid "Enter empty string to reset the name."
 msgstr "Geben Sie eine leere Zeichenkette ein, um den Namen zur端ckzusetzen."
 
-#: ../finch/gntblist.c:1069
+#: finch/gntblist.c:1078
 msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "Wenn Sie diesen Kontakt l旦schen, l旦schen Sie auch alle Buddys in dem Kontakt"
-
-#: ../finch/gntblist.c:1077
+msgstr ""
+"Wenn Sie diesen Kontakt l旦schen, l旦schen Sie auch alle Buddys in dem Kontakt"
+
+#: finch/gntblist.c:1086
 msgid "Removing this group will also remove all the buddies in the group"
-msgstr "Wenn Sie diese Gruppe l旦schen, l旦schen Sie auch alle Buddys in der Gruppe"
-
-#: ../finch/gntblist.c:1082
+msgstr ""
+"Wenn Sie diese Gruppe l旦schen, l旦schen Sie auch alle Buddys in der Gruppe"
+
+#: finch/gntblist.c:1091
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Wollen Sie %s wirklich l旦schen?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1085
+#: finch/gntblist.c:1094
 msgid "Confirm Remove"
 msgstr "Entfernen best辰tigen"
 
-#: ../finch/gntblist.c:1090 ../finch/gntblist.c:1241 ../finch/gntft.c:224
-#: ../pidgin/gtkconv.c:1649 ../pidgin/gtkrequest.c:275
-#: ../pidgin/gtkstatusbox.c:263
+#: finch/gntblist.c:1099 finch/gntblist.c:1251 finch/gntft.c:224
+#: pidgin/gtkconv.c:1647 pidgin/gtkrequest.c:275 pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "Entfernen"
 
 #. Buddy List
-#: ../finch/gntblist.c:1215 ../finch/gntblist.c:2282 ../finch/gntprefs.c:257
-#: ../finch/gntui.c:78 ../pidgin/gtkblist.c:4256
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+#: finch/gntblist.c:1225 finch/gntblist.c:2294 finch/gntprefs.c:257
+#: finch/gntui.c:78 pidgin/gtkblist.c:4268
+#: pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "Buddy-Liste"
 
-#: ../finch/gntblist.c:1246
+#: finch/gntblist.c:1256
 msgid "Place tagged"
 msgstr "Stelle markiert"
 
-#: ../finch/gntblist.c:1251
+#: finch/gntblist.c:1261
 msgid "Toggle Tag"
 msgstr "Markierung umkehren"
 
 #. General
-#: ../finch/gntblist.c:1286 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
-#: ../libpurple/protocols/gg/gg.c:2202
-#: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:856
-#: ../libpurple/protocols/jabber/buddy.c:1627
-#: ../libpurple/protocols/jabber/buddy.c:1809
-#: ../libpurple/protocols/jabber/jabber.c:823
-#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
-#: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1535
-#: ../libpurple/protocols/silc/ops.c:1002
-#: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1322
-#: ../libpurple/protocols/silc10/buddy.c:1535
-#: ../libpurple/protocols/silc10/ops.c:1036
-#: ../libpurple/protocols/silc10/ops.c:1179
-#: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2998
+#: finch/gntblist.c:1296 libpurple/protocols/gg/gg.c:632
+#: libpurple/protocols/gg/gg.c:1045 libpurple/protocols/gg/gg.c:1118
+#: libpurple/protocols/gg/gg.c:2202 libpurple/protocols/jabber/buddy.c:274
+#: libpurple/protocols/jabber/buddy.c:856
+#: libpurple/protocols/jabber/buddy.c:1627
+#: libpurple/protocols/jabber/buddy.c:1809
+#: libpurple/protocols/jabber/jabber.c:823 libpurple/protocols/msn/msn.c:1372
+#: libpurple/protocols/msn/msn.c:1556 libpurple/protocols/qq/buddy_info.c:43
+#: libpurple/protocols/silc/buddy.c:1535 libpurple/protocols/silc/ops.c:1002
+#: libpurple/protocols/silc/ops.c:1186 libpurple/protocols/silc/ops.c:1322
+#: libpurple/protocols/silc10/buddy.c:1535
+#: libpurple/protocols/silc10/ops.c:1036 libpurple/protocols/silc10/ops.c:1179
+#: libpurple/protocols/silc10/ops.c:1328
+#: libpurple/protocols/yahoo/yahoo_profile.c:1066 pidgin/gtkblist.c:3007
 msgid "Nickname"
 msgstr "Spitzname"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1306 ../finch/gntprefs.c:260
-#: ../libpurple/protocols/bonjour/bonjour.c:314
-#: ../libpurple/protocols/jabber/buddy.c:647
-#: ../libpurple/protocols/jabber/buddy.c:687
-#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2888
-#: ../libpurple/protocols/yahoo/yahoo.c:2915
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3026
-#: ../pidgin/gtkblist.c:3435 ../pidgin/gtkprefs.c:1918
+#: finch/gntblist.c:1316 finch/gntprefs.c:260
+#: libpurple/protocols/bonjour/bonjour.c:314
+#: libpurple/protocols/jabber/buddy.c:647
+#: libpurple/protocols/jabber/buddy.c:687 libpurple/protocols/msn/msn.c:516
+#: libpurple/protocols/msn/state.c:32 libpurple/protocols/novell/novell.c:2825
+#: libpurple/protocols/oscar/oscar.c:2884
+#: libpurple/protocols/yahoo/yahoo.c:2919
+#: libpurple/protocols/yahoo/yahoo_profile.c:710 pidgin/gtkblist.c:3035
+#: pidgin/gtkblist.c:3444 pidgin/gtkprefs.c:1918
 msgid "Idle"
 msgstr "Unt辰tig"
 
-#: ../finch/gntblist.c:1319
+#: finch/gntblist.c:1330
 msgid "On Mobile"
 msgstr "Am Handy"
 
-#: ../finch/gntblist.c:1399
+#: finch/gntblist.c:1411
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -563,12 +526,12 @@
 "Online: %d\n"
 "Gesamt: %d"
 
-#: ../finch/gntblist.c:1408
+#: finch/gntblist.c:1420
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Konto: %s (%s)"
 
-#: ../finch/gntblist.c:1420
+#: finch/gntblist.c:1432
 #, c-format
 msgid ""
 "\n"
@@ -577,111 +540,103 @@
 "\n"
 "Zuletzt gesehen: vor %s"
 
-#: ../finch/gntblist.c:1686 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1070
+#: finch/gntblist.c:1698 pidgin/gtkdocklet.c:470 pidgin/gtkstatusbox.c:1070
 msgid "New..."
 msgstr "Neu..."
 
-#: ../finch/gntblist.c:1693 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1071
+#: finch/gntblist.c:1705 pidgin/gtkdocklet.c:471 pidgin/gtkstatusbox.c:1071
 msgid "Saved..."
 msgstr "Gespeichert..."
 
-#: ../finch/gntblist.c:2071 ../finch/gntplugin.c:254 ../finch/gntui.c:82
-#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
+#: finch/gntblist.c:2083 finch/gntplugin.c:254 finch/gntui.c:82
+#: pidgin/gtkdocklet.c:523 pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Plugins"
 
-#: ../finch/gntblist.c:2178 ../pidgin/gtkdialogs.c:706
-#: ../pidgin/gtkdialogs.c:844 ../pidgin/gtkdialogs.c:925
+#: finch/gntblist.c:2190 pidgin/gtkdialogs.c:708 pidgin/gtkdialogs.c:846
+#: pidgin/gtkdialogs.c:927
 msgid "_Name"
 msgstr "_Name"
 
-#: ../finch/gntblist.c:2183 ../pidgin/gtkdialogs.c:711
-#: ../pidgin/gtkdialogs.c:849 ../pidgin/gtkdialogs.c:930
+#: finch/gntblist.c:2195 pidgin/gtkdialogs.c:713 pidgin/gtkdialogs.c:851
+#: pidgin/gtkdialogs.c:932
 msgid "_Account"
 msgstr "_Konto"
 
-#: ../finch/gntblist.c:2191 ../pidgin/gtkdialogs.c:719
+#: finch/gntblist.c:2203 pidgin/gtkdialogs.c:721
 msgid "New Instant Message"
 msgstr "Neue Sofortnachricht"
 
-#: ../finch/gntblist.c:2193 ../pidgin/gtkdialogs.c:721
-msgid "Please enter the screen name or alias of the person you would like to IM."
-msgstr "Bitte geben Sie den Benutzernamen der Person ein, mit der Sie chatten wollen."
-
-#: ../finch/gntblist.c:2196 ../finch/gntnotify.c:79 ../libpurple/account.c:983
-#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
-#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1383
-#: ../libpurple/protocols/jabber/xdata.c:336
-#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
-#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6072
-#: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1190
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:482
-#: ../libpurple/protocols/silc/chat.c:745
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1815
-#: ../libpurple/protocols/silc/silc.c:822
-#: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1188
-#: ../libpurple/protocols/silc10/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:464
-#: ../libpurple/protocols/silc10/chat.c:729
-#: ../libpurple/protocols/silc10/ops.c:1297
-#: ../libpurple/protocols/silc10/ops.c:1903
-#: ../libpurple/protocols/silc10/silc.c:735
-#: ../libpurple/protocols/yahoo/yahoo.c:988
-#: ../libpurple/protocols/yahoo/yahoo.c:3247
-#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:4013
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
-#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkrequest.c:269
+#: finch/gntblist.c:2205 pidgin/gtkdialogs.c:723
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr ""
+"Bitte geben Sie den Benutzernamen der Person ein, mit der Sie chatten wollen."
+
+#: finch/gntblist.c:2208 finch/gntnotify.c:79 libpurple/account.c:983
+#: libpurple/account.c:1233 libpurple/protocols/gg/gg.c:501
+#: libpurple/protocols/gg/gg.c:660 libpurple/protocols/gg/gg.c:797
+#: libpurple/protocols/jabber/jabber.c:1383
+#: libpurple/protocols/jabber/xdata.c:336 libpurple/protocols/msn/msn.c:258
+#: libpurple/protocols/msn/msn.c:275 libpurple/protocols/msn/msn.c:292
+#: libpurple/protocols/msn/msn.c:309 libpurple/protocols/oscar/oscar.c:6072
+#: libpurple/protocols/silc/buddy.c:454 libpurple/protocols/silc/buddy.c:1190
+#: libpurple/protocols/silc/chat.c:447 libpurple/protocols/silc/chat.c:482
+#: libpurple/protocols/silc/chat.c:745 libpurple/protocols/silc/ops.c:1291
+#: libpurple/protocols/silc/ops.c:1815 libpurple/protocols/silc/silc.c:822
+#: libpurple/protocols/silc10/buddy.c:467
+#: libpurple/protocols/silc10/buddy.c:1188
+#: libpurple/protocols/silc10/chat.c:425 libpurple/protocols/silc10/chat.c:464
+#: libpurple/protocols/silc10/chat.c:729 libpurple/protocols/silc10/ops.c:1297
+#: libpurple/protocols/silc10/ops.c:1903 libpurple/protocols/silc10/silc.c:735
+#: libpurple/protocols/yahoo/yahoo.c:988
+#: libpurple/protocols/yahoo/yahoo.c:3251
+#: libpurple/protocols/yahoo/yahoo.c:3262 pidgin/gtkblist.c:4023
+#: pidgin/gtkdialogs.c:726 pidgin/gtkdialogs.c:864 pidgin/gtkdialogs.c:956
+#: pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2216 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:791
+#: finch/gntblist.c:2228 finch/gntpounce.c:446 pidgin/gtkpounce.c:791
 msgid "Options"
 msgstr "Optionen"
 
-#: ../finch/gntblist.c:2222
+#: finch/gntblist.c:2234
 msgid "Send IM..."
 msgstr "Nachricht senden..."
 
-#: ../finch/gntblist.c:2226
+#: finch/gntblist.c:2238
 msgid "Show empty groups"
 msgstr "Zeige leere Gruppen"
 
-#: ../finch/gntblist.c:2232
+#: finch/gntblist.c:2244
 msgid "Show offline buddies"
 msgstr "Zeige Offline-Buddys"
 
-#: ../finch/gntblist.c:2238
+#: finch/gntblist.c:2250
 msgid "Sort by status"
 msgstr "Nach Status sortieren"
 
-#: ../finch/gntblist.c:2242
+#: finch/gntblist.c:2254
 msgid "Sort alphabetically"
 msgstr "Alphabetisch sortieren"
 
-#: ../finch/gntblist.c:2246
+#: finch/gntblist.c:2258
 msgid "Sort by log size"
 msgstr "Nach Gr旦�e der Logs sortieren"
 
-#: ../finch/gntconn.c:110
+#: finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:113
+#: finch/gntconn.c:113
 #, c-format
 msgid "%s disconnected."
 msgstr "%s abgemeldet."
 
-#: ../finch/gntconn.c:114
+#: finch/gntconn.c:114
 #, c-format
 msgid ""
 "%s\n"
@@ -694,41 +649,42 @@
 "Finch wird nicht versuchen, das Konto wieder zu verbinden bis Sie den Fehler "
 "behoben und das Konto wieder aktiviert haben."
 
-#: ../finch/gntconv.c:117
+#: finch/gntconv.c:117
 msgid "No such command."
 msgstr "Es gibt kein solches Kommando."
 
-#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:493
+#: finch/gntconv.c:121 pidgin/gtkconv.c:491
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "Syntaxfehler:  Sie 端bergaben dem Kommando eine falsche Anzahl von Argumenten."
-
-#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:499
+msgstr ""
+"Syntaxfehler:  Sie 端bergaben dem Kommando eine falsche Anzahl von Argumenten."
+
+#: finch/gntconv.c:126 pidgin/gtkconv.c:497
 msgid "Your command failed for an unknown reason."
 msgstr "Ihre Kommando scheiterte aus einem unbekannten Grund."
 
-#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:506
+#: finch/gntconv.c:131 pidgin/gtkconv.c:504
 msgid "That command only works in chats, not IMs."
 msgstr "Dieses Kommando funktioniert nur in Chats, nicht bei IMs."
 
-#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:509
+#: finch/gntconv.c:134 pidgin/gtkconv.c:507
 msgid "That command only works in IMs, not chats."
 msgstr "Dieses Kommando funktioniert nur bei IMs, nicht bei Chats."
 
-#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:514
+#: finch/gntconv.c:138 pidgin/gtkconv.c:512
 msgid "That command doesn't work on this protocol."
 msgstr "Dieses Kommando funktioniert nicht in diesem Protokoll."
 
-#: ../finch/gntconv.c:224
+#: finch/gntconv.c:224
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:247
+#: finch/gntconv.c:247
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
+#: finch/gntconv.c:252 finch/gntconv.c:647
 #, c-format
 msgid ""
 "\n"
@@ -737,48 +693,48 @@
 "\n"
 "%s tippt gerade..."
 
-#: ../finch/gntconv.c:271
+#: finch/gntconv.c:271
 msgid "You have left this chat."
 msgstr "Sie haben diesen Chat verlassen."
 
-#: ../finch/gntconv.c:342
+#: finch/gntconv.c:342
 msgid "Send To"
 msgstr "Senden an"
 
-#: ../finch/gntconv.c:386
+#: finch/gntconv.c:386
 msgid "Conversation"
 msgstr "Unterhaltung"
 
-#: ../finch/gntconv.c:392
+#: finch/gntconv.c:392
 msgid "Clear Scrollback"
 msgstr "Gespr辰chsfenster leeren"
 
-#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
+#: finch/gntconv.c:396 finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Zeige Zeitstempel"
 
-#: ../finch/gntconv.c:412
+#: finch/gntconv.c:412
 msgid "Add Buddy Pounce..."
 msgstr "Buddy-Alarm hinzuf端gen..."
 
-#: ../finch/gntconv.c:614
+#: finch/gntconv.c:613
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:735
+#: finch/gntconv.c:735
 msgid "List of users:\n"
 msgstr "Liste der Benutzer:\n"
 
-#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:336
+#: finch/gntconv.c:880 pidgin/gtkconv.c:334
 msgid "Supported debug options are:  version"
 msgstr "Unterst端tzte Debug-Optionen sind:  version"
 
-#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:385
+#: finch/gntconv.c:915 pidgin/gtkconv.c:383
 msgid "No such command (in this context)."
 msgstr "Kein solches Kommando (in diesem Kontext)."
 
-#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:388
+#: finch/gntconv.c:918 pidgin/gtkconv.c:386
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -787,7 +743,7 @@
 "zu erhalten.\n"
 "Die folgenden Kommandos sind in diesem Kontext verf端gbar:\n"
 
-#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7201
+#: finch/gntconv.c:976 pidgin/gtkconv.c:7291
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -795,13 +751,13 @@
 "say &lt;Nachricht&gt;:  Sendet eine Nachricht genau so, als wenn Sie die "
 "Nachricht ohne ein Kommando absenden."
 
-#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7204
+#: finch/gntconv.c:979 pidgin/gtkconv.c:7294
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;Aktion&gt;:  Sende eine IRC-辰hnliche Aktion an einen Buddy oder einen "
 "Chat."
 
-#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7207
+#: finch/gntconv.c:982 pidgin/gtkconv.c:7297
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -809,43 +765,43 @@
 "debug &lt;Option&gt;:  Verschiedene Debugging-Informationen zur aktuellen "
 "Unterhaltung senden."
 
-#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7210
+#: finch/gntconv.c:985 pidgin/gtkconv.c:7300
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Leert das Gespr辰chsfenster."
 
-#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7216
+#: finch/gntconv.c:988 pidgin/gtkconv.c:7306
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;Kommando&gt;:  Hilfe zu einem bestimmten Kommando."
 
-#: ../finch/gntconv.c:991
+#: finch/gntconv.c:991
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Liste der Benutzer im Chat anzeigen."
 
-#: ../finch/gntconv.c:996
+#: finch/gntconv.c:996
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Plugin-Fenster anzeigen."
 
-#: ../finch/gntconv.c:999
+#: finch/gntconv.c:999
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Die Kontaktliste anzeigen."
 
-#: ../finch/gntconv.c:1002
+#: finch/gntconv.c:1002
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Das Konten-Fenster anzeigen."
 
-#: ../finch/gntconv.c:1005
+#: finch/gntconv.c:1005
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Das Debugging-Fenster anzeigen."
 
-#: ../finch/gntconv.c:1008
+#: finch/gntconv.c:1008
 msgid "prefs: Show the preference window."
 msgstr "prefs: Das Einstellungs-Fenster anzeigen."
 
-#: ../finch/gntconv.c:1011
+#: finch/gntconv.c:1011
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Das Fenster mit gespeicherten Status-Infos anzeigen."
 
-#: ../finch/gntdebug.c:234 ../finch/gntui.c:80 ../pidgin/gtkdebug.c:694
+#: finch/gntdebug.c:234 finch/gntui.c:80 pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Debug-Fenster"
 
@@ -853,194 +809,190 @@
 #. * 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:255 ../pidgin/gtkdebug.c:753
+#: finch/gntdebug.c:255 pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "Leeren"
 
-#: ../finch/gntdebug.c:261
+#: finch/gntdebug.c:261
 msgid "Filter: "
 msgstr "Filter: "
 
-#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
+#: finch/gntdebug.c:265 pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "Pause"
 
-#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
+#: finch/gntft.c:117 pidgin/gtkft.c:228
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "Datei端bertragungen - %d%% von %d Dateien"
 
 #. Create the window.
-#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:81
-#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
+#: finch/gntft.c:122 finch/gntft.c:195 finch/gntui.c:81 pidgin/gtkft.c:233
+#: pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Datei端bertragungen"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
+#: finch/gntft.c:198 pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Fortschritt"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
+#: finch/gntft.c:198 pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Dateiname"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
+#: finch/gntft.c:198 pidgin/gtkft.c:658
 msgid "Size"
 msgstr "Gr旦�e"
 
-#: ../finch/gntft.c:198
+#: finch/gntft.c:198
 msgid "Speed"
 msgstr "Geschwindigkeit"
 
-#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
+#: finch/gntft.c:198 pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "Verbleibend"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:198 ../finch/gntstatus.c:540 ../finch/gntstatus.c:569
-#: ../libpurple/protocols/bonjour/bonjour.c:318
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
-#: ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:677
-#: ../libpurple/protocols/jabber/jabber.c:1212
-#: ../libpurple/protocols/msn/msn.c:515
-#: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2676
-#: ../libpurple/protocols/oscar/oscar.c:3794
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3070
-#: ../pidgin/gtkblist.c:3083 ../pidgin/gtkblist.c:3085
-#: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
+#: finch/gntft.c:198 finch/gntstatus.c:543 finch/gntstatus.c:572
+#: libpurple/protocols/bonjour/bonjour.c:318 libpurple/protocols/gg/gg.c:1034
+#: libpurple/protocols/gg/gg.c:1571 libpurple/protocols/gg/gg.c:1579
+#: libpurple/protocols/jabber/buddy.c:638
+#: libpurple/protocols/jabber/buddy.c:642
+#: libpurple/protocols/jabber/buddy.c:677
+#: libpurple/protocols/jabber/jabber.c:1212 libpurple/protocols/msn/msn.c:515
+#: libpurple/protocols/novell/novell.c:2835
+#: libpurple/protocols/oscar/oscar.c:821 libpurple/protocols/oscar/oscar.c:826
+#: libpurple/protocols/oscar/oscar.c:828
+#: libpurple/protocols/oscar/oscar.c:2672
+#: libpurple/protocols/oscar/oscar.c:3789
+#: libpurple/protocols/sametime/sametime.c:3264
+#: libpurple/protocols/sametime/sametime.c:4151
+#: libpurple/protocols/yahoo/yahoo.c:3070 pidgin/gtkblist.c:3079
+#: pidgin/gtkblist.c:3092 pidgin/gtkblist.c:3094 pidgin/gtksavedstatuses.c:998
+#: pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Status"
 
-#: ../finch/gntft.c:208
+#: finch/gntft.c:208
 msgid "Close this window when all transfers finish"
 msgstr "Schlie�e dieses Fenster, wenn alle �bertragungen abgeschlossen sind"
 
-#: ../finch/gntft.c:215
+#: finch/gntft.c:215
 msgid "Clear finished transfers"
 msgstr "Entferne komplette �bertragungen"
 
-#: ../finch/gntft.c:229
+#: finch/gntft.c:229
 msgid "Stop"
 msgstr "Stopp"
 
 #. Close button
-#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
-#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:723 ../finch/gntstatus.c:212
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2475
-#: ../pidgin/gtkrequest.c:272
+#: finch/gntft.c:234 finch/gntnotify.c:181 finch/gntplugin.c:209
+#: finch/gntplugin.c:309 finch/gntpounce.c:727 finch/gntstatus.c:215
+#: libpurple/protocols/msn/msn.c:375 libpurple/protocols/silc/util.c:382
+#: libpurple/protocols/silc10/util.c:377 pidgin/gtkaccount.c:2479
+#: pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "Schlie�en"
 
-#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
+#: finch/gntft.c:302 pidgin/gtkft.c:168 pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "Warte auf den Beginn der Datei端bertragung"
 
-#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
+#: finch/gntft.c:369 pidgin/gtkft.c:165 pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Abgebrochen"
 
-#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
+#: finch/gntft.c:371 pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "Gescheitert"
 
-#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#: finch/gntft.c:417 pidgin/gtkft.c:133
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KB/s"
 
-#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
-#: ../pidgin/gtkft.c:1115
+#: finch/gntft.c:428 finch/gntft.c:429 pidgin/gtkft.c:162 pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Fertig"
 
-#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
+#: finch/gntft.c:431 libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "�bertragung"
 
-#: ../finch/gntnotify.c:164
+#: finch/gntnotify.c:164
 msgid "Emails"
 msgstr "E-Mails"
 
-#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224
+#: finch/gntnotify.c:170 finch/gntnotify.c:224
 msgid "You have mail!"
 msgstr "Sie haben Post!"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:489
+#: finch/gntnotify.c:173 pidgin/gtknotify.c:489
 msgid "Sender"
 msgstr "Sender"
 
-#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:496
+#: finch/gntnotify.c:173 pidgin/gtknotify.c:496
 msgid "Subject"
 msgstr "Betreff"
 
-#: ../finch/gntnotify.c:200
+#: finch/gntnotify.c:200
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) hat %d neue Nachricht."
 msgstr[1] "%s (%s) hat %d neue Nachrichten."
 
-#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:335
+#: finch/gntnotify.c:224 pidgin/gtknotify.c:335
 msgid "New Mail"
 msgstr "Neue Mail"
 
-#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:916
+#: finch/gntnotify.c:289 pidgin/gtknotify.c:915
 #, c-format
 msgid "Info for %s"
 msgstr "Info 端ber %s"
 
-#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:917
+#: finch/gntnotify.c:290 libpurple/protocols/toc/toc.c:476
+#: pidgin/gtknotify.c:916
 msgid "Buddy Information"
 msgstr "Buddy-Information"
 
-#: ../finch/gntnotify.c:376
+#: finch/gntnotify.c:376
 msgid "Continue"
 msgstr "Fortfahren"
 
-#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1628 ../pidgin/gtkdebug.c:834
+#: finch/gntnotify.c:382 pidgin/gtkconv.c:1626 pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Info"
 
-#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1589
+#: finch/gntnotify.c:385 pidgin/gtkconv.c:1587
 msgid "IM"
 msgstr "Nachricht"
 
-#: ../finch/gntnotify.c:388
+#: finch/gntnotify.c:388
 msgid "Join"
 msgstr "Betreten"
 
-#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3473
+#: finch/gntnotify.c:391 libpurple/protocols/sametime/sametime.c:3474
 msgid "Invite"
 msgstr "Einladen"
 
-#: ../finch/gntnotify.c:394
+#: finch/gntnotify.c:394
 msgid "(none)"
 msgstr "(kein)"
 
-#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83
+#: finch/gntplugin.c:74 finch/gntplugin.c:83
 msgid "ERROR"
 msgstr "FEHLER"
 
-#: ../finch/gntplugin.c:74
+#: finch/gntplugin.c:74
 msgid "loading plugin failed"
 msgstr "Laden des Plugins fehlgeschlagen"
 
-#: ../finch/gntplugin.c:83
+#: finch/gntplugin.c:83
 msgid "unloading plugin failed"
 msgstr "Entladen des Plugins fehlgeschlagen"
 
-#: ../finch/gntplugin.c:128
+#: finch/gntplugin.c:128
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1057,19 +1009,19 @@
 "Website: %s\n"
 "Dateiname: %s\n"
 
-#: ../finch/gntplugin.c:186
+#: finch/gntplugin.c:186
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Das Plugin muss geladen werden, bevor es konfiguriert werden kann."
 
-#: ../finch/gntplugin.c:234
+#: finch/gntplugin.c:234
 msgid "No configuration options for this plugin."
 msgstr "Keine Einstellungsoptionen f端r dieses Plugin."
 
-#: ../finch/gntplugin.c:259
+#: finch/gntplugin.c:259
 msgid "You can (un)load plugins from the following list."
 msgstr "Die k旦nnen Plugins von der folgenden Liste laden bzw. entladen."
 
-#: ../finch/gntplugin.c:314
+#: finch/gntplugin.c:314
 msgid "Configure Plugin"
 msgstr "Plugin konfigurieren"
 
@@ -1078,382 +1030,379 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
-#: ../finch/gntui.c:83 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2060
+#: finch/gntplugin.c:370 finch/gntplugin.c:377 finch/gntprefs.c:263
+#: finch/gntui.c:83 pidgin/gtkdocklet.c:524 pidgin/gtkprefs.c:2060
 msgid "Preferences"
 msgstr "Einstellungen"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:255
+#: finch/gntpounce.c:182 pidgin/gtkpounce.c:255
 msgid "Please enter a buddy to pounce."
 msgstr "Bitte Buddy zum Alarmieren angeben."
 
 #. Create the window.
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:516
+#: finch/gntpounce.c:327 pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "Neuer Buddy-Alarm"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:516
+#: finch/gntpounce.c:327 pidgin/gtkpounce.c:516
 msgid "Edit Buddy Pounce"
 msgstr "Buddy-Alarm bearbeiten"
 
-#: ../finch/gntpounce.c:330
+#: finch/gntpounce.c:332
 msgid "Pounce Who"
 msgstr "Bei wem alarmieren"
 
 #. Account:
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:449
+#: finch/gntpounce.c:335 finch/gntstatus.c:452
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../finch/gntpounce.c:355
+#: finch/gntpounce.c:357
 msgid "Buddy name:"
 msgstr "Buddy-Name:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:586
+#: finch/gntpounce.c:373 pidgin/gtkpounce.c:586
 msgid "Pounce When Buddy..."
 msgstr "Alarm, wenn Buddy..."
 
-#: ../finch/gntpounce.c:373
+#: finch/gntpounce.c:375
 msgid "Signs on"
 msgstr "sich anmeldet"
 
-#: ../finch/gntpounce.c:374
+#: finch/gntpounce.c:376
 msgid "Signs off"
 msgstr "sich abmeldet"
 
-#: ../finch/gntpounce.c:375
+#: finch/gntpounce.c:377
 msgid "Goes away"
 msgstr "hinausgeht"
 
-#: ../finch/gntpounce.c:376
+#: finch/gntpounce.c:378
 msgid "Returns from away"
 msgstr "wieder anwesend ist"
 
-#: ../finch/gntpounce.c:377
+#: finch/gntpounce.c:379
 msgid "Becomes idle"
 msgstr "unt辰tig wird"
 
-#: ../finch/gntpounce.c:378
+#: finch/gntpounce.c:380
 msgid "Is no longer idle"
 msgstr "nicht mehr unt辰tig ist"
 
-#: ../finch/gntpounce.c:379
+#: finch/gntpounce.c:381
 msgid "Starts typing"
 msgstr "zu tippen beginnt"
 
-#: ../finch/gntpounce.c:380
+#: finch/gntpounce.c:382
 msgid "Pauses while typing"
 msgstr "beim Tippen anh辰lt"
 
-#: ../finch/gntpounce.c:381
+#: finch/gntpounce.c:383
 msgid "Stops typing"
 msgstr "aufh旦rt zu tippen"
 
-#: ../finch/gntpounce.c:382
+#: finch/gntpounce.c:384
 msgid "Sends a message"
 msgstr "eine Nachricht sendet"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:647
+#: finch/gntpounce.c:413 pidgin/gtkpounce.c:647
 msgid "Action"
 msgstr "Aktion"
 
-#: ../finch/gntpounce.c:413
+#: finch/gntpounce.c:415
 msgid "Open an IM window"
 msgstr "Ein Gespr辰chsfenster 旦ffnen"
 
-#: ../finch/gntpounce.c:414
+#: finch/gntpounce.c:416
 msgid "Pop up a notification"
 msgstr "Popup-Benachrichtigung"
 
-#: ../finch/gntpounce.c:415
+#: finch/gntpounce.c:417
 msgid "Send a message"
 msgstr "Eine Nachricht senden"
 
-#: ../finch/gntpounce.c:416
+#: finch/gntpounce.c:418
 msgid "Execute a command"
 msgstr "Einen Befehl ausf端hren"
 
-#: ../finch/gntpounce.c:417
+#: finch/gntpounce.c:419
 msgid "Play a sound"
 msgstr "Einen Klang abspielen"
 
-#: ../finch/gntpounce.c:445
+#: finch/gntpounce.c:447
 msgid "Pounce only when my status is not available"
 msgstr "Nur alarmieren, wenn ich nicht verf端gbar bin"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1295
+#: finch/gntpounce.c:449 pidgin/gtkpounce.c:1295
 msgid "Recurring"
 msgstr "Wiederkehrend"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1110
+#: finch/gntpounce.c:651 pidgin/gtkpounce.c:1110
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Wollen Sie die Alarmierung f端r %s (Konto %s) wirklich l旦schen?"
 
-#: ../finch/gntpounce.c:683 ../finch/gntui.c:79 ../pidgin/gtkpounce.c:1339
+#: finch/gntpounce.c:685 finch/gntui.c:79 pidgin/gtkpounce.c:1339
 msgid "Buddy Pounces"
 msgstr "Buddy-Alarm"
 
-#: ../finch/gntpounce.c:795 ../pidgin/gtkpounce.c:1466
+#: finch/gntpounce.c:799 pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s hat begonnen Ihnen zu schreiben (%s)"
 
-#: ../finch/gntpounce.c:797 ../pidgin/gtkpounce.c:1468
+#: finch/gntpounce.c:801 pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s hat beim Schreiben an Sie (%s) angehalten"
 
-#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1470
+#: finch/gntpounce.c:803 pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s hat sich angemeldet (%s)"
 
-#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1472
+#: finch/gntpounce.c:805 pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s ist nicht mehr inaktiv (%s)"
 
-#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1474
+#: finch/gntpounce.c:807 pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s ist wieder anwesend (%s)"
 
-#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1476
+#: finch/gntpounce.c:809 pidgin/gtkpounce.c:1476
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s hat aufgeh旦rt, Ihnen zu schreiben (%s)"
 
-#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1478
+#: finch/gntpounce.c:811 pidgin/gtkpounce.c:1478
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s hat sich abgemeldet (%s)"
 
-#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1480
+#: finch/gntpounce.c:813 pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s wurde unt辰tig (%s)"
 
-#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1482
+#: finch/gntpounce.c:815 pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s ist abwesend. (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1484
+#: finch/gntpounce.c:817 pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s hat Ihnen eine Nachricht gesendet. (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1485
+#: finch/gntpounce.c:818 pidgin/gtkpounce.c:1485
+#, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Unbekanntes Alarm-Ereignis. Bitte berichten Sie dieses Problem!"
 
-#: ../finch/gntprefs.c:91
+#: finch/gntprefs.c:91
 msgid "Based on keyboard use"
 msgstr "Abh辰ngig von Tastaturbenutzung"
 
-#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1923
+#: finch/gntprefs.c:93 pidgin/gtkprefs.c:1923
 msgid "From last sent message"
 msgstr "Von letzter gesendeter Nachricht"
 
-#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
-#: ../pidgin/gtkprefs.c:1922 ../pidgin/gtkprefs.c:1936
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+#: finch/gntprefs.c:95 pidgin/gtkprefs.c:897 pidgin/gtkprefs.c:906
+#: pidgin/gtkprefs.c:1922 pidgin/gtkprefs.c:1936
+#: pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Niemals"
 
-#: ../finch/gntprefs.c:183
+#: finch/gntprefs.c:183
 msgid "Show Idle Time"
 msgstr "Zeige Unt辰tigkeitszeiten"
 
-#: ../finch/gntprefs.c:184
+#: finch/gntprefs.c:184
 msgid "Show Offline Buddies"
 msgstr "Zeige Offline-Buddys"
 
-#: ../finch/gntprefs.c:191
+#: finch/gntprefs.c:191
 msgid "Notify buddies when you are typing"
 msgstr "Buddys benachrichtigen, wenn Sie ihnen schreiben"
 
-#: ../finch/gntprefs.c:197
+#: finch/gntprefs.c:197
 msgid "Log format"
 msgstr "Mitschnitt-Format"
 
-#: ../finch/gntprefs.c:198
+#: finch/gntprefs.c:198
 msgid "Log IMs"
 msgstr "IMs mitschneiden"
 
-#: ../finch/gntprefs.c:199
+#: finch/gntprefs.c:199
 msgid "Log chats"
 msgstr "Chats mitschneiden"
 
-#: ../finch/gntprefs.c:200
+#: finch/gntprefs.c:200
 msgid "Log status change events"
 msgstr "Statusver辰nderungen mitschneiden"
 
-#: ../finch/gntprefs.c:206
+#: finch/gntprefs.c:206
 msgid "Report Idle time"
 msgstr "Inaktivit辰tszeiten anzeigen"
 
-#: ../finch/gntprefs.c:207
+#: finch/gntprefs.c:207
 msgid "Change status when idle"
 msgstr "�ndere Status, wenn inaktiv"
 
-#: ../finch/gntprefs.c:208
+#: finch/gntprefs.c:208
 msgid "Minutes before changing status"
 msgstr "Minuten, bevor Status ge辰ndert wird"
 
-#: ../finch/gntprefs.c:209
+#: finch/gntprefs.c:209
 msgid "Change status to"
 msgstr "�ndere Status zu"
 
 #. Conversations
-#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2026
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
+#: finch/gntprefs.c:258 pidgin/gtkprefs.c:992 pidgin/gtkprefs.c:2026
+#: pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Unterhaltungen"
 
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1462 ../pidgin/gtkprefs.c:2037
+#: finch/gntprefs.c:259 pidgin/gtkprefs.c:1462 pidgin/gtkprefs.c:2037
 msgid "Logging"
 msgstr "Mitschnitt"
 
-#: ../finch/gntrequest.c:563
+#: finch/gntrequest.c:563
 msgid "Not implemented yet."
 msgstr "Noch nicht implementiert."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1526
-#: ../pidgin/gtkrequest.c:1572
+#: finch/gntrequest.c:635 pidgin/gtkrequest.c:1531 pidgin/gtkrequest.c:1577
 msgid "Save File..."
 msgstr "Datei speichern..."
 
-#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1527
-#: ../pidgin/gtkrequest.c:1573
+#: finch/gntrequest.c:635 pidgin/gtkrequest.c:1532 pidgin/gtkrequest.c:1578
 msgid "Open File..."
 msgstr "Datei 旦ffnen..."
 
-#: ../finch/gntstatus.c:136
+#: finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Wollen Sie \"%s\" wirklich l旦schen"
 
-#: ../finch/gntstatus.c:139
+#: finch/gntstatus.c:140
 msgid "Delete Status"
 msgstr "Status l旦schen"
 
-#: ../finch/gntstatus.c:174 ../pidgin/gtksavedstatuses.c:596
+#: finch/gntstatus.c:175 pidgin/gtksavedstatuses.c:596
 msgid "Saved Statuses"
 msgstr "Gespeicherter Status"
 
-#: ../finch/gntstatus.c:181 ../finch/gntstatus.c:532
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:973
-#: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:499
+#: finch/gntstatus.c:182 finch/gntstatus.c:535
+#: libpurple/protocols/jabber/buddy.c:286
+#: libpurple/protocols/jabber/buddy.c:973
+#: libpurple/protocols/novell/novell.c:1484 pidgin/gtksavedstatuses.c:499
 msgid "Title"
 msgstr "Titel"
 
-#: ../finch/gntstatus.c:181 ../pidgin/gtksavedstatuses.c:514
+#: finch/gntstatus.c:182 pidgin/gtksavedstatuses.c:514
 msgid "Type"
 msgstr "Typ"
 
-#: ../finch/gntstatus.c:181 ../finch/gntstatus.c:557 ../finch/gntstatus.c:569
-#: ../libpurple/protocols/bonjour/bonjour.c:247
-#: ../libpurple/protocols/bonjour/bonjour.c:254
-#: ../libpurple/protocols/bonjour/bonjour.c:320
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
-#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
-#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
-#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1244
-#: ../libpurple/protocols/jabber/jabber.c:1254
-#: ../libpurple/protocols/jabber/jabber.c:1264
-#: ../libpurple/protocols/jabber/jabber.c:1274
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/jabber/jabber.c:1296
-#: ../libpurple/protocols/novell/novell.c:2838
-#: ../libpurple/protocols/novell/novell.c:2941
-#: ../libpurple/protocols/novell/novell.c:2947
-#: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5533
-#: ../libpurple/protocols/oscar/oscar.c:5751
-#: ../libpurple/protocols/oscar/oscar.c:5765
-#: ../libpurple/protocols/oscar/oscar.c:5781
-#: ../libpurple/protocols/oscar/oscar.c:5788
-#: ../libpurple/protocols/oscar/oscar.c:5795
-#: ../libpurple/protocols/sametime/sametime.c:3286
-#: ../libpurple/protocols/sametime/sametime.c:3292
-#: ../libpurple/protocols/sametime/sametime.c:3298
-#: ../libpurple/protocols/sametime/sametime.c:3377
-#: ../libpurple/protocols/silc/buddy.c:1551
-#: ../libpurple/protocols/silc10/buddy.c:1551
-#: ../libpurple/protocols/simple/simple.c:246
-#: ../libpurple/protocols/yahoo/yahoo.c:3494
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
-#: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
+#: finch/gntstatus.c:182 finch/gntstatus.c:560 finch/gntstatus.c:572
+#: libpurple/protocols/bonjour/bonjour.c:247
+#: libpurple/protocols/bonjour/bonjour.c:254
+#: libpurple/protocols/bonjour/bonjour.c:320 libpurple/protocols/gg/gg.c:1072
+#: libpurple/protocols/gg/gg.c:1574 libpurple/protocols/gg/gg.c:1592
+#: libpurple/protocols/gg/gg.c:1602 libpurple/protocols/gg/gg.c:1608
+#: libpurple/protocols/gg/gg.c:1617 libpurple/protocols/gg/gg.c:1622
+#: libpurple/protocols/irc/irc.c:234 libpurple/protocols/jabber/jabber.c:1244
+#: libpurple/protocols/jabber/jabber.c:1254
+#: libpurple/protocols/jabber/jabber.c:1264
+#: libpurple/protocols/jabber/jabber.c:1274
+#: libpurple/protocols/jabber/jabber.c:1284
+#: libpurple/protocols/jabber/jabber.c:1296
+#: libpurple/protocols/novell/novell.c:2838
+#: libpurple/protocols/novell/novell.c:2941
+#: libpurple/protocols/novell/novell.c:2947
+#: libpurple/protocols/novell/novell.c:2953
+#: libpurple/protocols/oscar/oscar.c:5533
+#: libpurple/protocols/oscar/oscar.c:5751
+#: libpurple/protocols/oscar/oscar.c:5765
+#: libpurple/protocols/oscar/oscar.c:5781
+#: libpurple/protocols/oscar/oscar.c:5788
+#: libpurple/protocols/oscar/oscar.c:5795
+#: 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:1551
+#: libpurple/protocols/silc10/buddy.c:1551
+#: libpurple/protocols/simple/simple.c:246
+#: libpurple/protocols/yahoo/yahoo.c:3498
+#: libpurple/protocols/yahoo/yahoo.c:3504
+#: libpurple/protocols/zephyr/zephyr.c:2337 pidgin/gtksavedstatuses.c:525
+#: pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Nachricht"
 
 #. Use
-#: ../finch/gntstatus.c:192 ../finch/gntstatus.c:586
+#: finch/gntstatus.c:193 finch/gntstatus.c:589
 msgid "Use"
 msgstr "Benutzen"
 
-#: ../finch/gntstatus.c:297
+#: finch/gntstatus.c:300
 msgid "Invalid title"
 msgstr "Ung端ltige Bezeichnung"
 
-#: ../finch/gntstatus.c:298
+#: finch/gntstatus.c:301
 msgid "Please enter a non-empty title for the status."
 msgstr "Bitte geben Sie eine nicht-leere Bezeichnung f端r den Status ein."
 
-#: ../finch/gntstatus.c:305
+#: finch/gntstatus.c:308
 msgid "Duplicate title"
 msgstr "Doppelte Bezeichnung"
 
-#: ../finch/gntstatus.c:306
+#: finch/gntstatus.c:309
 msgid "Please enter a different title for the status."
 msgstr "Bitte geben sie eine andere Bezeichnung f端r den Status ein."
 
-#: ../finch/gntstatus.c:446
+#: finch/gntstatus.c:449
 msgid "Substatus"
 msgstr "Unter-Status"
 
-#: ../finch/gntstatus.c:457 ../pidgin/gtkft.c:698
+#: finch/gntstatus.c:460 pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:472
+#: finch/gntstatus.c:475
 msgid "Message:"
 msgstr "Nachricht:"
 
-#: ../finch/gntstatus.c:521
+#: finch/gntstatus.c:524
 msgid "Edit Status"
 msgstr "Status bearbeiten"
 
-#: ../finch/gntstatus.c:563
+#: finch/gntstatus.c:566
 msgid "Use different status for following accounts"
 msgstr "Benutze einen anderen Status f端r die folgenden Konten"
 
 #. Save & Use
-#: ../finch/gntstatus.c:597
+#: finch/gntstatus.c:600
 msgid "Save & Use"
 msgstr "Speichern & �bernehmen"
 
-#: ../finch/gntui.c:84
+#: finch/gntui.c:84
 msgid "Statuses"
 msgstr "Status-Meldungen"
 
-#: ../finch/plugins/gntclipboard.c:149
+#: finch/plugins/gntclipboard.c:149
 msgid "GntClipboard"
 msgstr "GntClipboard"
 
-#: ../finch/plugins/gntclipboard.c:151
+#: finch/plugins/gntclipboard.c:151
 msgid "Clipboard plugin"
 msgstr "Zwischenablage-Plugin"
 
-#: ../finch/plugins/gntclipboard.c:152
+#: finch/plugins/gntclipboard.c:152
 msgid ""
 "When the gnt clipboard contents change, the contents are made available to "
 "X, if possible."
@@ -1461,77 +1410,77 @@
 "Wenn sich der Inhalt der Gnt-Zwischenablage ver辰ndert, werden ihre Inhalte "
 "in X verf端gbar gemacht, wenn m旦glich."
 
-#: ../finch/plugins/gntgf.c:231
+#: finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s hat sich angemeldet"
 
-#: ../finch/plugins/gntgf.c:238
+#: finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s hat sich abgemeldet"
 
-#: ../finch/plugins/gntgf.c:246
+#: finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s hat Ihnen eine Nachricht gesendet"
 
-#: ../finch/plugins/gntgf.c:265
+#: finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s sagte ihren Spitznamen in %s"
 
-#: ../finch/plugins/gntgf.c:267
+#: finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s hat eine Nachricht in %s gesendet"
 
-#: ../finch/plugins/gntgf.c:305
+#: finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "Buddy sich an/abmeldet"
 
-#: ../finch/plugins/gntgf.c:306
+#: finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Sie empfangen einen Nachricht"
 
-#: ../finch/plugins/gntgf.c:307
+#: finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Jemand redet im Chat"
 
-#: ../finch/plugins/gntgf.c:308
+#: finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "Jemand sagt Ihren Namen im Chat"
 
-#: ../finch/plugins/gntgf.c:336
+#: finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Mit einem Toaster benachrichtigen, wenn"
 
-#: ../finch/plugins/gntgf.c:351
+#: finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "Auch piepen!"
 
-#: ../finch/plugins/gntgf.c:357
+#: finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "URGENT-Eigenschaft f端r das Terminalfenster setzen."
 
-#: ../finch/plugins/gntgf.c:377
+#: finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
+#: finch/plugins/gntgf.c:379 finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Toaster-Plugin"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
+#: finch/plugins/gnthistory.c:116 pidgin/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Unterhaltung mit %s am %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:147
+#: finch/plugins/gnthistory.c:138 pidgin/plugins/history.c:147
 msgid "History Plugin Requires Logging"
 msgstr "Das Verlaufs-Plugin erfordert das Mitschneiden"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/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"
@@ -1544,15 +1493,15 @@
 "Das Aktivieren des Mitschnitts f端r Sofortnachrichten und/oder Chats "
 "aktiviert den Verlauf f端r die entsprechenden Unterhaltungsarten."
 
-#: ../finch/plugins/gnthistory.c:179
+#: finch/plugins/gnthistory.c:179
 msgid "GntHistory"
 msgstr "Gnt-Verlauf"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:190
+#: finch/plugins/gnthistory.c:181 pidgin/plugins/history.c:190
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Zeigt vor kurzem mitgeschnittene Gespr辰che in neuen Gespr辰chen an."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/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."
@@ -1560,222 +1509,221 @@
 "Wenn eine neue Unterhaltung er旦ffnet wird, f端gt dieses Plugin die letzte "
 "Unterhaltung in die aktuelle Unterhaltung ein."
 
-#: ../finch/plugins/lastlog.c:69
+#: finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "Verlauf"
 
-#: ../finch/plugins/lastlog.c:99
+#: finch/plugins/lastlog.c:99
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: Sucht r端ckw辰rts nach einem Teilwort im Mitschnitt."
 
-#: ../finch/plugins/lastlog.c:121
+#: finch/plugins/lastlog.c:121
 msgid "GntLastlog"
 msgstr "Gnt-Verlauf"
 
-#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+#: finch/plugins/lastlog.c:123 finch/plugins/lastlog.c:124
 msgid "Lastlog plugin."
 msgstr "Verlauf-Plugin."
 
-#: ../libpurple/account.c:790
+#: libpurple/account.c:790
 msgid "accounts"
 msgstr "Konten"
 
-#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
-#: ../libpurple/protocols/jabber/auth.c:233
+#: libpurple/account.c:937 libpurple/protocols/jabber/auth.c:194
+#: libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "Passwort wird f端r die Anmeldung ben旦tigt."
 
-#: ../libpurple/account.c:963
+#: libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Geben Sie das Passwort f端r %s (%s) ein"
 
-#: ../libpurple/account.c:970
+#: libpurple/account.c:970
 msgid "Enter Password"
 msgstr "Geben Sie ein Passwort ein"
 
-#: ../libpurple/account.c:975
+#: libpurple/account.c:975
 msgid "Save password"
 msgstr "Passwort speichern"
 
-#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
+#: libpurple/account.c:1010 libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Fehlendes Protokoll-Plugin f端r %s"
 
-#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:4010
+#: libpurple/account.c:1012 libpurple/connection.c:107 pidgin/gtkblist.c:4020
 msgid "Connection Error"
 msgstr "Verbindungsfehler"
 
-#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1334
+#: libpurple/account.c:1170 libpurple/protocols/gg/gg.c:702
+#: libpurple/protocols/jabber/jabber.c:1334
 msgid "New passwords do not match."
 msgstr "Die neuen Passw旦rter stimmen nicht 端berein."
 
-#: ../libpurple/account.c:1179
+#: libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "Bitte f端llen Sie alle Felder aus."
 
-#: ../libpurple/account.c:1202
+#: libpurple/account.c:1202
 msgid "Original password"
 msgstr "Aktuelles Passwort"
 
-#: ../libpurple/account.c:1209
+#: libpurple/account.c:1209
 msgid "New password"
 msgstr "Neues Passwort"
 
-#: ../libpurple/account.c:1216
+#: libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "Neues Passwort (nochmal)"
 
-#: ../libpurple/account.c:1222
+#: libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "�ndern des Passworts f端r %s"
 
-#: ../libpurple/account.c:1230
+#: libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "Bitte geben Sie Ihr aktuelles und Ihr neues Passwort ein."
 
-#: ../libpurple/account.c:1261
+#: libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "�ndere die Benutzerinformation f端r %s"
 
-#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
+#: libpurple/account.c:1264 libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Benutzer-Info setzen"
 
-#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:642
-#: ../libpurple/protocols/jabber/buddy.c:1462
-#: ../libpurple/protocols/jabber/buddy.c:1479
-#: ../libpurple/protocols/novell/novell.c:2831
-#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+#: libpurple/account.c:1744 libpurple/protocols/gg/gg.c:1012
+#: libpurple/protocols/jabber/buddy.c:642
+#: libpurple/protocols/jabber/buddy.c:1462
+#: libpurple/protocols/jabber/buddy.c:1479
+#: libpurple/protocols/novell/novell.c:2831 libpurple/protocols/qq/qq.c:230
+#: pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
-#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5310 ../pidgin/plugins/gevolution/gevo-util.c:64
-#: ../pidgin/plugins/gevolution/gevolution.c:96
+#: libpurple/blist.c:521 libpurple/blist.c:1289 libpurple/blist.c:1518
+#: libpurple/protocols/jabber/roster.c:68 pidgin/gtkblist.c:5322
+#: pidgin/plugins/gevolution/gevo-util.c:64
+#: pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Buddys"
 
-#: ../libpurple/blist.c:548
+#: libpurple/blist.c:548
 msgid "buddy list"
 msgstr "Buddy-Liste"
 
-#: ../libpurple/connection.c:106
+#: libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "Registrierungsfehler"
 
-#: ../libpurple/connection.c:293
+#: libpurple/connection.c:293
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s hat sich angemeldet"
 
-#: ../libpurple/connection.c:323
+#: libpurple/connection.c:323
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s hat sich abgemeldet"
 
-#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1750
-#: ../libpurple/protocols/msn/servconn.c:139
-#: ../libpurple/protocols/msn/session.c:322
+#: libpurple/connection.c:440 libpurple/plugin.c:282
+#: libpurple/protocols/jabber/buddy.c:1750
+#: libpurple/protocols/msn/servconn.c:139
+#: libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Unbekannter Fehler"
 
-#: ../libpurple/conversation.c:170
+#: libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "Nachricht kann nicht gesendet werden: Sie ist zu gro�."
 
-#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
+#: libpurple/conversation.c:173 libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Kann die Nachricht an %s nicht senden."
 
-#: ../libpurple/conversation.c:174
+#: libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "Die Nachricht ist zu lang."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:284
-#: ../libpurple/protocols/bonjour/jabber.c:326
+#: libpurple/conversation.c:183 libpurple/protocols/bonjour/jabber.c:284
+#: libpurple/protocols/bonjour/jabber.c:326
 msgid "Unable to send message."
 msgstr "Nachricht kann nicht gesendet werden."
 
-#: ../libpurple/conversation.c:1169
+#: libpurple/conversation.c:1169
 msgid "Send Message"
 msgstr "Nachricht senden"
 
-#: ../libpurple/conversation.c:1172
+#: libpurple/conversation.c:1172
 msgid "_Send Message"
 msgstr "Nachricht _senden"
 
-#: ../libpurple/conversation.c:1578
+#: libpurple/conversation.c:1578
 #, c-format
 msgid "%s entered the room."
 msgstr "%s hat den Raum betreten."
 
-#: ../libpurple/conversation.c:1581
+#: libpurple/conversation.c:1581
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] hat den Raum betreten."
 
-#: ../libpurple/conversation.c:1691
+#: libpurple/conversation.c:1691
 #, c-format
 msgid "You are now known as %s"
 msgstr "Sie hei�en jetzt %s"
 
-#: ../libpurple/conversation.c:1711
+#: libpurple/conversation.c:1711
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s hei�t jetzt %s"
 
-#: ../libpurple/conversation.c:1786
+#: libpurple/conversation.c:1786
 #, c-format
 msgid "%s left the room."
 msgstr "%s hat den Raum verlassen."
 
-#: ../libpurple/conversation.c:1789
+#: libpurple/conversation.c:1789
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s hat den Raum verlassen (%s)."
 
-#: ../libpurple/dbus-server.c:584
+#: libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Kann keine Verbindung herstellen: %s"
 
-#: ../libpurple/dbus-server.c:596
+#: libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Kann den Namen nicht bekommen: %s"
 
-#: ../libpurple/dbus-server.c:610
+#: libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Kann den Serv-Namen nicht bekommen: %s"
 
-#: ../libpurple/dbus-server.h:84
+#: libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Purple's D-Bus-Server l辰uft aus dem folgenden Grund nicht"
 
-#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
+#: libpurple/desktopitem.c:286 libpurple/desktopitem.c:877
 msgid "No name"
 msgstr "Kein Name"
 
-#: ../libpurple/dnsquery.c:510
+#: libpurple/dnsquery.c:510
 msgid "Unable to create new resolver process\n"
 msgstr "Kann keinen neuen Aufl旦sungsprozess erstellen\n"
 
-#: ../libpurple/dnsquery.c:515
+#: libpurple/dnsquery.c:515
 msgid "Unable to send request to resolver process\n"
 msgstr "Kann keine Nachricht an den Aufl旦sungsprozess senden\n"
 
-#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
+#: libpurple/dnsquery.c:548 libpurple/dnsquery.c:696
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -1784,13 +1732,12 @@
 "Fehler beim Aufl旦sen von %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:551 ../libpurple/dnsquery.c:710
-#: ../libpurple/dnsquery.c:830
+#: libpurple/dnsquery.c:551 libpurple/dnsquery.c:710 libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Fehler beim Aufl旦sen von %s: %d"
 
-#: ../libpurple/dnsquery.c:573
+#: libpurple/dnsquery.c:573
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -1799,20 +1746,21 @@
 "Fehler beim Lesen vom Aufl旦sungsprozess:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:577
+#: libpurple/dnsquery.c:577
+#, c-format
 msgid "EOF while reading from resolver process"
 msgstr "EOF w辰hrend vom Resolver-Prozess gelesen wurde"
 
-#: ../libpurple/dnsquery.c:760
+#: libpurple/dnsquery.c:760
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Fehler beim Erzeugen eines Threads: %s"
 
-#: ../libpurple/dnsquery.c:761
+#: libpurple/dnsquery.c:761
 msgid "Unknown reason"
 msgstr "Unbekannter Grund"
 
-#: ../libpurple/ft.c:207
+#: libpurple/ft.c:207
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1821,7 +1769,7 @@
 "Fehler beim Empfangen von %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:211
+#: libpurple/ft.c:211
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1830,7 +1778,7 @@
 "Fehler beim Senden von %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:215
+#: libpurple/ft.c:215
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1839,39 +1787,40 @@
 "Fehler beim Zugriff auf %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:251
+#: libpurple/ft.c:251
 msgid "Directory is not writable."
 msgstr "Verzeichnis ist nicht schreibbar."
 
-#: ../libpurple/ft.c:266
+#: libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
 msgstr "Kann keine Datei mit 0 Bytes senden."
 
-#: ../libpurple/ft.c:276
+#: libpurple/ft.c:276
 msgid "Cannot send a directory."
 msgstr "Kann kein Verzeichnis senden."
 
-#: ../libpurple/ft.c:285
+#: libpurple/ft.c:285
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
-msgstr "%s ist keine regul辰re Datei. Pidgin wird die Datei nicht 端berschreiben.\n"
-
-#: ../libpurple/ft.c:345
+msgstr ""
+"%s ist keine regul辰re Datei. Pidgin wird die Datei nicht 端berschreiben.\n"
+
+#: libpurple/ft.c:345
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s m旦chte Ihnen %s (%s) senden"
 
-#: ../libpurple/ft.c:352
+#: libpurple/ft.c:352
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s m旦chte Ihnen eine Datei senden"
 
-#: ../libpurple/ft.c:395
+#: libpurple/ft.c:395
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Akzeptieren Sie die Datei端bertragung von %s?"
 
-#: ../libpurple/ft.c:399
+#: libpurple/ft.c:399
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1882,133 +1831,135 @@
 "Remote-Computer: %s\n"
 "Remote-Port: %d"
 
-#: ../libpurple/ft.c:434
+#: libpurple/ft.c:434
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s bietet an, die Datei %s zu senden"
 
-#: ../libpurple/ft.c:486
+#: libpurple/ft.c:486
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s ist kein g端ltiger Dateiname.\n"
 
-#: ../libpurple/ft.c:507
+#: libpurple/ft.c:507
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Angebot zum Senden von %s an %s"
 
-#: ../libpurple/ft.c:519
+#: libpurple/ft.c:519
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Starte die Datei端bertragung von %s von %s"
 
-#: ../libpurple/ft.c:680
+#: libpurple/ft.c:680
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "�bertragung der Datei %s ist komplett"
 
-#: ../libpurple/ft.c:683
+#: libpurple/ft.c:683
+#, c-format
 msgid "File transfer complete"
 msgstr "Datei端bertragung ist komplett"
 
-#: ../libpurple/ft.c:1101
+#: libpurple/ft.c:1101
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Sie haben die Datei端bertragung von %s abgebrochen"
 
-#: ../libpurple/ft.c:1106
+#: libpurple/ft.c:1106
+#, c-format
 msgid "File transfer cancelled"
 msgstr "Datei端bertragung wurde abgebrochen"
 
-#: ../libpurple/ft.c:1164
+#: libpurple/ft.c:1164
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s hat die �bertragung von %s abgebrochen"
 
-#: ../libpurple/ft.c:1169
+#: libpurple/ft.c:1169
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s hat die Daten端bertragung abgebrochen"
 
-#: ../libpurple/ft.c:1226
+#: libpurple/ft.c:1226
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Datei端bertragung an %s wurde abgebrochen."
 
-#: ../libpurple/ft.c:1228
+#: libpurple/ft.c:1228
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Datei端bertragung von %s wurde abgebrochen."
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
+#: libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Befehl in einem Terminal ausf端hren"
 
-#: ../libpurple/gconf/purple.schemas.in.h:2
+#: libpurple/gconf/purple.schemas.in.h:2
 msgid "The command used to handle \"aim\" URLs, if enabled."
 msgstr "Der Befehl, der \"aim\"-URLs verarbeitet, wenn aktiviert."
 
-#: ../libpurple/gconf/purple.schemas.in.h:3
+#: libpurple/gconf/purple.schemas.in.h:3
 msgid "The command used to handle \"gg\" URLs, if enabled."
 msgstr "Der Befehl, der \"gg\"-URLs verarbeitet, wenn aktiviert."
 
-#: ../libpurple/gconf/purple.schemas.in.h:4
+#: libpurple/gconf/purple.schemas.in.h:4
 msgid "The command used to handle \"icq\" URLs, if enabled."
 msgstr "Der Befehl, der \"icq\"-URLs verarbeitet, wenn aktiviert."
 
-#: ../libpurple/gconf/purple.schemas.in.h:5
+#: libpurple/gconf/purple.schemas.in.h:5
 msgid "The command used to handle \"irc\" URLs, if enabled."
 msgstr "Der Befehl, der \"irc\"-URLs verarbeitet, wenn aktiviert."
 
-#: ../libpurple/gconf/purple.schemas.in.h:6
+#: libpurple/gconf/purple.schemas.in.h:6
 msgid "The command used to handle \"msnim\" URLs, if enabled."
 msgstr "Der Befehl, der \"msnim\"-URLs verarbeitet, wenn aktiviert."
 
-#: ../libpurple/gconf/purple.schemas.in.h:7
+#: libpurple/gconf/purple.schemas.in.h:7
 msgid "The command used to handle \"sip\" URLs, if enabled."
 msgstr "Der Befehl, der \"sip\"-URLs verarbeitet, wenn aktiviert."
 
-#: ../libpurple/gconf/purple.schemas.in.h:8
+#: libpurple/gconf/purple.schemas.in.h:8
 msgid "The command used to handle \"xmpp\" URLs, if enabled."
 msgstr "Der Befehl, der \"xmpp\"-URLs verarbeitet, wenn aktiviert."
 
-#: ../libpurple/gconf/purple.schemas.in.h:9
+#: libpurple/gconf/purple.schemas.in.h:9
 msgid "The command used to handle \"ymsgr\" URLs, if enabled."
 msgstr "Der Befehl, der \"ymsgr\"-URLs verarbeitet, wenn aktiviert."
 
-#: ../libpurple/gconf/purple.schemas.in.h:10
+#: libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "Behandlungsroutine f端r \"aim\"-URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
+#: libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "Behandlungsroutine f端r \"gg\"-URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
+#: libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "Behandlungsroutine f端r \"icq\"-URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
+#: libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "Behandlungsroutine f端r \"irc\"-URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
+#: libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "Behandlungsroutine f端r \"msnim\"-URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
+#: libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "Behandlungsroutine  f端r \"sip\"-URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
+#: libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "Behandlungsroutine f端r \"xmpp\"-URLs"
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
+#: libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "Behandlungsroutine f端r \"ymsrg\"-URLs"
 
-#: ../libpurple/gconf/purple.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."
@@ -2016,7 +1967,7 @@
 "Aktivieren, wenn der Befehl, der im \"command\"-Schl端ssel angegeben ist, "
 "\"aim\"-URLs verarbeiten soll."
 
-#: ../libpurple/gconf/purple.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."
@@ -2024,7 +1975,7 @@
 "Aktivieren, wenn der Befehl, der im \"command\"-Schl端ssel angegeben ist, \"gg"
 "\"-URLs verarbeiten soll."
 
-#: ../libpurple/gconf/purple.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."
@@ -2032,7 +1983,7 @@
 "Aktivieren, wenn der Befehl, der im \"command\"-Schl端ssel angegeben ist, "
 "\"icq\"-URLs verarbeiten soll."
 
-#: ../libpurple/gconf/purple.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."
@@ -2040,7 +1991,7 @@
 "Aktivieren, wenn der Befehl, der im \"command\"-Schl端ssel angegeben ist, "
 "\"irc\"-URLs verarbeiten soll."
 
-#: ../libpurple/gconf/purple.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."
@@ -2048,7 +1999,7 @@
 "Aktivieren, wenn der Befehl, der im \"command\"-Schl端ssel angegeben ist, "
 "\"msnim\"-URLs verarbeiten soll."
 
-#: ../libpurple/gconf/purple.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."
@@ -2056,7 +2007,7 @@
 "Aktivieren, wenn der Befehl, der im \"command\"-Schl端ssel angegeben ist, "
 "\"sip\"-URLs verarbeiten soll."
 
-#: ../libpurple/gconf/purple.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."
@@ -2064,7 +2015,7 @@
 "Aktivieren, wenn der Befehl, der im \"command\"-Schl端ssel angegeben ist, "
 "\"xmpp\"-URLs verarbeiten soll."
 
-#: ../libpurple/gconf/purple.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."
@@ -2072,7 +2023,7 @@
 "Aktivieren, wenn der Befehl, der im \"command\"-Schl端ssel angegeben ist, "
 "\"ymsgr\"-URLs verarbeiten soll."
 
-#: ../libpurple/gconf/purple.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."
@@ -2080,63 +2031,63 @@
 "Aktivieren, wenn der Befehl, der benutzt wird um diese Art von URL zu "
 "verarbeiten, in einem Terminal ausgef端hrt werden soll."
 
-#: ../libpurple/gconf/purple.schemas.in.h:27
+#: libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Legt fest, ob das angegebene Kommado \"aim\"-URLs verarbeiten soll"
 
-#: ../libpurple/gconf/purple.schemas.in.h:28
+#: libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "Legt fest, ob das angegebene Kommado \"gg\"-URLs verarbeiten soll"
 
-#: ../libpurple/gconf/purple.schemas.in.h:29
+#: libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "Legt fest, ob das angegebene Kommado \"icq\"-URLs verarbeiten soll"
 
-#: ../libpurple/gconf/purple.schemas.in.h:30
+#: libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "Legt fest, ob das angegebene Kommado \"irc\"-URLs verarbeiten soll"
 
-#: ../libpurple/gconf/purple.schemas.in.h:31
+#: libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "Legt fest, ob das angegebene Kommado \"msnim\"-URLs verarbeiten soll"
 
-#: ../libpurple/gconf/purple.schemas.in.h:32
+#: libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "Legt fest, ob das angegebene Kommado \"sip\"-URLs verarbeiten soll"
 
-#: ../libpurple/gconf/purple.schemas.in.h:33
+#: libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "Legt fest, ob das angegebene Kommado \"xmpp\"-URLs verarbeiten soll"
 
-#: ../libpurple/gconf/purple.schemas.in.h:34
+#: libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Legt fest, ob das angegebene Kommado \"ymsrg\"-URLs verarbeiten soll"
 
-#: ../libpurple/log.c:182
+#: libpurple/log.c:182
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Der Logger hat keine Lesefunktion</font></b>"
 
-#: ../libpurple/log.c:597
+#: libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:611
+#: libpurple/log.c:611
 msgid "Plain text"
 msgstr "Einfacher Text"
 
-#: ../libpurple/log.c:625
+#: libpurple/log.c:625
 msgid "Old flat format"
-msgstr "Altes \"flaches\" format"
-
-#: ../libpurple/log.c:837
+msgstr "Altes \"flaches\" Format"
+
+#: libpurple/log.c:837
 msgid "Logging of this conversation failed."
 msgstr "Mitschnitt der Unterhaltung fehlgeschlagen."
 
-#: ../libpurple/log.c:1280
+#: libpurple/log.c:1280
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1364
+#: libpurple/log.c:1364
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2145,7 +2096,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1366
+#: libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2154,44 +2105,46 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1424 ../libpurple/log.c:1557
+#: libpurple/log.c:1424 libpurple/log.c:1557
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
-msgstr "<font color=\"red\"><b>Kann den Mitschnitt-Pfad nicht finden!</b></font>"
-
-#: ../libpurple/log.c:1436 ../libpurple/log.c:1566
+msgstr ""
+"<font color=\"red\"><b>Kann den Mitschnitt-Pfad nicht finden!</b></font>"
+
+#: libpurple/log.c:1436 libpurple/log.c:1566
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Kann folgende Datei nicht lesen: %s</b></font>"
 
-#: ../libpurple/log.c:1498
+#: libpurple/log.c:1498
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
 
-#: ../libpurple/plugin.c:365
+#: libpurple/plugin.c:365
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Sie benutzen %s, aber dieses Plugin ben旦tigt %s."
 
-#: ../libpurple/plugin.c:380
+#: libpurple/plugin.c:380
+#, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Dieses Plugin hat keine ID definiert."
 
-#: ../libpurple/plugin.c:448
+#: libpurple/plugin.c:448
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Keine �bereinstimmung der Plugin-Magic-Nummer %d (brauche %d)"
 
-#: ../libpurple/plugin.c:465
+#: libpurple/plugin.c:465
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI Versionskonflikt %d.%d.x (brauche %d.%d.x)"
 
-#: ../libpurple/plugin.c:482
+#: libpurple/plugin.c:482
 msgid "Plugin does not implement all required functions"
 msgstr "Plugin enth辰lt nicht alle ben旦tigten Funktionen"
 
-#: ../libpurple/plugin.c:547
+#: libpurple/plugin.c:547
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -2200,91 +2153,91 @@
 "Das erforderliche Plugin %s wurde nicht gefunden. Bitte installieren Sie das "
 "Plugin und versuchen Sie es erneut."
 
-#: ../libpurple/plugin.c:552
+#: libpurple/plugin.c:552
 msgid "Unable to load the plugin"
 msgstr "Konnte das Plugin nicht laden"
 
-#: ../libpurple/plugin.c:574
+#: libpurple/plugin.c:574
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Das erforderliche Plugin %s konnte nicht geladen werden."
 
-#: ../libpurple/plugin.c:578
+#: libpurple/plugin.c:578
 msgid "Unable to load your plugin."
 msgstr "Konnte Ihr Plugin nicht laden."
 
-#: ../libpurple/plugin.c:677
+#: libpurple/plugin.c:677
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "Das erforderliche Plugin %s konnte nicht entladen werden."
 
-#: ../libpurple/plugin.c:681
+#: libpurple/plugin.c:681
 msgid "There were errors unloading the plugin."
 msgstr "Beim Entladen des Plugins traten Fehler auf."
 
-#: ../libpurple/plugins/autoaccept.c:23
+#: libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
 msgstr "Auto-Akzeptieren"
 
-#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
+#: libpurple/plugins/autoaccept.c:25 libpurple/plugins/autoaccept.c:26
 msgid "Auto-accept file transfer requests from selected users."
 msgstr "Datei端bertragung von ausgew辰hlten Benutzern automatisch akzeptieren."
 
-#: ../libpurple/plugins/autoaccept.c:80
+#: libpurple/plugins/autoaccept.c:80
 #, c-format
 msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
 msgstr ""
 "Automatisch akzeptierte �bertragung der Datei \"%s\" von \"%s\" "
 "abgeschlossen."
 
-#: ../libpurple/plugins/autoaccept.c:82
+#: libpurple/plugins/autoaccept.c:82
 msgid "Autoaccept complete"
 msgstr "Autoaccept fertig"
 
-#: ../libpurple/plugins/autoaccept.c:160
+#: libpurple/plugins/autoaccept.c:160
 #, c-format
 msgid "When a file-transfer request arrives from %s"
 msgstr "Wenn eine Dateitransferanfrage von %s ankommt"
 
-#: ../libpurple/plugins/autoaccept.c:162
+#: libpurple/plugins/autoaccept.c:162
 msgid "Set Autoaccept Setting"
 msgstr "Auto-Akzeptieren-Einstellungen setzen"
 
-#: ../libpurple/plugins/autoaccept.c:164
+#: libpurple/plugins/autoaccept.c:164
 msgid "_Save"
 msgstr "_Speichern"
 
-#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
-#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1458
-#: ../libpurple/protocols/oscar/oscar.c:2251
-#: ../libpurple/protocols/oscar/oscar.c:2298
-#: ../libpurple/protocols/oscar/oscar.c:5865
-#: ../libpurple/protocols/oscar/oscar.c:5920
-#: ../libpurple/protocols/oscar/oscar.c:6146
-#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1387
-#: ../libpurple/request.h:1397
+#: libpurple/plugins/autoaccept.c:165 libpurple/plugins/idle.c:170
+#: libpurple/plugins/idle.c:204 libpurple/plugins/idle.c:230
+#: libpurple/protocols/oscar/oscar.c:1454
+#: libpurple/protocols/oscar/oscar.c:2247
+#: libpurple/protocols/oscar/oscar.c:2294
+#: libpurple/protocols/oscar/oscar.c:5865
+#: libpurple/protocols/oscar/oscar.c:5920
+#: libpurple/protocols/oscar/oscar.c:6146
+#: libpurple/protocols/oscar/oscar.c:6216 libpurple/request.h:1387
+#: libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "A_bbrechen"
 
-#: ../libpurple/plugins/autoaccept.c:168
+#: libpurple/plugins/autoaccept.c:168
 msgid "Ask"
 msgstr "Fragen"
 
-#: ../libpurple/plugins/autoaccept.c:169
+#: libpurple/plugins/autoaccept.c:169
 msgid "Auto Accept"
 msgstr "Auto-Akzeptieren"
 
-#: ../libpurple/plugins/autoaccept.c:170
+#: libpurple/plugins/autoaccept.c:170
 msgid "Auto Reject"
 msgstr "Auto-Ablehnen"
 
-#: ../libpurple/plugins/autoaccept.c:185
+#: libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "Datei端bertragungen automatisch akzeptieren..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:215
+#: libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2292,11 +2245,11 @@
 "Pfad in denen die Dateien gespeichert werden sollen\n"
 "(Bitte geben Sie den vollst辰ndigen Pfad an)"
 
-#: ../libpurple/plugins/autoaccept.c:220
+#: libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
 msgstr "Automatisch von Benutzern ablehnen, die nicht in der Buddy-Liste sind"
 
-#: ../libpurple/plugins/autoaccept.c:224
+#: libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2305,16 +2258,16 @@
 "Datei端bertragung abgeschlossen ist\n"
 "(nur, wenn es keine Unterhaltung mit dem Sender gibt)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
-#: ../libpurple/protocols/msn/msn.c:1659
+#: libpurple/plugins/buddynote.c:46 libpurple/protocols/msn/msn.c:1629
+#: libpurple/protocols/msn/msn.c:1659
 msgid "Notes"
 msgstr "Notizen"
 
-#: ../libpurple/plugins/buddynote.c:47
+#: libpurple/plugins/buddynote.c:47
 msgid "Enter your notes below..."
 msgstr "Geben Sie Ihre Notizen unten ein..."
 
-#: ../libpurple/plugins/buddynote.c:65
+#: libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Notizen bearbeiten..."
 
@@ -2326,20 +2279,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90 ../pidgin/plugins/gtkbuddynote.c:71
+#: libpurple/plugins/buddynote.c:90 pidgin/plugins/gtkbuddynote.c:71
 msgid "Buddy Notes"
 msgstr "Buddy-Notizen"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92 ../pidgin/plugins/gtkbuddynote.c:73
+#: libpurple/plugins/buddynote.c:92 pidgin/plugins/gtkbuddynote.c:73
 msgid "Store notes on particular buddies."
 msgstr "Notizen 端ber bestimmte Buddys speichern."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:74
+#: libpurple/plugins/buddynote.c:93 pidgin/plugins/gtkbuddynote.c:74
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr "Gibt die M旦glichkeit, Notizen f端r Buddys auf Ihrer Buddy-Liste zu speichern."
+msgstr ""
+"Gibt die M旦glichkeit, Notizen f端r Buddys auf Ihrer Buddy-Liste zu speichern."
 
 #. *< type
 #. *< ui_requirement
@@ -2347,7 +2301,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ciphertest.c:264
+#: libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Verschl端sselungstest"
 
@@ -2355,7 +2309,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+#: libpurple/plugins/ciphertest.c:267 libpurple/plugins/ciphertest.c:269
 msgid "Tests the ciphers that ship with libpurple."
 msgstr "Testet die Chiffren, die mit libpurple geliefert werden."
 
@@ -2365,7 +2319,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/dbus-example.c:155
+#: libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "DBus-Beispiel"
 
@@ -2373,8 +2327,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/dbus-example.c:158
-#: ../libpurple/plugins/dbus-example.c:160
+#: libpurple/plugins/dbus-example.c:158 libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "DBus-Plugin-Beispiel"
 
@@ -2384,7 +2337,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/filectl.c:248
+#: libpurple/plugins/filectl.c:248
 msgid "File Control"
 msgstr "Dateikontrolle"
 
@@ -2392,52 +2345,53 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/filectl.c:251 ../libpurple/plugins/filectl.c:253
+#: libpurple/plugins/filectl.c:251 libpurple/plugins/filectl.c:253
 msgid "Allows control by entering commands in a file."
 msgstr "Erlaubt die Steuerung, indem Sie Kommandos in eine Datei schreiben."
 
-#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
+#: libpurple/plugins/idle.c:158 libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minuten"
 
 #. 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.
-#: ../libpurple/plugins/idle.c:165 ../libpurple/plugins/idle.c:199
-#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
+#: libpurple/plugins/idle.c:165 libpurple/plugins/idle.c:199
+#: libpurple/plugins/idle.c:225 libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "Unt辰tigkeitsmarker"
 
-#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
+#: libpurple/plugins/idle.c:166 libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Setze Konto-Unt辰tigkeitszeit"
 
-#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
+#: libpurple/plugins/idle.c:169 libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "_Setzen"
 
-#: ../libpurple/plugins/idle.c:184
+#: libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Keine ihrer Konten sind unt辰tig."
 
-#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
+#: libpurple/plugins/idle.c:200 libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Unt辰tigkeitszeit zur端cksetzen"
 
-#: ../libpurple/plugins/idle.c:203
+#: libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "Zur端cksetze_n"
 
-#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
+#: libpurple/plugins/idle.c:226 libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Unt辰tigkeitszeit f端r alle Konten setzen"
 
-#: ../libpurple/plugins/idle.c:271
+#: libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Unt辰tigkeitszeit f端r alle unt辰tige Konten zur端cksetzen"
 
-#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
+#: libpurple/plugins/idle.c:320 libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
-msgstr "Erlaubt Ihnen manuell zu konfigurieren, wie lange Sie unt辰tig sein wollen"
+msgstr ""
+"Erlaubt Ihnen manuell zu konfigurieren, wie lange Sie unt辰tig sein wollen"
 
 #. *< type
 #. *< ui_requirement
@@ -2445,19 +2399,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-client.c:87
+#: libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "IPC Testclient"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-client.c:90
+#: libpurple/plugins/ipc-test-client.c:90
 msgid "Test plugin IPC support, as a client."
 msgstr "Plugin zum Testen der IPC-Unterst端tzung als Client."
 
 #. *  description
-#: ../libpurple/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."
@@ -2471,33 +2425,33 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-server.c:74
+#: libpurple/plugins/ipc-test-server.c:74
 msgid "IPC Test Server"
 msgstr "IPC Testserver"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/ipc-test-server.c:77
+#: libpurple/plugins/ipc-test-server.c:77
 msgid "Test plugin IPC support, as a server."
 msgstr "Plugin zum Testen der IPC-Unterst端tzung als Server."
 
 #. *  description
-#: ../libpurple/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 ""
 "Plugin zum Testen der IPC-Unterst端tzung als Server. Die IPC-Kommandos werden "
 "registriert."
 
-#: ../libpurple/plugins/joinpart.c:229
+#: libpurple/plugins/joinpart.c:229
 msgid "Join/Part Hiding Configuration"
 msgstr "Verstecken der Betreten-/Verlassen-Meldungen"
 
-#: ../libpurple/plugins/joinpart.c:233
+#: libpurple/plugins/joinpart.c:233
 msgid "Minimum Room Size"
 msgstr "Minimale Raumgr旦�e"
 
-#: ../libpurple/plugins/joinpart.c:239
+#: libpurple/plugins/joinpart.c:239
 msgid "User Inactivity Timeout (in minutes)"
 msgstr "Benutzer-Inaktivit辰ts-Zeit端berschreitung"
 
@@ -2507,19 +2461,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:270
+#: libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr "Betreten/Verlassen verstecken"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:273
+#: libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr "Versteckt belanglose Betreten-/Verlassen-Meldungen."
 
 #. *  description
-#: ../libpurple/plugins/joinpart.c:275
+#: libpurple/plugins/joinpart.c:275
 msgid ""
 "This plugin hides join/part messages in large rooms, except for those users "
 "actively taking part in a conversation."
@@ -2531,34 +2485,33 @@
 #. * 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.
-#: ../libpurple/plugins/log_reader.c:492
+#: libpurple/plugins/log_reader.c:492
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1573
+#: libpurple/plugins/log_reader.c:1573
 msgid "User is offline."
 msgstr "Benutzer ist offline."
 
-#: ../libpurple/plugins/log_reader.c:1579
+#: libpurple/plugins/log_reader.c:1579
 msgid "Auto-response sent:"
 msgstr "Automatische Antwort gesendet:"
 
-#: ../libpurple/plugins/log_reader.c:1589
-#: ../libpurple/plugins/log_reader.c:1592
-#: ../libpurple/plugins/statenotify.c:80
+#: libpurple/plugins/log_reader.c:1589 libpurple/plugins/log_reader.c:1592
+#: libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s hat sich abgemeldet."
 
-#: ../libpurple/plugins/log_reader.c:1606
+#: libpurple/plugins/log_reader.c:1606
 msgid "One or more messages may have been undeliverable."
 msgstr "Eine oder mehrere Nachrichten konnten nicht zugestellt werden."
 
-#: ../libpurple/plugins/log_reader.c:1616
+#: libpurple/plugins/log_reader.c:1616
 msgid "You were disconnected from the server."
 msgstr "Sie wurden vom Server getrennt."
 
-#: ../libpurple/plugins/log_reader.c:1624
+#: libpurple/plugins/log_reader.c:1624
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -2566,79 +2519,73 @@
 "Sie sind nicht verbunden. Nachrichten k旦nnen nicht empfangen werden bis Sie "
 "sich wieder anmelden."
 
-#: ../libpurple/plugins/log_reader.c:1639
+#: libpurple/plugins/log_reader.c:1639
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr ""
 "Nachricht konnte nicht gesendet werden, da maximale L辰nge 端berschritten "
 "wurde."
 
-#: ../libpurple/plugins/log_reader.c:1644
+#: libpurple/plugins/log_reader.c:1644
 msgid "Message could not be sent."
 msgstr "Ihre Nachricht wurde nicht verschickt."
 
 #. 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.
-#: ../libpurple/plugins/log_reader.c:2344
-#: ../libpurple/plugins/log_reader.c:2467
+#: libpurple/plugins/log_reader.c:2343 libpurple/plugins/log_reader.c:2466
 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.
-#: ../libpurple/plugins/log_reader.c:2357
-#: ../libpurple/plugins/log_reader.c:2472
+#: libpurple/plugins/log_reader.c:2356 libpurple/plugins/log_reader.c:2471
 msgid "Fire"
 msgstr "Fire"
 
 #. 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.
-#: ../libpurple/plugins/log_reader.c:2369
-#: ../libpurple/plugins/log_reader.c:2476
+#: libpurple/plugins/log_reader.c:2368 libpurple/plugins/log_reader.c:2475
 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.
-#: ../libpurple/plugins/log_reader.c:2383
-#: ../libpurple/plugins/log_reader.c:2481
+#: libpurple/plugins/log_reader.c:2382 libpurple/plugins/log_reader.c:2480
 msgid "QIP"
 msgstr "QIP"
 
 #. 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.
-#: ../libpurple/plugins/log_reader.c:2395
-#: ../libpurple/plugins/log_reader.c:2485
+#: libpurple/plugins/log_reader.c:2394 libpurple/plugins/log_reader.c:2484
 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.
-#: ../libpurple/plugins/log_reader.c:2407
-#: ../libpurple/plugins/log_reader.c:2489
+#: libpurple/plugins/log_reader.c:2406 libpurple/plugins/log_reader.c:2488
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2449
+#: libpurple/plugins/log_reader.c:2448
 msgid "General Log Reading Configuration"
 msgstr "Allgemeine Mitschnittseinstellungen"
 
-#: ../libpurple/plugins/log_reader.c:2453
+#: libpurple/plugins/log_reader.c:2452
 msgid "Fast size calculations"
 msgstr "Schnelle Gr旦�enberechnung"
 
-#: ../libpurple/plugins/log_reader.c:2457
+#: libpurple/plugins/log_reader.c:2456
 msgid "Use name heuristics"
 msgstr "Benutze Namensheuristiken"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2463
+#: libpurple/plugins/log_reader.c:2462
 msgid "Log Directory"
 msgstr "Mitschnittverzeichnis"
 
@@ -2648,21 +2595,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2518
+#: libpurple/plugins/log_reader.c:2517
 msgid "Log Reader"
 msgstr "Mitschnittsbetrachter"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2522
+#: libpurple/plugins/log_reader.c:2521
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 "Zeigt die Mitschnitte anderer Sofortnachrichtenprogramme im "
 "Mitschnittsbetrachter an."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2526
+#: libpurple/plugins/log_reader.c:2525
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2676,12 +2623,12 @@
 "WARNUNG: Dieses Plugin befindet sich noch im Entwicklungsstadium und kann "
 "oft Abst端rzen. Benutzung auf eigene Gefahr!"
 
-#: ../libpurple/plugins/mono/loader/mono.c:217
+#: libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "Mono-Plugin-Lader"
 
-#: ../libpurple/plugins/mono/loader/mono.c:219
-#: ../libpurple/plugins/mono/loader/mono.c:220
+#: libpurple/plugins/mono/loader/mono.c:219
+#: libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "L辰dt .NET-Plugins mit Mono."
 
@@ -2694,18 +2641,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/newline.c:68
+#: libpurple/plugins/newline.c:68
 msgid "New Line"
 msgstr "Neue Zeile"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/newline.c:70
+#: libpurple/plugins/newline.c:70
 msgid "Prepends a newline to displayed message."
 msgstr "F端gt einen Zeilenumbruch vor angezeigter Nachricht ein."
 
 #. *< summary
-#: ../libpurple/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."
@@ -2713,15 +2660,15 @@
 "F端gt einen Zeilenumbruch vor Nachrichten ein, sodass im Gespr辰chsfenster der "
 "Nachrichtentext unter dem Benutzernamen erscheint."
 
-#: ../libpurple/plugins/offlinemsg.c:23
+#: libpurple/plugins/offlinemsg.c:23
 msgid "Offline Message Emulation"
 msgstr "Offline-Nachrichten-Emulation"
 
-#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/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 "Sichert Nachrichten an einen Offline-Benutzer als Alarm."
 
-#: ../libpurple/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."
@@ -2729,7 +2676,7 @@
 "Die folgenden Nachrichten werden als Alarm gesichert. Sie k旦nnen den Alarm "
 "im `Buddy-Alarm'-Dialog 辰ndern oder l旦schen."
 
-#: ../libpurple/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 "
@@ -2739,43 +2686,39 @@
 "einem Alarm sichern? Diese Nachrichten w端rden dann automatisch gesendet, "
 "wenn sich \"%s\" wieder anmeldet."
 
-#: ../libpurple/plugins/offlinemsg.c:156
+#: libpurple/plugins/offlinemsg.c:156
 msgid "Offline Message"
 msgstr "Offline-Nachrichten"
 
-#: ../libpurple/plugins/offlinemsg.c:157
+#: libpurple/plugins/offlinemsg.c:157
 msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
 msgstr "Sie k旦nnen den Alarm im `Buddy-Alarm'-Dialog 辰ndern/l旦schen"
 
-#: ../libpurple/plugins/offlinemsg.c:161
-#: ../libpurple/protocols/msn/dialog.c:133
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
-#: ../libpurple/protocols/novell/novell.c:1917
-#: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
-#: ../libpurple/protocols/silc10/buddy.c:314
-#: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
+#: libpurple/plugins/offlinemsg.c:161 libpurple/protocols/msn/dialog.c:133
+#: libpurple/protocols/msn/msn.c:522 libpurple/protocols/msn/msn.c:532
+#: libpurple/protocols/novell/novell.c:1917
+#: libpurple/protocols/silc/buddy.c:317 libpurple/protocols/silc/pk.c:113
+#: libpurple/protocols/silc/wb.c:304 libpurple/protocols/silc10/buddy.c:314
+#: libpurple/protocols/silc10/pk.c:119 libpurple/protocols/silc10/wb.c:304
+#: pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "Ja"
 
-#: ../libpurple/plugins/offlinemsg.c:162
-#: ../libpurple/protocols/msn/dialog.c:134
-#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
-#: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
-#: ../libpurple/protocols/silc10/buddy.c:315
-#: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
+#: libpurple/plugins/offlinemsg.c:162 libpurple/protocols/msn/dialog.c:134
+#: libpurple/protocols/msn/msn.c:522 libpurple/protocols/msn/msn.c:532
+#: libpurple/protocols/novell/novell.c:1918
+#: libpurple/protocols/silc/buddy.c:318 libpurple/protocols/silc/pk.c:114
+#: libpurple/protocols/silc/wb.c:305 libpurple/protocols/silc10/buddy.c:315
+#: libpurple/protocols/silc10/pk.c:120 libpurple/protocols/silc10/wb.c:305
+#: pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "Nein"
 
-#: ../libpurple/plugins/offlinemsg.c:189
+#: libpurple/plugins/offlinemsg.c:189
 msgid "Save offline messages in pounce"
 msgstr "Sichere Offline-Nachricht als Alarm"
 
-#: ../libpurple/plugins/offlinemsg.c:193
+#: libpurple/plugins/offlinemsg.c:193
 msgid "Do not ask. Always save in pounce."
 msgstr "Nicht nachfragen. Immer als Alarm sichern."
 
@@ -2785,26 +2728,26 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:601
+#: libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Perl-Plugin-Loader"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
+#: libpurple/plugins/perl/perl.c:603 libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "Erm旦glicht das Laden von Perl-Plugins."
 
-#: ../libpurple/plugins/psychic.c:20
+#: libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Psycho-Modus"
 
-#: ../libpurple/plugins/psychic.c:21
+#: libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Psycho-Modus f端r eingehende Gespr辰che"
 
-#: ../libpurple/plugins/psychic.c:22
+#: libpurple/plugins/psychic.c:22
 msgid ""
 "Causes conversation windows to appear as other users begin to message you.  "
 "This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
@@ -2812,23 +2755,23 @@
 "�ffnet Gespr辰chsfenster, wenn andere Benutzer beginnen, Ihnen eine Nachricht "
 "zu senden.  Das funktioniert mit AIM, ICQ, XMPP, Sametime und Yahoo!"
 
-#: ../libpurple/plugins/psychic.c:72
+#: libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "Ihr Buddy beginnt zu tippen..."
 
-#: ../libpurple/plugins/psychic.c:91
+#: libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Nur f端r Benutzer aus der Buddy-Liste aktivieren"
 
-#: ../libpurple/plugins/psychic.c:96
+#: libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Deaktivieren, wenn abwesend"
 
-#: ../libpurple/plugins/psychic.c:100
+#: libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Benachrichtigung in Gespr辰chen anzeigen"
 
-#: ../libpurple/plugins/psychic.c:105
+#: libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "Psycho-Unterhaltungen anheben"
 
@@ -2838,7 +2781,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:684
+#: libpurple/plugins/signals-test.c:711
 msgid "Signals Test"
 msgstr "Signaltest"
 
@@ -2846,8 +2789,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:687
-#: ../libpurple/plugins/signals-test.c:689
+#: libpurple/plugins/signals-test.c:714 libpurple/plugins/signals-test.c:716
 msgid "Test to see that all signals are working properly."
 msgstr "Test, um zu sehen, ob alle Signale richtig funktionieren."
 
@@ -2857,7 +2799,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/simple.c:37
+#: libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Einfaches Plugin"
 
@@ -2865,7 +2807,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/simple.c:40 ../libpurple/plugins/simple.c:42
+#: libpurple/plugins/simple.c:40 libpurple/plugins/simple.c:42
 msgid "Tests to see that most things are working."
 msgstr "Tests, um zu sehen, ob das meiste funktioniert."
 
@@ -2875,7 +2817,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
+#: libpurple/plugins/ssl/ssl-gnutls.c:275
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -2883,8 +2825,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
+#: libpurple/plugins/ssl/ssl-gnutls.c:278
+#: libpurple/plugins/ssl/ssl-gnutls.c:280
 msgid "Provides SSL support through GNUTLS."
 msgstr "Erlaubt SSL-Unterst端tzung mit GNUTLS."
 
@@ -2894,7 +2836,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:423
+#: libpurple/plugins/ssl/ssl-nss.c:423
 msgid "NSS"
 msgstr "NSS"
 
@@ -2902,8 +2844,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:426
-#: ../libpurple/plugins/ssl/ssl-nss.c:428
+#: libpurple/plugins/ssl/ssl-nss.c:426 libpurple/plugins/ssl/ssl-nss.c:428
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Erlaubt SSL-Unterst端tzung mit Mozilla NSS."
 
@@ -2913,7 +2854,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
+#: libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -2921,48 +2862,48 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl.c:97 ../libpurple/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 "Liefert einen Wrapper um die SSL-Bibliotheken."
 
-#: ../libpurple/plugins/statenotify.c:50
+#: libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s ist wieder anwesend."
 
-#: ../libpurple/plugins/statenotify.c:52
+#: libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s ist abwesend."
 
-#: ../libpurple/plugins/statenotify.c:62
+#: libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s ist inaktiv."
 
-#: ../libpurple/plugins/statenotify.c:64
+#: libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s ist nicht mehr inaktiv."
 
-#: ../libpurple/plugins/statenotify.c:73
+#: libpurple/plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s hat sich angemeldet."
 
-#: ../libpurple/plugins/statenotify.c:91
+#: libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Benachrichtigung, wenn"
 
-#: ../libpurple/plugins/statenotify.c:94
+#: libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "Buddy _hinaus geht"
 
-#: ../libpurple/plugins/statenotify.c:97
+#: libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "Buddy _unt辰tig wird"
 
-#: ../libpurple/plugins/statenotify.c:100
+#: libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "Buddy _sich an/abmeldet"
 
@@ -2972,7 +2913,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:148
+#: libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Buddy-Status-Benachrichtigung"
 
@@ -2980,8 +2921,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/statenotify.c:151
-#: ../libpurple/plugins/statenotify.c:154
+#: libpurple/plugins/statenotify.c:151 libpurple/plugins/statenotify.c:154
 msgid ""
 "Notifies in a conversation window when a buddy goes or returns from away or "
 "idle."
@@ -2989,15 +2929,15 @@
 "Benachrichtigt in einem Gespr辰chsfenster dar端ber, ob ein Buddy gegangen ist "
 "oder vom Abwesenheits- oder Unt辰tigkeitsstatus zur端ckgekehrt ist."
 
-#: ../libpurple/plugins/tcl/tcl.c:421
+#: libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-Plugin-Lader"
 
-#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
+#: libpurple/plugins/tcl/tcl.c:423 libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "Erm旦glicht das Laden von Tcl-Plugins"
 
-#: ../libpurple/plugins/tcl/tcl.c:507
+#: libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -3006,31 +2946,31 @@
 "dann installieren Sie ActiveTCL von http://www.activestate.com\n"
 
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:112
+#: libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Kann nicht auf eingehende IM-Verbindungen h旦ren\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:137
-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+#: libpurple/protocols/bonjour/bonjour.c:137
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Keine Verbindung zum lokalen mDNS-Server. Ist er aktiviert?"
 
 #. 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:294
-#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1472
-#: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4545
-#: ../libpurple/protocols/oscar/oscar.c:5611
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
-#: ../libpurple/protocols/silc10/buddy.c:1476
-#: ../libpurple/protocols/yahoo/yahoo.c:3397
-#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1932
-#: ../pidgin/gtkstatusbox.c:1056
+#: libpurple/protocols/bonjour/bonjour.c:294 libpurple/protocols/gg/gg.c:1009
+#: libpurple/protocols/irc/irc.c:530 libpurple/protocols/irc/msgs.c:310
+#: libpurple/protocols/jabber/buddy.c:1472
+#: libpurple/protocols/novell/novell.c:2819
+#: libpurple/protocols/oscar/oscar.c:733
+#: libpurple/protocols/oscar/oscar.c:4545
+#: libpurple/protocols/oscar/oscar.c:5611 libpurple/protocols/qq/qq.c:180
+#: libpurple/protocols/silc/buddy.c:1476
+#: libpurple/protocols/silc10/buddy.c:1476
+#: libpurple/protocols/yahoo/yahoo.c:3401
+#: libpurple/protocols/yahoo/yahoo.c:3474 libpurple/status.c:157
+#: pidgin/gtkdocklet.c:442 pidgin/gtkprefs.c:1932 pidgin/gtkstatusbox.c:1056
+#, c-format
 msgid "Away"
 msgstr "Abwesend"
 
@@ -3044,423 +2984,409 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:425
-#: ../libpurple/protocols/bonjour/bonjour.c:427
+#: libpurple/protocols/bonjour/bonjour.c:425
+#: libpurple/protocols/bonjour/bonjour.c:427
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour-Protokoll-Plugin"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:470
-#: ../libpurple/protocols/bonjour/bonjour.c:477
-#: ../libpurple/protocols/bonjour/bonjour.c:535
+#: libpurple/protocols/bonjour/bonjour.c:470
+#: libpurple/protocols/bonjour/bonjour.c:477
+#: libpurple/protocols/bonjour/bonjour.c:526
 msgid "Purple Person"
 msgstr "Purple-Person"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:583
-#: ../libpurple/protocols/silc/silc.c:1007
-#: ../libpurple/protocols/silc10/silc.c:918
+#: libpurple/protocols/bonjour/bonjour.c:575
+#: libpurple/protocols/silc/silc.c:1007 libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Rechnername"
 
 # old strings
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:587
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:828
+#: libpurple/protocols/bonjour/bonjour.c:579 libpurple/protocols/gg/gg.c:627
+#: libpurple/protocols/jabber/jabber.c:828
 msgid "First name"
 msgstr "Vorname"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:590
-#: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:833
+#: libpurple/protocols/bonjour/bonjour.c:582 libpurple/protocols/gg/gg.c:622
+#: libpurple/protocols/jabber/jabber.c:833
 msgid "Last name"
 msgstr "Nachname"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:593
-#: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:818
-#: ../libpurple/protocols/silc/silc.c:770
-#: ../libpurple/protocols/silc/silc.c:1011
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
+#: libpurple/protocols/bonjour/bonjour.c:585 libpurple/protocols/gg/gg.c:472
+#: libpurple/protocols/jabber/jabber.c:818 libpurple/protocols/silc/silc.c:770
+#: libpurple/protocols/silc/silc.c:1011 libpurple/protocols/silc10/silc.c:681
+#: libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
 msgstr "E-Mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: libpurple/protocols/bonjour/bonjour.c:588
 msgid "AIM Account"
 msgstr "AIM-Konto"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:599
+#: libpurple/protocols/bonjour/bonjour.c:591
 msgid "XMPP Account"
 msgstr "XMPP-Konto"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:33
+#: libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:395
+#: libpurple/protocols/bonjour/jabber.c:391
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s hat das Gespr辰ch beendet."
 
-#: ../libpurple/protocols/bonjour/jabber.c:441
-#: ../libpurple/protocols/bonjour/jabber.c:654
-#: ../libpurple/protocols/bonjour/jabber.c:679
+#: libpurple/protocols/bonjour/jabber.c:443
+#: libpurple/protocols/bonjour/jabber.c:656
+#: libpurple/protocols/bonjour/jabber.c:682
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr ""
 "Die Nachricht kann nicht gesendet werden, das Gespr辰ch kann nicht gestartet "
 "werden."
 
-#: ../libpurple/protocols/bonjour/jabber.c:575
+#: libpurple/protocols/bonjour/jabber.c:577
 msgid "Cannot open socket"
 msgstr "Kann die Socket nicht 旦ffnen"
 
-#: ../libpurple/protocols/bonjour/jabber.c:583
+#: libpurple/protocols/bonjour/jabber.c:585
 msgid "Error setting socket options"
 msgstr "Fehler beim Setzen der Socket-Optionen"
 
-#: ../libpurple/protocols/bonjour/jabber.c:607
+#: libpurple/protocols/bonjour/jabber.c:609
 msgid "Could not bind socket to port"
 msgstr "Kann die Socket nicht an den Port binden"
 
-#: ../libpurple/protocols/bonjour/jabber.c:615
+#: libpurple/protocols/bonjour/jabber.c:617
 msgid "Could not listen on socket"
 msgstr "Kann nicht an der Socket h旦ren"
 
-#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
+#: libpurple/protocols/gg/gg.c:76 libpurple/proxy.c:1812
 msgid "Invalid proxy settings"
 msgstr "Falsche Proxy-Einstellungen"
 
-#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
+#: libpurple/protocols/gg/gg.c:77 libpurple/proxy.c:1812
 msgid ""
 "Either the host name or port number specified for your given proxy type is "
 "invalid."
 msgstr "Hostname oder Portnummer ihres Proxys sind falsch angegeben."
 
-#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
-#: ../libpurple/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 "K端rzel-Fehler"
 
-#: ../libpurple/protocols/gg/gg.c:116 ../libpurple/protocols/gg/gg.c:138
-#: ../libpurple/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 "Kann das K端rzel nicht abholen.\n"
 
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+#: libpurple/protocols/gg/gg.c:269 libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Buddy-Liste speichern..."
 
-#: ../libpurple/protocols/gg/gg.c:270
+#: libpurple/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Ihre Buddy-Liste ist leer, es wurde nichts in die Datei geschrieben."
 
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
+#: libpurple/protocols/gg/gg.c:276 libpurple/protocols/gg/gg.c:278
 msgid "Couldn't open file"
 msgstr "Kann Datei nicht 旦ffnen"
 
-#: ../libpurple/protocols/gg/gg.c:289
+#: libpurple/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Buddy-Liste wurde erfolgreich gespeichert!"
 
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+#: libpurple/protocols/gg/gg.c:307 libpurple/protocols/gg/gg.c:308
 msgid "Couldn't load buddylist"
 msgstr "Konnte Buddy-Liste nicht laden"
 
-#: ../libpurple/protocols/gg/gg.c:324
+#: libpurple/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "�ffne Buddy-Liste..."
 
-#: ../libpurple/protocols/gg/gg.c:325
+#: libpurple/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "Buddy-Liste erfolgreich geladen!"
 
-#: ../libpurple/protocols/gg/gg.c:336
+#: libpurple/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Buddy-Liste speichern..."
 
-#: ../libpurple/protocols/gg/gg.c:384
+#: libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "F端llen Sie die Registrierungsfelder aus."
 
-#: ../libpurple/protocols/gg/gg.c:389
+#: libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Passw旦rter stimmen nicht 端berein."
 
-#: ../libpurple/protocols/gg/gg.c:398
+#: libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Kann neues Konto nicht anlegen. Es ist ein Fehler aufgetreten.\n"
 
-#: ../libpurple/protocols/gg/gg.c:411
+#: libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Neues Gadu-Gadu-Konto angelegt"
 
-#: ../libpurple/protocols/gg/gg.c:412
+#: libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "Registrierung erfolgreich abgeschlossen!"
 
-#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1369
+#: libpurple/protocols/gg/gg.c:477 libpurple/protocols/gg/gg.c:770
+#: libpurple/protocols/jabber/jabber.c:807
+#: libpurple/protocols/jabber/jabber.c:1369
 msgid "Password"
 msgstr "Passwort"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
+#: libpurple/protocols/gg/gg.c:482 libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "Passwort (nochmal)"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: libpurple/protocols/gg/gg.c:487 libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "Geben Sie das aktuelle K端rzel ein"
 
-#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
+#: libpurple/protocols/gg/gg.c:493 libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "Aktuelles K端rzel"
 
-#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
+#: libpurple/protocols/gg/gg.c:497 libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrierung eines neuen Gadu-Gadu-Kontos"
 
-#: ../libpurple/protocols/gg/gg.c:499
+#: libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr "Bitte f端llen sie die folgenden Felder aus"
 
-#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1121
-#: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3803
-#: ../libpurple/protocols/oscar/oscar.c:3816
-#: ../libpurple/protocols/qq/buddy_info.c:49
+#: libpurple/protocols/gg/gg.c:637 libpurple/protocols/gg/gg.c:1049
+#: libpurple/protocols/gg/gg.c:1121 libpurple/protocols/jabber/jabber.c:843
+#: libpurple/protocols/oscar/oscar.c:3798
+#: libpurple/protocols/oscar/oscar.c:3811
+#: libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Stadt"
 
-#: ../libpurple/protocols/gg/gg.c:642
+#: libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "Geburtsjahr"
 
-#: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3746
-#: ../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
+#: libpurple/protocols/gg/gg.c:645 libpurple/protocols/msn/msn.c:1558
+#: libpurple/protocols/oscar/oscar.c:3741
+#: 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:1091
 msgid "Gender"
 msgstr "Geschlecht"
 
-#: ../libpurple/protocols/gg/gg.c:646
+#: libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "M辰nnlich oder weiblich"
 
-#: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3746
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:224
+#: libpurple/protocols/gg/gg.c:647 libpurple/protocols/oscar/oscar.c:3741
+#: libpurple/protocols/qq/buddy_info.c:83 libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "M辰nnlich"
 
-#: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3746
-#: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:227
+#: libpurple/protocols/gg/gg.c:648 libpurple/protocols/oscar/oscar.c:3741
+#: libpurple/protocols/qq/buddy_info.c:84 libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "Weiblich"
 
-#: ../libpurple/protocols/gg/gg.c:652
+#: libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr "Nur online"
 
-#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
+#: libpurple/protocols/gg/gg.c:656 libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "Suche Buddys"
 
-#: ../libpurple/protocols/gg/gg.c:658
+#: libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr "Bitte geben Sie Ihre Suchkriterien unten ein"
 
-#: ../libpurple/protocols/gg/gg.c:696
+#: libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "F端llen Sie die Felder aus."
 
-#: ../libpurple/protocols/gg/gg.c:708
+#: libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr "Ihr aktuelles Passwort ist anders als das angegebene."
 
-#: ../libpurple/protocols/gg/gg.c:722
+#: libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Konnte das Passwort nicht 辰ndern. Es trat ein Fehler auf.\n"
 
-#: ../libpurple/protocols/gg/gg.c:731
+#: libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "�ndern des Passworts f端r dieses Gadu-Gadu-Konto"
 
-#: ../libpurple/protocols/gg/gg.c:732
+#: libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "Das Passwort wurde erfolgreich ge辰ndert!"
 
-#: ../libpurple/protocols/gg/gg.c:765
+#: libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "Aktuelles Passwort"
 
-#: ../libpurple/protocols/gg/gg.c:790
+#: libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
-msgstr "Bitte geben Sie Ihr aktuelles und Ihr neues Passwort f端r folgende UIN ein: "
-
-#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
+msgstr ""
+"Bitte geben Sie Ihr aktuelles und Ihr neues Passwort f端r folgende UIN ein: "
+
+#: libpurple/protocols/gg/gg.c:794 libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "Gadu-Gadu Passwort 辰ndern"
 
-#: ../libpurple/protocols/gg/gg.c:871
+#: libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "W辰hlen sie einen Chat f端r den Benutzer: %s"
 
-#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
+#: libpurple/protocols/gg/gg.c:874 libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "Zum Chat hinzuf端gen..."
 
-#: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1466
-#: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5583
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3411
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
+#: libpurple/protocols/gg/gg.c:1003 libpurple/protocols/jabber/buddy.c:1466
+#: libpurple/protocols/novell/novell.c:2828
+#: libpurple/protocols/oscar/oscar.c:828
+#: libpurple/protocols/oscar/oscar.c:5583 libpurple/protocols/qq/qq.c:170
+#: libpurple/protocols/qq/qq.c:177 libpurple/protocols/yahoo/yahoo.c:2921
+#: libpurple/status.c:153 pidgin/gtkblist.c:3079 pidgin/gtkblist.c:3420
+#: pidgin/gtkdocklet.c:450 pidgin/gtkstatusbox.c:1059
 msgid "Offline"
 msgstr "Offline"
 
-#: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1468
-#: ../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:2816
-#: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
+#: libpurple/protocols/gg/gg.c:1006 libpurple/protocols/jabber/buddy.c:1468
+#: 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:2816
+#: libpurple/protocols/yahoo/yahoo.c:2923 libpurple/status.c:154
+#: pidgin/gtkdocklet.c:438 pidgin/gtkstatusbox.c:1055
 msgid "Available"
 msgstr "Verf端gbar"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
-#: ../libpurple/protocols/oscar/oscar.c:2675
-#: ../libpurple/protocols/oscar/oscar.c:3713
+#: libpurple/protocols/gg/gg.c:1038 libpurple/protocols/gg/gg.c:1112
+#: libpurple/protocols/oscar/oscar.c:2671
+#: libpurple/protocols/oscar/oscar.c:3708
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
-#: ../libpurple/protocols/jabber/buddy.c:1623
-#: ../libpurple/protocols/jabber/buddy.c:1799
-#: ../libpurple/protocols/oscar/oscar.c:3724
-#: ../libpurple/protocols/silc/ops.c:990
-#: ../libpurple/protocols/silc10/ops.c:1024
+#: libpurple/protocols/gg/gg.c:1041 libpurple/protocols/gg/gg.c:1115
+#: libpurple/protocols/jabber/buddy.c:1623
+#: libpurple/protocols/jabber/buddy.c:1799
+#: libpurple/protocols/oscar/oscar.c:3719 libpurple/protocols/silc/ops.c:990
+#: libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Vorname"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
+#: libpurple/protocols/gg/gg.c:1054 libpurple/protocols/gg/gg.c:1124
 msgid "Birth Year"
 msgstr "Geburtsjahr"
 
-#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
-#: ../libpurple/protocols/oscar/oscar.c:3925
+#: libpurple/protocols/gg/gg.c:1106 libpurple/protocols/gg/gg.c:1175
+#: libpurple/protocols/oscar/oscar.c:3920
 msgid "Unable to display the search results."
 msgstr "Kann Suchergebnisse nicht anzeigen."
 
-#: ../libpurple/protocols/gg/gg.c:1166
+#: libpurple/protocols/gg/gg.c:1166
 msgid "Gadu-Gadu Public Directory"
 msgstr "�ffentliches Gadu-Gadu-Verzeichnis"
 
-#: ../libpurple/protocols/gg/gg.c:1167
+#: libpurple/protocols/gg/gg.c:1167
 msgid "Search results"
 msgstr "Suchergebnisse"
 
-#: ../libpurple/protocols/gg/gg.c:1210
+#: libpurple/protocols/gg/gg.c:1210
 msgid "No matching users found"
 msgstr "Keine entsprechenden Benutzer gefunden"
 
-#: ../libpurple/protocols/gg/gg.c:1211
+#: libpurple/protocols/gg/gg.c:1211
 msgid "There are no users matching your search criteria."
 msgstr "Es gibt keine Benutzer, die Ihrer Anfrage entsprechen."
 
-#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
+#: libpurple/protocols/gg/gg.c:1305 libpurple/protocols/gg/gg.c:1458
 msgid "Unable to read socket"
 msgstr "Socket kann nicht gelesen werden"
 
-#: ../libpurple/protocols/gg/gg.c:1390
+#: libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list downloaded"
 msgstr "Buddy-Liste heruntergeladen"
 
-#: ../libpurple/protocols/gg/gg.c:1391
+#: libpurple/protocols/gg/gg.c:1391
 msgid "Your buddy list was downloaded from the server."
 msgstr "Ihre Buddy-Liste wurde von Server geladen."
 
-#: ../libpurple/protocols/gg/gg.c:1398
+#: libpurple/protocols/gg/gg.c:1398
 msgid "Buddy list uploaded"
 msgstr "Buddy-Liste hochgeladen"
 
-#: ../libpurple/protocols/gg/gg.c:1399
+#: libpurple/protocols/gg/gg.c:1399
 msgid "Your buddy list was stored on the server."
 msgstr "Ihre Buddy-Liste wurde auf dem Server gespeichert."
 
-#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
+#: libpurple/protocols/gg/gg.c:1504 libpurple/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "Verbindung fehlgeschlagen."
 
-#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
+#: libpurple/protocols/gg/gg.c:1616 libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "Blockiert"
 
-#: ../libpurple/protocols/gg/gg.c:1639
+#: libpurple/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "Zum Chat hinzuf端gen"
 
-#: ../libpurple/protocols/gg/gg.c:1648
+#: libpurple/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "Sperrung aufheben"
 
-#: ../libpurple/protocols/gg/gg.c:1652
+#: libpurple/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Sperren"
 
-#: ../libpurple/protocols/gg/gg.c:1669
+#: libpurple/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "Chat_name:"
 
-#: ../libpurple/protocols/gg/gg.c:1909
+#: libpurple/protocols/gg/gg.c:1909
 msgid "Chat error"
 msgstr "Chatfehler"
 
-#: ../libpurple/protocols/gg/gg.c:1910
+#: libpurple/protocols/gg/gg.c:1910
 msgid "This chat name is already in use"
 msgstr "Dieser Chatname existiert bereits"
 
-#: ../libpurple/protocols/gg/gg.c:1993
+#: libpurple/protocols/gg/gg.c:1993
 msgid "Not connected to the server."
 msgstr "Nicht mit dem Server verbunden."
 
-#: ../libpurple/protocols/gg/gg.c:2016
+#: libpurple/protocols/gg/gg.c:2016
 msgid "Find buddies..."
 msgstr "Finde Buddys..."
 
-#: ../libpurple/protocols/gg/gg.c:2022
+#: libpurple/protocols/gg/gg.c:2022
 msgid "Change password..."
 msgstr "Passwort 辰ndern..."
 
-#: ../libpurple/protocols/gg/gg.c:2028
+#: libpurple/protocols/gg/gg.c:2028
 msgid "Upload buddylist to Server"
 msgstr "Buddy-Liste zum Server hochladen"
 
-#: ../libpurple/protocols/gg/gg.c:2032
+#: libpurple/protocols/gg/gg.c:2032
 msgid "Download buddylist from Server"
 msgstr "Buddy-Liste vom Server herunterladen"
 
-#: ../libpurple/protocols/gg/gg.c:2036
+#: libpurple/protocols/gg/gg.c:2036
 msgid "Delete buddylist from Server"
 msgstr "L旦schen der Buddy-Liste vom Server"
 
-#: ../libpurple/protocols/gg/gg.c:2040
+#: libpurple/protocols/gg/gg.c:2040
 msgid "Save buddylist to file..."
 msgstr "Buddy-Liste in Datei speichern..."
 
-#: ../libpurple/protocols/gg/gg.c:2044
+#: libpurple/protocols/gg/gg.c:2044
 msgid "Load buddylist from file..."
 msgstr "Buddy-Liste aus Datei laden..."
 
@@ -3475,153 +3401,139 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2148
+#: libpurple/protocols/gg/gg.c:2148
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-Protokoll-Plugin"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2149
+#: libpurple/protocols/gg/gg.c:2149
 msgid "Polish popular IM"
 msgstr "Beliebter polnischer IM-Dienst"
 
-#: ../libpurple/protocols/gg/gg.c:2203
+#: libpurple/protocols/gg/gg.c:2203
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-Benutzer"
 
-#: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1637
-#: ../libpurple/protocols/silc10/silc.c:1566
+#: libpurple/protocols/irc/cmds.c:43 libpurple/protocols/silc/silc.c:1637
+#: libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Unbekanntes Kommando: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1345
-#: ../libpurple/protocols/silc10/silc.c:1274
+#: libpurple/protocols/irc/cmds.c:503 libpurple/protocols/jabber/chat.c:591
+#: libpurple/protocols/silc/silc.c:1345 libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "Das aktuelle Thema ist: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1349
-#: ../libpurple/protocols/silc10/silc.c:1278
+#: libpurple/protocols/irc/cmds.c:507 libpurple/protocols/jabber/chat.c:595
+#: libpurple/protocols/silc/silc.c:1349 libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "Kein Thema gesetzt"
 
-#: ../libpurple/protocols/irc/dcc_send.c:296
-#: ../libpurple/protocols/irc/dcc_send.c:337
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+#: libpurple/protocols/irc/dcc_send.c:296
+#: libpurple/protocols/irc/dcc_send.c:337
+#: libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "File Transfer Failed"
 msgstr "Datei端bertragung gescheitert"
 
-#: ../libpurple/protocols/irc/dcc_send.c:297
-#: ../libpurple/protocols/irc/dcc_send.c:338
+#: libpurple/protocols/irc/dcc_send.c:297
+#: libpurple/protocols/irc/dcc_send.c:338
 msgid "Could not open a listening port."
 msgstr "Konnte keinen Listener-Port 旦ffnen."
 
-#: ../libpurple/protocols/irc/irc.c:79
+#: libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Fehler beim Anzeigen des MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:79
+#: libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "Kein MOTD verf端gbar"
 
-#: ../libpurple/protocols/irc/irc.c:80
+#: libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "Es gibt kein MOTD zu dieser Verbindung."
 
-#: ../libpurple/protocols/irc/irc.c:83
+#: libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD f端r %s"
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:614 ../libpurple/protocols/irc/irc.c:639
+#: libpurple/protocols/irc/irc.c:127 libpurple/protocols/irc/irc.c:165
+#: libpurple/protocols/irc/irc.c:614 libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "Serververbindung wurde unterbrochen"
 
-#: ../libpurple/protocols/irc/irc.c:249
+#: libpurple/protocols/irc/irc.c:249
 msgid "View MOTD"
 msgstr "MOTD anzeigen"
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
-#: ../libpurple/protocols/silc10/chat.c:33
+#: libpurple/protocols/irc/irc.c:261 libpurple/protocols/silc/chat.c:33
+#: libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanal:"
 
-#: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
+#: libpurple/protocols/irc/irc.c:267 libpurple/protocols/jabber/chat.c:59
+#: pidgin/gtkaccount.c:526
 msgid "_Password:"
 msgstr "_Passwort:"
 
-#: ../libpurple/protocols/irc/irc.c:298
+#: libpurple/protocols/irc/irc.c:298
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-Nicknamen d端rfen keine Leerzeichen enthalten"
 
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1046
-#: ../libpurple/protocols/msn/session.c:345
-#: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1288
-#: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1671
-#: ../libpurple/protocols/yahoo/yahoo.c:2762
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
+#: libpurple/protocols/irc/irc.c:319 libpurple/protocols/jabber/jabber.c:1046
+#: libpurple/protocols/msn/session.c:345
+#: libpurple/protocols/novell/novell.c:2182
+#: libpurple/protocols/oscar/oscar.c:1288 libpurple/protocols/qq/qq.c:136
+#: libpurple/protocols/sametime/sametime.c:3724
+#: libpurple/protocols/simple/simple.c:1676
+#: libpurple/protocols/yahoo/yahoo.c:2766
+#: libpurple/protocols/zephyr/zephyr.c:1621 pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Verbindungsaufbau"
 
-#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:603
-#: ../libpurple/protocols/jabber/jabber.c:950
+#: libpurple/protocols/irc/irc.c:327 libpurple/protocols/jabber/jabber.c:603
+#: libpurple/protocols/jabber/jabber.c:950
 msgid "SSL support unavailable"
 msgstr "SSL-Unterst端tzung nicht verf端gbar"
 
-#: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1586
+#: libpurple/protocols/irc/irc.c:338 libpurple/protocols/simple/simple.c:464
+#: libpurple/protocols/simple/simple.c:1591
 msgid "Couldn't create socket"
 msgstr "Kann Socket nicht erstellen"
 
-#: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/oscar/oscar.c:1284
+#: libpurple/protocols/irc/irc.c:416 libpurple/protocols/oscar/oscar.c:1284
 msgid "Couldn't connect to host"
 msgstr "Keine Verbindung zum Host"
 
-#: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:499
+#: libpurple/protocols/irc/irc.c:438 libpurple/protocols/jabber/jabber.c:499
 msgid "Connection Failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:502
+#: libpurple/protocols/irc/irc.c:441 libpurple/protocols/jabber/jabber.c:502
 msgid "SSL Handshake Failed"
 msgstr "SSL Handshake gescheitert"
 
-#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
+#: libpurple/protocols/irc/irc.c:611 libpurple/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "Fehler beim Lesen"
 
-#: ../libpurple/protocols/irc/irc.c:775
-#: ../libpurple/protocols/silc/chat.c:1412
-#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1401
+#: libpurple/protocols/irc/irc.c:775 libpurple/protocols/silc/chat.c:1412
+#: libpurple/protocols/silc10/chat.c:1426
+#: libpurple/protocols/yahoo/yahoochat.c:1401
 msgid "Users"
 msgstr "Benutzer"
 
-#: ../libpurple/protocols/irc/irc.c:778
-#: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1415
-#: ../libpurple/protocols/silc/ops.c:1389
-#: ../libpurple/protocols/silc10/chat.c:1429
-#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1410
+#: libpurple/protocols/irc/irc.c:778
+#: libpurple/protocols/sametime/sametime.c:3375
+#: libpurple/protocols/silc/chat.c:1415 libpurple/protocols/silc/ops.c:1389
+#: libpurple/protocols/silc10/chat.c:1429
+#: libpurple/protocols/silc10/ops.c:1382
+#: libpurple/protocols/yahoo/yahoochat.c:1410
 msgid "Topic"
 msgstr "Thema"
 
@@ -3633,65 +3545,53 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:916
+#: libpurple/protocols/irc/irc.c:916
 msgid "IRC Protocol Plugin"
 msgstr "IRC-Protokoll-Plugin"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:917
+#: libpurple/protocols/irc/irc.c:917
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Das IRC-Protokoll-Plugin mit weniger Problemen"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6650
-#: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5727
-#: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1341
-#: ../libpurple/protocols/silc10/ops.c:1244
-#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1850
-#: ../libpurple/protocols/toc/toc.c:2327
+#: libpurple/protocols/irc/irc.c:942 libpurple/protocols/irc/msgs.c:323
+#: libpurple/protocols/msn/msn.c:2154 libpurple/protocols/oscar/oscar.c:6650
+#: libpurple/protocols/qq/qq.c:756
+#: libpurple/protocols/sametime/sametime.c:5728
+#: libpurple/protocols/silc/ops.c:1249 libpurple/protocols/silc/ops.c:1341
+#: libpurple/protocols/silc10/ops.c:1244 libpurple/protocols/silc10/ops.c:1347
+#: libpurple/protocols/simple/simple.c:1855 libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6653
-#: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1918
-#: ../libpurple/protocols/silc10/silc.c:1861
-#: ../libpurple/protocols/toc/toc.c:2331
+#: libpurple/protocols/irc/irc.c:945 libpurple/protocols/msn/msn.c:2159
+#: libpurple/protocols/oscar/oscar.c:6653 libpurple/protocols/qq/qq.c:759
+#: libpurple/protocols/sametime/sametime.c:5733
+#: libpurple/protocols/silc/silc.c:1918 libpurple/protocols/silc10/silc.c:1861
+#: libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:948
+#: libpurple/protocols/irc/irc.c:948
 msgid "Encodings"
 msgstr "Kodierungen"
 
-#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:803
-#: ../libpurple/protocols/silc/buddy.c:1539
-#: ../libpurple/protocols/silc/ops.c:1197
-#: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1334
-#: ../libpurple/protocols/silc/ops.c:1337
-#: ../libpurple/protocols/silc/silc.c:1005
-#: ../libpurple/protocols/silc10/buddy.c:1539
-#: ../libpurple/protocols/silc10/ops.c:1191
-#: ../libpurple/protocols/silc10/ops.c:1194
-#: ../libpurple/protocols/silc10/ops.c:1340
-#: ../libpurple/protocols/silc10/ops.c:1343
-#: ../libpurple/protocols/silc10/silc.c:916
+#: libpurple/protocols/irc/irc.c:951 libpurple/protocols/irc/msgs.c:316
+#: libpurple/protocols/jabber/jabber.c:803
+#: libpurple/protocols/silc/buddy.c:1539 libpurple/protocols/silc/ops.c:1197
+#: libpurple/protocols/silc/ops.c:1200 libpurple/protocols/silc/ops.c:1334
+#: libpurple/protocols/silc/ops.c:1337 libpurple/protocols/silc/silc.c:1005
+#: libpurple/protocols/silc10/buddy.c:1539
+#: libpurple/protocols/silc10/ops.c:1191 libpurple/protocols/silc10/ops.c:1194
+#: libpurple/protocols/silc10/ops.c:1340 libpurple/protocols/silc10/ops.c:1343
+#: libpurple/protocols/silc10/silc.c:916
 msgid "Username"
 msgstr "Benutzer"
 
-#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1009
-#: ../libpurple/protocols/silc10/silc.c:920
+#: libpurple/protocols/irc/irc.c:954 libpurple/protocols/irc/msgs.c:317
+#: libpurple/protocols/silc/silc.c:1009 libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Echter Name"
 
@@ -3699,158 +3599,155 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:962
+#: libpurple/protocols/irc/irc.c:962
 msgid "Use SSL"
 msgstr "Benutze SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:187
+#: libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "Falscher Modus"
 
-#: ../libpurple/protocols/irc/msgs.c:198
+#: libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "Sie sind aus %s verbannt worden."
 
-#: ../libpurple/protocols/irc/msgs.c:199
+#: libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "Verbannt"
 
-#: ../libpurple/protocols/irc/msgs.c:216
+#: libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Kann %s nicht verbannen: Bannliste ist voll"
 
-#: ../libpurple/protocols/irc/msgs.c:301
+#: libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:302
+#: libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifiziert)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3714
-#: ../libpurple/protocols/silc/ops.c:1418
-#: ../libpurple/protocols/silc10/ops.c:1414
+#: libpurple/protocols/irc/msgs.c:303 libpurple/protocols/oscar/oscar.c:3709
+#: libpurple/protocols/silc/ops.c:1418 libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Spitzname"
 
-#: ../libpurple/protocols/irc/msgs.c:329
-#: ../libpurple/protocols/silc/ops.c:1268
-#: ../libpurple/protocols/silc10/ops.c:1272
+#: libpurple/protocols/irc/msgs.c:329 libpurple/protocols/silc/ops.c:1268
+#: libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Im Moment in"
 
-#: ../libpurple/protocols/irc/msgs.c:334
+#: libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "Unt辰tig seit"
 
-#: ../libpurple/protocols/irc/msgs.c:337
+#: libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "Online seit"
 
-#: ../libpurple/protocols/irc/msgs.c:341
+#: libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Definiere ein Adjektiv:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:341
+#: libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "Glorreich"
 
-#: ../libpurple/protocols/irc/msgs.c:420
+#: libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s hat das Thema zu %s abge辰ndert"
 
-#: ../libpurple/protocols/irc/msgs.c:422
+#: libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s hat das Thema entfernt."
 
-#: ../libpurple/protocols/irc/msgs.c:430
+#: libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Das Thema f端r %s ist: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:448
+#: libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Unbekannte Nachricht '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:449
+#: libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Unbekannte Nachricht"
 
-#: ../libpurple/protocols/irc/msgs.c:449
+#: libpurple/protocols/irc/msgs.c:449
 msgid "The IRC server received a message it did not understand."
 msgstr "Der IRC-Server hat eine Nachricht erhalten, die er nicht versteht."
 
-#: ../libpurple/protocols/irc/msgs.c:470
+#: libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Benutzer auf %s: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:575
+#: libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "Zeit-Antwort"
 
-#: ../libpurple/protocols/irc/msgs.c:576
+#: libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "Die Lokalzeit des IRC-Servers ist:"
 
-#: ../libpurple/protocols/irc/msgs.c:587
+#: libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "Dieser Kanal existiert nicht"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:598
+#: libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "Dieser Kanal existiert nicht"
 
-#: ../libpurple/protocols/irc/msgs.c:601
+#: libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "Benutzer ist nicht angemeldet"
 
-#: ../libpurple/protocols/irc/msgs.c:606
+#: libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "Es gibt keinen solchen Spitznamen oder Kanal"
 
-#: ../libpurple/protocols/irc/msgs.c:626
+#: libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "Konnte nicht senden"
 
-#: ../libpurple/protocols/irc/msgs.c:682
+#: libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Das Betreten von %s erfordert eine Einladung."
 
-#: ../libpurple/protocols/irc/msgs.c:683
+#: libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "Nur Einladungen"
 
-#: ../libpurple/protocols/irc/msgs.c:795
+#: libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Sie wurden hinausgeworfen von %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
-#: ../libpurple/protocols/silc10/ops.c:720
+#: libpurple/protocols/irc/msgs.c:800 libpurple/protocols/silc/ops.c:699
+#: libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Hinausgeworfen durch %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:823
+#: libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "Modus (%s %s) von %s"
 
-#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
+#: libpurple/protocols/irc/msgs.c:908 libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "Ung端ltiger Benutzername"
 
-#: ../libpurple/protocols/irc/msgs.c:910
+#: libpurple/protocols/irc/msgs.c:910
 msgid ""
 "Your selected nickname was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3858,7 +3755,7 @@
 "Ihr gew辰hlter Kontoname wurde vom Server abgelehnt.  Er enth辰lt vermutlich "
 "ung端ltige Zeichen."
 
-#: ../libpurple/protocols/irc/msgs.c:915
+#: libpurple/protocols/irc/msgs.c:915
 msgid ""
 "Your selected account name was rejected by the server.  It probably contains "
 "invalid characters."
@@ -3866,53 +3763,52 @@
 "Ihr gew辰hlter Kontoname wurde vom Server abgelehnt.  Er enth辰lt vermutlich "
 "ung端ltige Zeichen."
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "Kann den Spitznamen nicht 辰ndern"
 
-#: ../libpurple/protocols/irc/msgs.c:954
+#: libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "Konnte den Spitznamen nicht 辰ndern"
 
-#: ../libpurple/protocols/irc/msgs.c:975
+#: libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Sie waren im Kanal%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1017
+#: libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "Fehler: falsches PONG vom Server"
 
-#: ../libpurple/protocols/irc/msgs.c:1019
+#: libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING-Antwort -- Verz旦gerung: %lu Sekunden"
 
-#: ../libpurple/protocols/irc/msgs.c:1110
+#: libpurple/protocols/irc/msgs.c:1110
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Kann %s nicht beitreten: Registrierung ist erforderlich."
 
-#: ../libpurple/protocols/irc/msgs.c:1111
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
+#: libpurple/protocols/irc/msgs.c:1111 libpurple/protocols/silc/ops.c:1093
+#: libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Kann den Kanal nicht betreten"
 
-#: ../libpurple/protocols/irc/msgs.c:1145
+#: libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Der Spitzname oder Kanal ist zur Zeit nicht verf端gbar."
 
-#: ../libpurple/protocols/irc/msgs.c:1157
+#: libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "Wallops von %s"
 
-#: ../libpurple/protocols/irc/parse.c:122
+#: libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;Aktion&gt;:  F端hre eine Aktion durch."
 
-#: ../libpurple/protocols/irc/parse.c:123
+#: libpurple/protocols/irc/parse.c:123
 msgid ""
 "away [message]:  Set an away message, or use no message to return from being "
 "away."
@@ -3920,11 +3816,11 @@
 "away [Nachricht]:  Setzen Sie eine Abwesenheitsnachricht. Verwenden Sie "
 "keine Nachricht, um wieder zur端ckzukehren."
 
-#: ../libpurple/protocols/irc/parse.c:124
+#: libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Sendet ein Kommando zum Chanserv"
 
-#: ../libpurple/protocols/irc/parse.c:125
+#: libpurple/protocols/irc/parse.c:125
 msgid ""
 "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
 "someone. You must be a channel operator to do this."
@@ -3932,7 +3828,7 @@
 "deop &lt;Nick1&gt; [Nick2] ...:  Entferne den Kanal-Operator-Status von "
 "jemanden. Sie m端ssen hierf端r selbst Operator des Kanals sein."
 
-#: ../libpurple/protocols/irc/parse.c:126
+#: libpurple/protocols/irc/parse.c:126
 msgid ""
 "devoice &lt;nick1&gt; [nick2] ...:  Remove channel voice status from "
 "someone, preventing them from speaking if the channel is moderated (+m). You "
@@ -3942,7 +3838,7 @@
 "Dies verbietet ihm zu sprechen, wenn der Kanal moderiert wird (+). Sie "
 "m端ssen hierf端r selbst Operator des Kanals sein."
 
-#: ../libpurple/protocols/irc/parse.c:127
+#: libpurple/protocols/irc/parse.c:127
 msgid ""
 "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
 "channel, or the current channel."
@@ -3950,7 +3846,7 @@
 "invite &lt;Nick&gt; [Raum]:  Jemanden in den angegeben Kanal oder in den "
 "aktuellen Kanal einladen."
 
-#: ../libpurple/protocols/irc/parse.c:128
+#: libpurple/protocols/irc/parse.c:128
 msgid ""
 "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3959,7 +3855,7 @@
 "mehrere R辰ume angeben, optional jeden mit einem Kanal-Schl端ssel, falls "
 "dieser ben旦tigt wird."
 
-#: ../libpurple/protocols/irc/parse.c:129
+#: libpurple/protocols/irc/parse.c:129
 msgid ""
 "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
 "channels, optionally providing a channel key for each if needed."
@@ -3968,7 +3864,7 @@
 "oder mehrere R辰ume angeben, optional jeden mit einem Kanal-Schl端ssel, falls "
 "dieser ben旦tigt wird."
 
-#: ../libpurple/protocols/irc/parse.c:130
+#: libpurple/protocols/irc/parse.c:130
 msgid ""
 "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
 "channel operator to do this."
@@ -3976,7 +3872,7 @@
 "kick &lt;Nick&gt; [Nachricht]:  Kickt jemanden aus dem Kanal. Sie m端ssen "
 "hierf端r selbst Operator des Kanals sein."
 
-#: ../libpurple/protocols/irc/parse.c:131
+#: libpurple/protocols/irc/parse.c:131
 msgid ""
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
@@ -3984,15 +3880,15 @@
 "list:  Zeige eine Liste der Chatr辰ume in diesem Netzwerk. <i>Warnung: Einige "
 "Server trennen die Verbindung, wenn Sie dieses Kommando eingeben.</i>"
 
-#: ../libpurple/protocols/irc/parse.c:132
+#: libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;Aktion&gt;:  Eine Aktion durchf端hren."
 
-#: ../libpurple/protocols/irc/parse.c:133
+#: libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Sendet ein Kommando zum Memoserv"
 
-#: ../libpurple/protocols/irc/parse.c:134
+#: libpurple/protocols/irc/parse.c:134
 msgid ""
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
 "or user mode."
@@ -4000,7 +3896,7 @@
 "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;Nick|Kanal&gt;:  Kanal- oder Benutzermodi "
 "setzen oder zur端cknehmen."
 
-#: ../libpurple/protocols/irc/parse.c:135
+#: libpurple/protocols/irc/parse.c:135
 msgid ""
 "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4008,20 +3904,20 @@
 "msg &lt;nick&gt; &lt;nachricht&gt;:  Sendet eine private Nachricht an einen "
 "Benutzer (im Gegensatz zum Kanal)."
 
-#: ../libpurple/protocols/irc/parse.c:136
+#: libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [Kanal]:  Listet die Benutzer im aktuellen Kanal auf."
 
-#: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1813
+#: libpurple/protocols/irc/parse.c:137
+#: libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;new nickname&gt;:  Ihren Spitznamen 辰ndern."
 
-#: ../libpurple/protocols/irc/parse.c:138
+#: libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Sendet ein Kommando zum Nickserv"
 
-#: ../libpurple/protocols/irc/parse.c:139
+#: libpurple/protocols/irc/parse.c:139
 msgid ""
 "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
 "must be a channel operator to do this."
@@ -4029,7 +3925,7 @@
 "op &lt;Nick1&gt; [Nick2] ...:  Erteile den Operator-Status an jemanden. Sie "
 "m端ssen hierf端r selbst Operator des Kanals sein."
 
-#: ../libpurple/protocols/irc/parse.c:140
+#: libpurple/protocols/irc/parse.c:140
 msgid ""
 "operwall &lt;message&gt;:  If you don't know what this is, you probably "
 "can't use it."
@@ -4037,11 +3933,11 @@
 "operwall &lt;Nachricht&gt;:  Wenn Sie nicht wissen, was dies ist, brauchen "
 "Sie es wahrscheinlich nicht."
 
-#: ../libpurple/protocols/irc/parse.c:141
+#: libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Sendet ein Kommandos zum Operserv"
 
-#: ../libpurple/protocols/irc/parse.c:142
+#: libpurple/protocols/irc/parse.c:142
 msgid ""
 "part [room] [message]:  Leave the current channel, or a specified channel, "
 "with an optional message."
@@ -4049,7 +3945,7 @@
 "part [Raum] [Nachricht]:  Verl辰sst den aktuellen Kanal oder den angegebenen "
 "Kanal mit einer optionalen Nachricht."
 
-#: ../libpurple/protocols/irc/parse.c:143
+#: libpurple/protocols/irc/parse.c:143
 msgid ""
 "ping [nick]:  Asks how much lag a user (or the server if no user specified) "
 "has."
@@ -4057,7 +3953,7 @@
 "ping [Nick]:  Ermittelt die Verz旦gerung eines Benutzers (oder eines Server, "
 "wenn kein Benutzer angegeben wird) 端ber ein Ping."
 
-#: ../libpurple/protocols/irc/parse.c:144
+#: libpurple/protocols/irc/parse.c:144
 msgid ""
 "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
 "opposed to a channel)."
@@ -4065,15 +3961,15 @@
 "query &lt;Nick&gt; &lt;Nachricht&gt;:  Sendet eine private Nachricht an "
 "einen Benutzer (im Gegensatz zu einem Kanal)."
 
-#: ../libpurple/protocols/irc/parse.c:145
+#: libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
 msgstr "quit [Nachricht]:  Trennung vom Server mit einer optionalen Nachricht."
 
-#: ../libpurple/protocols/irc/parse.c:146
+#: libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Sendet den Text im Rohformat an den Server."
 
-#: ../libpurple/protocols/irc/parse.c:147
+#: libpurple/protocols/irc/parse.c:147
 msgid ""
 "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
 "channel operator to do this."
@@ -4081,23 +3977,24 @@
 "remove &lt;Nick&gt; [Nachricht]:  Jemanden aus dem Raum entfernen. Sie "
 "m端ssen hierf端r selbst Operator des Kanals sein."
 
-#: ../libpurple/protocols/irc/parse.c:148
+#: libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Zeigt die aktuelle Lokalzeit auf dem IRC-Server an."
 
-#: ../libpurple/protocols/irc/parse.c:149
+#: libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [neues Thema]:  Ansehen oder �ndern des Themas des Kanals."
 
-#: ../libpurple/protocols/irc/parse.c:150
+#: libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
-msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Benutzermodus setzen oder zur端cknehmen."
-
-#: ../libpurple/protocols/irc/parse.c:151
+msgstr ""
+"umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Benutzermodus setzen oder zur端cknehmen."
+
+#: libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
 msgstr "version [Benutzer]: sende CTCP VERSION-Anfrage an einen Benutzer"
 
-#: ../libpurple/protocols/irc/parse.c:152
+#: libpurple/protocols/irc/parse.c:152
 msgid ""
 "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
 "must be a channel operator to do this."
@@ -4106,7 +4003,7 @@
 "erlaubt ihm auch dann noch zu sprechen, wenn der Kanal moderiert wird (+m). "
 "Sie m端ssen hierf端r selbst Operator des Kanals sein."
 
-#: ../libpurple/protocols/irc/parse.c:153
+#: libpurple/protocols/irc/parse.c:153
 msgid ""
 "wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
 "use it."
@@ -4114,48 +4011,47 @@
 "wallops &lt;Nachricht&gt;:  Wenn Sie diese Funktion nicht kennen, brauchen "
 "sie sie wahrscheinlich nicht."
 
-#: ../libpurple/protocols/irc/parse.c:154
+#: libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
 msgstr "whois [Server] &lt;Nick&gt;:  Informationen zu einem Benutzer abrufen."
 
-#: ../libpurple/protocols/irc/parse.c:155
+#: libpurple/protocols/irc/parse.c:155
 msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
-msgstr "whowas &lt;Nick&gt;:  Informationen zu einem abgemeldeten Benutzer abrufen."
-
-#: ../libpurple/protocols/irc/parse.c:465
+msgstr ""
+"whowas &lt;Nick&gt;:  Informationen zu einem abgemeldeten Benutzer abrufen."
+
+#: libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Antwortzeit von %s: %lu Sekunden"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:466
+#: libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "CTCP PING Antwort"
 
-#: ../libpurple/protocols/irc/parse.c:577
-#: ../libpurple/protocols/irc/parse.c:581 ../libpurple/protocols/toc/toc.c:191
-#: ../libpurple/protocols/toc/toc.c:694 ../libpurple/protocols/toc/toc.c:710
-#: ../libpurple/protocols/toc/toc.c:786
+#: libpurple/protocols/irc/parse.c:577 libpurple/protocols/irc/parse.c:581
+#: 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 "Verbindung unterbrochen."
 
-#: ../libpurple/protocols/jabber/auth.c:52
+#: libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr ""
 "Der Server ben旦tigt TLS/SSL zur Anmeldung.  Es wurde kein TLS/SSL-Support "
 "gefunden."
 
-#: ../libpurple/protocols/jabber/auth.c:115
+#: libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Der Server erfordert eine Klartext-Authentifizierung 端ber einen "
 "unverschl端sselten Kanal"
 
-#: ../libpurple/protocols/jabber/auth.c:294
-#: ../libpurple/protocols/jabber/auth.c:483
+#: libpurple/protocols/jabber/auth.c:294 libpurple/protocols/jabber/auth.c:483
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4165,33 +4061,26 @@
 "Verbindung.  Wollen Sie dies erlauben und mit der Authentifikation "
 "fortfahren?"
 
-#: ../libpurple/protocols/jabber/auth.c:296
-#: ../libpurple/protocols/jabber/auth.c:297
-#: ../libpurple/protocols/jabber/auth.c:485
-#: ../libpurple/protocols/jabber/auth.c:486
-#: ../libpurple/protocols/jabber/auth.c:570
-#: ../libpurple/protocols/jabber/auth.c:571
+#: libpurple/protocols/jabber/auth.c:296 libpurple/protocols/jabber/auth.c:297
+#: libpurple/protocols/jabber/auth.c:485 libpurple/protocols/jabber/auth.c:486
+#: libpurple/protocols/jabber/auth.c:570 libpurple/protocols/jabber/auth.c:571
 msgid "Plaintext Authentication"
 msgstr "Klartext-Authentifizierung"
 
-#: ../libpurple/protocols/jabber/auth.c:309
-#: ../libpurple/protocols/jabber/auth.c:498
-#: ../libpurple/protocols/jabber/auth.c:582
+#: libpurple/protocols/jabber/auth.c:309 libpurple/protocols/jabber/auth.c:498
+#: libpurple/protocols/jabber/auth.c:582
 msgid "Server does not use any supported authentication method"
 msgstr "Der Server benutzt keine der unterst端tzten Authentifizierungsmethoden"
 
 #. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:437
-#: ../libpurple/protocols/jabber/auth.c:533
-#: ../libpurple/protocols/jabber/auth.c:748
-#: ../libpurple/protocols/jabber/auth.c:889
-#: ../libpurple/protocols/jabber/auth.c:914
-#: ../libpurple/protocols/jabber/auth.c:933
-#: ../libpurple/protocols/jabber/jabber.c:115
+#: libpurple/protocols/jabber/auth.c:437 libpurple/protocols/jabber/auth.c:533
+#: libpurple/protocols/jabber/auth.c:748 libpurple/protocols/jabber/auth.c:889
+#: libpurple/protocols/jabber/auth.c:914 libpurple/protocols/jabber/auth.c:933
+#: libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Ung端ltige Serverantwort."
 
-#: ../libpurple/protocols/jabber/auth.c:572
+#: libpurple/protocols/jabber/auth.c:572
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4199,125 +4088,118 @@
 "Der Server erfordert eine Klartext-Authentifizierung 端ber einen "
 "unverschl端sselten Kanal.  Wollen Sie dies erlauben und fortfahren?"
 
-#: ../libpurple/protocols/jabber/auth.c:769
-#: ../libpurple/protocols/jabber/auth.c:792
+#: libpurple/protocols/jabber/auth.c:769 libpurple/protocols/jabber/auth.c:792
 msgid "Invalid challenge from server"
 msgstr "Ung端ltige Challenge vom Server"
 
-#: ../libpurple/protocols/jabber/auth.c:864
+#: libpurple/protocols/jabber/auth.c:864
 msgid "SASL error"
 msgstr "SASL-Fehler"
 
-#: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:986
-#: ../libpurple/protocols/silc10/ops.c:1020
+#: libpurple/protocols/jabber/buddy.c:271
+#: libpurple/protocols/jabber/buddy.c:825
+#: libpurple/protocols/sametime/sametime.c:4129
+#: libpurple/protocols/silc/ops.c:986 libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Vollst辰ndiger Name"
 
-#: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:838
-#: ../libpurple/protocols/silc/ops.c:998
-#: ../libpurple/protocols/silc10/ops.c:1032
+#: libpurple/protocols/jabber/buddy.c:272
+#: libpurple/protocols/jabber/buddy.c:838 libpurple/protocols/silc/ops.c:998
+#: libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Nachname"
 
-#: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:842
+#: libpurple/protocols/jabber/buddy.c:273
+#: libpurple/protocols/jabber/buddy.c:842
 msgid "Given Name"
 msgstr "Vorname"
 
-#: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:863
+#: libpurple/protocols/jabber/buddy.c:275
+#: libpurple/protocols/jabber/jabber.c:863
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:894
+#: libpurple/protocols/jabber/buddy.c:276
+#: libpurple/protocols/jabber/buddy.c:894
 msgid "Street Address"
 msgstr "Stra�e"
 
-#: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:890
+#: libpurple/protocols/jabber/buddy.c:277
+#: libpurple/protocols/jabber/buddy.c:890
 msgid "Extended Address"
 msgstr "Erweiterte Adresse"
 
-#: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:898
+#: libpurple/protocols/jabber/buddy.c:278
+#: libpurple/protocols/jabber/buddy.c:898
 msgid "Locality"
 msgstr "Ort"
 
-#: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:902
+#: libpurple/protocols/jabber/buddy.c:279
+#: libpurple/protocols/jabber/buddy.c:902
 msgid "Region"
 msgstr "Region"
 
-#: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:906
+#: libpurple/protocols/jabber/buddy.c:280
+#: libpurple/protocols/jabber/buddy.c:906
 msgid "Postal Code"
 msgstr "Postleitzahl"
 
-#: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/silc/silc.c:1015
-#: ../libpurple/protocols/silc10/silc.c:926
+#: libpurple/protocols/jabber/buddy.c:281
+#: libpurple/protocols/jabber/buddy.c:911 libpurple/protocols/silc/silc.c:1015
+#: libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Land"
 
-#: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:922
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: libpurple/protocols/jabber/buddy.c:282
+#: libpurple/protocols/jabber/buddy.c:922
+#: libpurple/protocols/jabber/buddy.c:929
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:940
-#: ../libpurple/protocols/jabber/buddy.c:948
-#: ../libpurple/protocols/jabber/buddy.c:1629
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:555
-#: ../libpurple/protocols/silc10/ops.c:1075
-#: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
+#: libpurple/protocols/jabber/buddy.c:283
+#: libpurple/protocols/jabber/buddy.c:940
+#: libpurple/protocols/jabber/buddy.c:948
+#: libpurple/protocols/jabber/buddy.c:1629 libpurple/protocols/silc/ops.c:1041
+#: libpurple/protocols/silc/util.c:555 libpurple/protocols/silc10/ops.c:1075
+#: libpurple/protocols/silc10/util.c:551
+#: libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "E-Mail"
 msgstr "E-Mail"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:963
+#: libpurple/protocols/jabber/buddy.c:284
+#: libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
 msgstr "Name der Organisation"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:967
+#: libpurple/protocols/jabber/buddy.c:285
+#: libpurple/protocols/jabber/buddy.c:967
 msgid "Organization Unit"
 msgstr "Organisationseinheit"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:976
+#: libpurple/protocols/jabber/buddy.c:287
+#: libpurple/protocols/jabber/buddy.c:976
 msgid "Role"
 msgstr "Funktion"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3763
+#: libpurple/protocols/jabber/buddy.c:288
+#: libpurple/protocols/jabber/buddy.c:859 libpurple/protocols/msn/msn.c:1627
+#: libpurple/protocols/oscar/oscar.c:3758
 msgid "Birthday"
 msgstr "Geburtstag"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:979
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081
-#: ../pidgin/gtkprefs.c:738
+#: libpurple/protocols/jabber/buddy.c:289
+#: libpurple/protocols/jabber/buddy.c:979
+#: libpurple/protocols/jabber/chat.c:775 pidgin/gtkblist.c:3090
+#: pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Beschreibung"
 
-#: ../libpurple/protocols/jabber/buddy.c:582
-#: ../libpurple/protocols/jabber/buddy.c:583
+#: libpurple/protocols/jabber/buddy.c:582
+#: libpurple/protocols/jabber/buddy.c:583
 msgid "Edit XMPP vCard"
 msgstr "XMPP-vCard bearbeiten"
 
-#: ../libpurple/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."
@@ -4325,116 +4207,115 @@
 "Die folgenden Punkte sind optional. Geben Sie nur die Informationen an, die "
 "Sie angeben m旦chten."
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: libpurple/protocols/jabber/buddy.c:655
+#: libpurple/protocols/jabber/buddy.c:696
 msgid "Client"
 msgstr "Client"
 
-#: ../libpurple/protocols/jabber/buddy.c:659
-#: ../libpurple/protocols/jabber/buddy.c:700
+#: libpurple/protocols/jabber/buddy.c:659
+#: libpurple/protocols/jabber/buddy.c:700
 msgid "Operating System"
 msgstr "Betriebssystem"
 
-#: ../libpurple/protocols/jabber/buddy.c:669
-#: ../libpurple/protocols/jabber/libxmpp.c:202
-#: ../libpurple/protocols/jabber/si.c:853
+#: libpurple/protocols/jabber/buddy.c:669
+#: libpurple/protocols/jabber/libxmpp.c:202
+#: libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr "Ressource"
 
-#: ../libpurple/protocols/jabber/buddy.c:671
-#: ../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:1283
+#: libpurple/protocols/jabber/buddy.c:671
+#: 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:1283
 msgid "Priority"
 msgstr "Priorit辰t"
 
-#: ../libpurple/protocols/jabber/buddy.c:846
-#: ../libpurple/protocols/silc/ops.c:994
-#: ../libpurple/protocols/silc10/ops.c:1028
+#: libpurple/protocols/jabber/buddy.c:846 libpurple/protocols/silc/ops.c:994
+#: libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Zweiter Name"
 
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3802
-#: ../libpurple/protocols/oscar/oscar.c:3815
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1030
-#: ../libpurple/protocols/silc10/ops.c:1064
+#: libpurple/protocols/jabber/buddy.c:879
+#: libpurple/protocols/jabber/jabber.c:838
+#: libpurple/protocols/oscar/oscar.c:3797
+#: libpurple/protocols/oscar/oscar.c:3810
+#: libpurple/protocols/qq/buddy_info.c:56 libpurple/protocols/silc/ops.c:1030
+#: libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Adresse"
 
-#: ../libpurple/protocols/jabber/buddy.c:886
+#: libpurple/protocols/jabber/buddy.c:886
 msgid "P.O. Box"
 msgstr "Postfach"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: libpurple/protocols/jabber/buddy.c:1000
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1000
+#: libpurple/protocols/jabber/buddy.c:1000
 msgid "Logo"
 msgstr "Logo"
 
-#: ../libpurple/protocols/jabber/buddy.c:1409
+#: libpurple/protocols/jabber/buddy.c:1409
 msgid "Un-hide From"
 msgstr "Sichtbar von"
 
-#: ../libpurple/protocols/jabber/buddy.c:1413
+#: libpurple/protocols/jabber/buddy.c:1413
 msgid "Temporarily Hide From"
 msgstr "Tempor辰r versteckt von"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1421
+#: libpurple/protocols/jabber/buddy.c:1421
 msgid "Cancel Presence Notification"
 msgstr "Abbrechen der Anwesenheitsbenachrichtigung"
 
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: libpurple/protocols/jabber/buddy.c:1428
 msgid "(Re-)Request authorization"
 msgstr "(Nochmal) nach Autorisierung fragen"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1437
+#: libpurple/protocols/jabber/buddy.c:1437
 msgid "Unsubscribe"
 msgstr "Abbestellen"
 
-#: ../libpurple/protocols/jabber/buddy.c:1470
-#: ../libpurple/protocols/jabber/jabber.c:1252
+#: libpurple/protocols/jabber/buddy.c:1470
+#: libpurple/protocols/jabber/jabber.c:1252
 msgid "Chatty"
 msgstr "Gespr辰chig"
 
-#: ../libpurple/protocols/jabber/buddy.c:1474
+#: libpurple/protocols/jabber/buddy.c:1474
 msgid "Extended Away"
 msgstr "Abwesend (erweitert)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1476
-#: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5787
-#: ../libpurple/protocols/sametime/sametime.c:3297
+#: libpurple/protocols/jabber/buddy.c:1476
+#: libpurple/protocols/jabber/jabber.c:1282
+#: libpurple/protocols/oscar/oscar.c:727
+#: libpurple/protocols/oscar/oscar.c:5787
+#: libpurple/protocols/sametime/sametime.c:3298
+#, c-format
 msgid "Do Not Disturb"
 msgstr "Nicht st旦ren"
 
-#: ../libpurple/protocols/jabber/buddy.c:1621
+#: libpurple/protocols/jabber/buddy.c:1621
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1625
-#: ../libpurple/protocols/jabber/buddy.c:1804
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: libpurple/protocols/jabber/buddy.c:1625
+#: libpurple/protocols/jabber/buddy.c:1804
+#: libpurple/protocols/oscar/oscar.c:3720
 msgid "Last Name"
 msgstr "Nachname"
 
-#: ../libpurple/protocols/jabber/buddy.c:1657
+#: libpurple/protocols/jabber/buddy.c:1657
 msgid "The following are the results of your search"
 msgstr "Dies sind die Ergebnisse Ihrer Suche"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1732
+#: libpurple/protocols/jabber/buddy.c:1732
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4442,179 +4323,170 @@
 "Suchen Sie einen Kontakt durch Eingabe von Suchkriterien in den angegebenen "
 "Feldern. Hinweis: Jedes Feld unterst端tzt die Suche mit Platzhaltern (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1752
+#: libpurple/protocols/jabber/buddy.c:1752
 msgid "Directory Query Failed"
 msgstr "Verzeichnisanfrage gescheitert"
 
-#: ../libpurple/protocols/jabber/buddy.c:1753
+#: libpurple/protocols/jabber/buddy.c:1753
 msgid "Could not query the directory server."
 msgstr "Konnte die Anfrage beim Verzeichnisdienst nicht durchf端hren."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: libpurple/protocols/jabber/buddy.c:1787
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Anleitung vom Server: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1794
+#: libpurple/protocols/jabber/buddy.c:1794
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "F端llen sie ein oder mehrere Felder aus, um nach entsprechenden XMPP-"
 "Benutzern zu suchen."
 
-#: ../libpurple/protocols/jabber/buddy.c:1814
-#: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3728
-#: ../libpurple/protocols/oscar/oscar.c:3737
+#: libpurple/protocols/jabber/buddy.c:1814
+#: libpurple/protocols/novell/novell.c:1488
+#: libpurple/protocols/oscar/oscar.c:3723
+#: libpurple/protocols/oscar/oscar.c:3732
 msgid "E-Mail Address"
 msgstr "E-Mail-Adresse"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: libpurple/protocols/jabber/buddy.c:1823
+#: libpurple/protocols/jabber/buddy.c:1824
 msgid "Search for XMPP users"
 msgstr "Suche nach XMPP-Benutzern"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1825
-#: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:176
-#: ../libpurple/protocols/qq/sys_msg.c:253
-#: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5611
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
+#: libpurple/protocols/jabber/buddy.c:1825 libpurple/protocols/qq/group.c:123
+#: libpurple/protocols/qq/group_im.c:147 libpurple/protocols/qq/sys_msg.c:176
+#: libpurple/protocols/qq/sys_msg.c:253 libpurple/protocols/qq/sys_msg.c:271
+#: libpurple/protocols/sametime/sametime.c:5612
+#: pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Suchen"
 
-#: ../libpurple/protocols/jabber/buddy.c:1840
+#: libpurple/protocols/jabber/buddy.c:1840
 msgid "Invalid Directory"
 msgstr "Ung端ltiges Verzeichnis"
 
-#: ../libpurple/protocols/jabber/buddy.c:1857
+#: libpurple/protocols/jabber/buddy.c:1857
 msgid "Enter a User Directory"
 msgstr "Geben Sie ein Benutzerverzeichnis ein"
 
-#: ../libpurple/protocols/jabber/buddy.c:1858
+#: libpurple/protocols/jabber/buddy.c:1858
 msgid "Select a user directory to search"
 msgstr "W辰hlen Sie ein Benutzerverzeichnis zum Suchen"
 
-#: ../libpurple/protocols/jabber/buddy.c:1861
+#: libpurple/protocols/jabber/buddy.c:1861
 msgid "Search Directory"
 msgstr "Suche im Verzeichnis"
 
-#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5273
-#: ../libpurple/protocols/yahoo/yahoochat.c:962
+#: libpurple/protocols/jabber/chat.c:41 libpurple/protocols/oscar/oscar.c:5273
+#: libpurple/protocols/yahoo/yahoochat.c:962
 msgid "_Room:"
 msgstr "_Raum:"
 
-#: ../libpurple/protocols/jabber/chat.c:47
+#: libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../libpurple/protocols/jabber/chat.c:53
+#: libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_K端rzel:"
 
-#: ../libpurple/protocols/jabber/chat.c:223
+#: libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s ist kein g端ltiger Raumname"
 
-#: ../libpurple/protocols/jabber/chat.c:224
+#: libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Ung端ltiger Raumname"
 
-#: ../libpurple/protocols/jabber/chat.c:229
+#: libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s ist kein g端ltiger Servername"
 
-#: ../libpurple/protocols/jabber/chat.c:230
-#: ../libpurple/protocols/jabber/chat.c:231
+#: libpurple/protocols/jabber/chat.c:230 libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Ung端ltiger Servername"
 
-#: ../libpurple/protocols/jabber/chat.c:235
+#: libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s ist kein g端ltiger Raumbezeichner"
 
-#: ../libpurple/protocols/jabber/chat.c:236
-#: ../libpurple/protocols/jabber/chat.c:237
+#: libpurple/protocols/jabber/chat.c:236 libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Ung端ltiger Raumbezeichner"
 
-#: ../libpurple/protocols/jabber/chat.c:396
+#: libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Konfigurationsfehler"
 
-#: ../libpurple/protocols/jabber/chat.c:405
-#: ../libpurple/protocols/jabber/chat.c:548
+#: libpurple/protocols/jabber/chat.c:405 libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Kann nicht konfigurieren"
 
-#: ../libpurple/protocols/jabber/chat.c:420
+#: libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Raum-Konfigurationsfehler"
 
-#: ../libpurple/protocols/jabber/chat.c:421
+#: libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Dieser Raum kann nicht konfiguriert werden"
 
-#: ../libpurple/protocols/jabber/chat.c:470
-#: ../libpurple/protocols/jabber/chat.c:539
+#: libpurple/protocols/jabber/chat.c:470 libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Registrierungsfehler"
 
-#: ../libpurple/protocols/jabber/chat.c:627
+#: libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
-msgstr "Die �nderung des Nick-Namens wird in nicht-MUC Chatr辰umen nicht unterst端tzt"
-
-#: ../libpurple/protocols/jabber/chat.c:678
-#: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1456
-#: ../libpurple/protocols/silc10/ops.c:1451
+msgstr ""
+"Die �nderung des Nick-Namens wird in nicht-MUC Chatr辰umen nicht unterst端tzt"
+
+#: libpurple/protocols/jabber/chat.c:678 libpurple/protocols/jabber/chat.c:689
+#: libpurple/protocols/silc/ops.c:1456 libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Fehler beim Empfangen der Raumliste"
 
-#: ../libpurple/protocols/jabber/chat.c:737
+#: libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Ung端ltiger Server"
 
-#: ../libpurple/protocols/jabber/chat.c:781
+#: libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "Geben Sie einen Konferenzserver ein"
 
-#: ../libpurple/protocols/jabber/chat.c:782
+#: libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "W辰hlen Sie einen Konferenz-Server zur Abfrage"
 
-#: ../libpurple/protocols/jabber/chat.c:785
+#: libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "Finde R辰ume"
 
-#: ../libpurple/protocols/jabber/jabber.c:84
+#: libpurple/protocols/jabber/jabber.c:84
 msgid "Error initializing session"
 msgstr "Fehler bei Initialisieren der Sitzung"
 
-#: ../libpurple/protocols/jabber/jabber.c:247
-#: ../libpurple/protocols/jabber/jabber.c:300
-#: ../libpurple/protocols/jabber/jabber.c:328
+#: libpurple/protocols/jabber/jabber.c:247
+#: libpurple/protocols/jabber/jabber.c:300
+#: libpurple/protocols/jabber/jabber.c:328
 msgid "Write error"
 msgstr "Schreibfehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:396
-#: ../libpurple/protocols/jabber/jabber.c:433
+#: libpurple/protocols/jabber/jabber.c:396
+#: libpurple/protocols/jabber/jabber.c:433
 msgid "Read Error"
 msgstr "Fehler beim Lesen"
 
-#: ../libpurple/protocols/jabber/jabber.c:467
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#: ../libpurple/protocols/yahoo/yahoo.c:2381
-#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#: libpurple/protocols/jabber/jabber.c:467
+#: libpurple/protocols/oscar/flap_connection.c:394
+#: libpurple/protocols/yahoo/yahoo.c:2385
+#: libpurple/protocols/yahoo/yahoo.c:2417
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -4623,436 +4495,430 @@
 "Die Verbindung mit dem Server konnte nicht hergestellt werden:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:523
+#: libpurple/protocols/jabber/jabber.c:523
 msgid "Unable to create socket"
 msgstr "Kann Socket nicht erstellen"
 
-#: ../libpurple/protocols/jabber/jabber.c:568
-#: ../libpurple/protocols/jabber/jabber.c:918
+#: libpurple/protocols/jabber/jabber.c:568
+#: libpurple/protocols/jabber/jabber.c:918
 msgid "Invalid XMPP ID"
 msgstr "Ung端ltige XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:573
+#: libpurple/protocols/jabber/jabber.c:573
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Falsche XMPP-ID. Die Domain muss gesetzt werden."
 
-#: ../libpurple/protocols/jabber/jabber.c:644
+#: libpurple/protocols/jabber/jabber.c:644
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrierung von %s@%s erfolgreich"
 
-#: ../libpurple/protocols/jabber/jabber.c:646
-#: ../libpurple/protocols/jabber/jabber.c:647
+#: libpurple/protocols/jabber/jabber.c:646
+#: libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Successful"
 msgstr "Registrierung erfolgreich"
 
-#: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: libpurple/protocols/jabber/jabber.c:653
+#: libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "Unbekannter Fehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:655
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: libpurple/protocols/jabber/jabber.c:655
+#: libpurple/protocols/jabber/jabber.c:656
 msgid "Registration Failed"
 msgstr "Registrierung fehlgeschlagen"
 
-#: ../libpurple/protocols/jabber/jabber.c:771
-#: ../libpurple/protocols/jabber/jabber.c:772
+#: libpurple/protocols/jabber/jabber.c:771
+#: libpurple/protocols/jabber/jabber.c:772
 msgid "Already Registered"
 msgstr "Schon registriert"
 
-#: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3804
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: libpurple/protocols/jabber/jabber.c:848
+#: libpurple/protocols/oscar/oscar.c:3799
+#: libpurple/protocols/oscar/oscar.c:3812
 msgid "State"
 msgstr "Provinz/Bundesland"
 
-#: ../libpurple/protocols/jabber/jabber.c:853
+#: libpurple/protocols/jabber/jabber.c:853
 msgid "Postal code"
 msgstr "Postleitzahl"
 
-#: ../libpurple/protocols/jabber/jabber.c:858
-#: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:772
-#: ../libpurple/protocols/silc/util.c:557
-#: ../libpurple/protocols/silc10/ops.c:1069
-#: ../libpurple/protocols/silc10/silc.c:683
-#: ../libpurple/protocols/silc10/util.c:553
+#: libpurple/protocols/jabber/jabber.c:858 libpurple/protocols/silc/ops.c:1035
+#: libpurple/protocols/silc/silc.c:772 libpurple/protocols/silc/util.c:557
+#: libpurple/protocols/silc10/ops.c:1069 libpurple/protocols/silc10/silc.c:683
+#: libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:868
+#: libpurple/protocols/jabber/jabber.c:868
 msgid "Date"
 msgstr "Datum"
 
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: libpurple/protocols/jabber/jabber.c:876
 msgid "Please fill out the information below to register your new account."
 msgstr ""
 "Bitte f端llen Sie die unten stehenden Informationen aus, um ein neues Konto "
 "zu registrieren."
 
-#: ../libpurple/protocols/jabber/jabber.c:879
-#: ../libpurple/protocols/jabber/jabber.c:880
+#: libpurple/protocols/jabber/jabber.c:879
+#: libpurple/protocols/jabber/jabber.c:880
 msgid "Register New XMPP Account"
 msgstr "Registrierung eines neuen XMPP-Kontos"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1518
+#: libpurple/protocols/jabber/jabber.c:881 pidgin/gtkaccount.c:1518
 msgid "Register"
 msgstr "Registrieren"
 
-#: ../libpurple/protocols/jabber/jabber.c:1050
+#: libpurple/protocols/jabber/jabber.c:1050
 msgid "Initializing Stream"
 msgstr "Initialisiere den Stream"
 
-#: ../libpurple/protocols/jabber/jabber.c:1055
-#: ../libpurple/protocols/msn/session.c:351
+#: libpurple/protocols/jabber/jabber.c:1055
+#: libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Authentifizierung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1064
+#: libpurple/protocols/jabber/jabber.c:1064
 msgid "Re-initializing Stream"
 msgstr "Initialisiere Stream nochmal"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1502
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5581
+#: libpurple/protocols/jabber/jabber.c:1126
+#: libpurple/protocols/jabber/jabber.c:1502
+#: libpurple/protocols/jabber/jabber.c:1543
+#: libpurple/protocols/jabber/jabber.c:1579
+#: libpurple/protocols/oscar/oscar.c:826
+#: libpurple/protocols/oscar/oscar.c:5581
 msgid "Not Authorized"
 msgstr "Nicht autorisiert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1168
+#: libpurple/protocols/jabber/jabber.c:1168
 msgid "Both"
 msgstr "Beide"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: libpurple/protocols/jabber/jabber.c:1170
 msgid "From (To pending)"
 msgstr "Von (zu den offenen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1172
+#: libpurple/protocols/jabber/jabber.c:1172
 msgid "From"
 msgstr "Von"
 
-#: ../libpurple/protocols/jabber/jabber.c:1175
+#: libpurple/protocols/jabber/jabber.c:1175
 msgid "To"
 msgstr "Zu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1177
+#: libpurple/protocols/jabber/jabber.c:1177
 msgid "None (To pending)"
 msgstr "Kein (zu den offenen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
+#: libpurple/protocols/jabber/jabber.c:1179
+#: pidgin/plugins/gevolution/eds-utils.c:73
+#: pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Kein"
 
-#: ../libpurple/protocols/jabber/jabber.c:1182
+#: libpurple/protocols/jabber/jabber.c:1182
 msgid "Subscription"
 msgstr "Abonnement"
 
-#: ../libpurple/protocols/jabber/jabber.c:1312
+#: libpurple/protocols/jabber/jabber.c:1312
 msgid "Password Changed"
 msgstr "Passwort ge辰ndert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1313
+#: libpurple/protocols/jabber/jabber.c:1313
 msgid "Your password has been changed."
 msgstr "Ihr Passwort wurde ge辰ndert."
 
-#: ../libpurple/protocols/jabber/jabber.c:1317
-#: ../libpurple/protocols/jabber/jabber.c:1318
+#: libpurple/protocols/jabber/jabber.c:1317
+#: libpurple/protocols/jabber/jabber.c:1318
 msgid "Error changing password"
 msgstr "Fehler beim �ndern des Passworts"
 
-#: ../libpurple/protocols/jabber/jabber.c:1375
+#: libpurple/protocols/jabber/jabber.c:1375
 msgid "Password (again)"
 msgstr "Passwort (nochmal)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1381
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: libpurple/protocols/jabber/jabber.c:1381
+#: libpurple/protocols/jabber/jabber.c:1382
 msgid "Change XMPP Password"
 msgstr "XMPP-Passwort 辰ndern"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "Bitte geben Sie Ihr neues Passwort ein"
 
-#: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6367
-#: ../libpurple/protocols/silc/silc.c:1093
-#: ../libpurple/protocols/silc10/silc.c:1004
+#: libpurple/protocols/jabber/jabber.c:1394
+#: libpurple/protocols/oscar/oscar.c:6367 libpurple/protocols/silc/silc.c:1093
+#: libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Benutzer-Info setzen..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6378
-#: ../libpurple/protocols/silc/silc.c:1089
-#: ../libpurple/protocols/silc10/silc.c:1000
+#: libpurple/protocols/jabber/jabber.c:1399
+#: libpurple/protocols/oscar/oscar.c:6378 libpurple/protocols/silc/silc.c:1089
+#: libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Passwort 辰ndern..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1404
+#: libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "Suche nach Benutzern..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1482
+#: libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr "Falsche Anfrage"
 
-#: ../libpurple/protocols/jabber/jabber.c:1484
+#: libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1486
+#: libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
 msgstr "Feature nicht implementiert"
 
-#: ../libpurple/protocols/jabber/jabber.c:1488
+#: libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "Verboten"
 
-#: ../libpurple/protocols/jabber/jabber.c:1490
+#: libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "Gegangen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1492
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: libpurple/protocols/jabber/jabber.c:1492
+#: libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "Interner Server-Fehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:1494
+#: libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "Eintrag nicht gefunden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1496
+#: libpurple/protocols/jabber/jabber.c:1496
 msgid "Malformed XMPP ID"
 msgstr "Falsche XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1498
+#: libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "Nicht akzeptabel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "Nicht erlaubt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "Bezahlung erforderlich"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "Empf辰nger nicht verf端gbar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "Registrierung erforderlich"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "Remote-Server nicht gefunden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1514
+#: libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "Zeit端berschreitung beim Remote-Server"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "Server 端berlastet"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "Dienst nicht erreichbar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "Abonnement erforderlich"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "Unerwartete Anfrage"
 
-#: ../libpurple/protocols/jabber/jabber.c:1529
+#: libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "Autorisierung abgebrochen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1531
+#: libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "Falsche Kodierung in der Autorisierung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
+#: libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "Ung端ltige authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "Falscher Autorisierungsmechanismus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "Autorisierungsmechanismus zu schwach"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
+#: libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "Tempor辰rer Authentifizierungsfehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:1548
+#: libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "Authentifizierungsfehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "Schlechtes Format"
 
-#: ../libpurple/protocols/jabber/jabber.c:1556
+#: libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "Falsches Namensraum-Pr辰fix"
 
-#: ../libpurple/protocols/jabber/jabber.c:1559
+#: libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "Ressourcenkonflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/silc/silc.c:244
-#: ../libpurple/protocols/silc10/ops.c:1720
+#: libpurple/protocols/jabber/jabber.c:1561
+#: libpurple/protocols/silc/silc.c:244 libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Verbindungsabbruch wegen Zeit端berschreitung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1563
+#: libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "Server hat sich verabschiedet"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "Rechner unbekannt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr "Falsche Adressierung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr "Ung端ltige ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1573
+#: libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
 msgstr "Ung端ltiger Namenraum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "Ung端ltiges XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1577
+#: libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "Nicht-passender Rechner"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "Richtlinien-Verletzung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "Entfernte Verbindung fehlgeschlagen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1585
+#: libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "Eingeschr辰nkte Ressourcen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "Eingeschr辰nktes XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "Siehe anderer Rechner"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "Herunterfahren des Systems"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "Undefinierte Bedingung"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "Kodierung wird nicht unterst端tzt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr "Nicht-unterst端tzter Blocktyp"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "Nicht-unterst端tzte Version"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "XML ist nicht ��wohlgeformt��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "Stream-Fehler"
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
+#: libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Kann den Benutzer %s nicht verbannen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1690
+#: libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Unbekannte Zugeh旦rigkeit: ��%s��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1695
+#: libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Kann den Benutzer %s nicht zu ��%s�� zuordnen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1714
+#: libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Unbekannte Rolle: ��%s��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1721
+#: libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Kann die Rolle ��%s�� f端r den Benutzer nicht setzen: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1774
+#: libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Kann den Benutzer %s nicht herauswerfen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1805
+#: libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config:  Konfiguriere einen Chatraum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1809
+#: libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure:  Konfiguriere einen Chatraum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1818
+#: libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [Raum]:  Verlasse den Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1823
+#: libpurple/protocols/jabber/jabber.c:1823
 msgid "register:  Register with a chat room."
 msgstr "register:  F端r einen Chatraum anmelden."
 
-#: ../libpurple/protocols/jabber/jabber.c:1829
+#: libpurple/protocols/jabber/jabber.c:1829
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [neues Thema]:  Thema 辰ndern oder anzeigen."
 
-#: ../libpurple/protocols/jabber/jabber.c:1835
+#: libpurple/protocols/jabber/jabber.c:1835
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;Benutzer&gt; [Raum]:  Verbanne einen Benutzer aus dem Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: libpurple/protocols/jabber/jabber.c:1841
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -5060,7 +4926,7 @@
 "affiliate &lt;Benutzer&gt; &lt;owner|admin|member|outcast|none&gt;: Setze "
 "eine Benutzerzugeh旦rigkeit f端r den Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -5068,20 +4934,22 @@
 "role &lt;Benutzer&gt; &lt;moderator|participant|visitor|none&gt;: Setze eine "
 "Rolle f端r den Benutzer im Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: libpurple/protocols/jabber/jabber.c:1853
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;Benutzer&gt; [Nachricht]:  Lade einen Benutzer in den Raum ein."
-
-#: ../libpurple/protocols/jabber/jabber.c:1859
+msgstr ""
+"invite &lt;Benutzer&gt; [Nachricht]:  Lade einen Benutzer in den Raum ein."
+
+#: libpurple/protocols/jabber/jabber.c:1859
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;Raum&gt; [Server]:  Betrete einen Chat auf diesem Server."
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: libpurple/protocols/jabber/jabber.c:1865
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;Benutzer&gt; [Raum]:  Kickt einen Benutzer aus dem Raum."
 
-#: ../libpurple/protocols/jabber/jabber.c:1870
-msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+#: libpurple/protocols/jabber/jabber.c:1870
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msg &lt;Benutzer&gt; &lt;Nachricht&gt;:  Sendet eine private Nachricht an "
 "einen anderen Benutzer."
@@ -5096,84 +4964,84 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:169
-#: ../libpurple/protocols/jabber/libxmpp.c:171
+#: libpurple/protocols/jabber/libxmpp.c:169
+#: libpurple/protocols/jabber/libxmpp.c:171
 msgid "XMPP Protocol Plugin"
 msgstr "XMPP-Protokoll-Plugin"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
+#: libpurple/protocols/jabber/libxmpp.c:198 pidgin/gtkaccount.c:508
 msgid "Domain"
 msgstr "Domain"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: libpurple/protocols/jabber/libxmpp.c:206
 msgid "Force old (port 5223) SSL"
 msgstr "Erzwinge altes SSL (Port 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
+#: libpurple/protocols/jabber/libxmpp.c:211
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Erlaube Klartext-Authentifikation 端ber einen unverschl端sselten Kanal"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:216
-#: ../libpurple/protocols/simple/simple.c:1856
+#: libpurple/protocols/jabber/libxmpp.c:216
+#: libpurple/protocols/simple/simple.c:1861
 msgid "Connect port"
 msgstr "Verbindungsport"
 
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:220
-#: ../libpurple/protocols/silc/silc.c:1914
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
+#: libpurple/protocols/jabber/libxmpp.c:220
+#: libpurple/protocols/silc/silc.c:1914 libpurple/protocols/silc10/silc.c:1857
+#: pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Verbindungsserver"
 
-#: ../libpurple/protocols/jabber/message.c:102
+#: libpurple/protocols/jabber/message.c:102
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s hat das Gespr辰ch verlassen."
 
-#: ../libpurple/protocols/jabber/message.c:153
+#: libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr "Nachricht von %s"
 
-#: ../libpurple/protocols/jabber/message.c:217
+#: libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s hat das Thema zu %s abge辰ndert"
 
-#: ../libpurple/protocols/jabber/message.c:219
+#: libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "Das Thema ist: %s"
 
-#: ../libpurple/protocols/jabber/message.c:267
+#: libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Nachrichtenzustellung an %s fehlgeschlagen: %s"
 
-#: ../libpurple/protocols/jabber/message.c:270
+#: libpurple/protocols/jabber/message.c:270
 msgid "XMPP Message Error"
 msgstr "XMPP-Nachrichtenfehler"
 
-#: ../libpurple/protocols/jabber/message.c:359
+#: libpurple/protocols/jabber/message.c:359
 #, c-format
 msgid " (Code %s)"
 msgstr " (Code %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:193
+#: libpurple/protocols/jabber/parser.c:193
 msgid "XML Parse error"
 msgstr "Fehler bei Einlesen von XML-Daten"
 
-#: ../libpurple/protocols/jabber/presence.c:290
+#: libpurple/protocols/jabber/presence.c:290
 msgid "Unknown Error in presence"
 msgstr "Unbekannter Fehlercode"
 
-#: ../libpurple/protocols/jabber/presence.c:364
-#: ../libpurple/protocols/jabber/presence.c:365
+#: libpurple/protocols/jabber/presence.c:364
+#: libpurple/protocols/jabber/presence.c:365
 msgid "Create New Room"
 msgstr "Einen neuen Chat-Raum erstellen"
 
-#: ../libpurple/protocols/jabber/presence.c:366
+#: libpurple/protocols/jabber/presence.c:366
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5181,67 +5049,68 @@
 "Sie erstellen einen neuen Chat-Raum.  M旦chten Sie den Raum konfigurieren "
 "oder akzeptieren Sie die Standardeinstellungen?"
 
-#: ../libpurple/protocols/jabber/presence.c:372
+#: libpurple/protocols/jabber/presence.c:372
 msgid "_Configure Room"
 msgstr "Raum _konfigurieren"
 
-#: ../libpurple/protocols/jabber/presence.c:373
+#: libpurple/protocols/jabber/presence.c:373
 msgid "_Accept Defaults"
 msgstr "Standards _akzeptieren"
 
-#: ../libpurple/protocols/jabber/presence.c:409
+#: libpurple/protocols/jabber/presence.c:415
 #, c-format
 msgid "Error in chat %s"
 msgstr "Fehler im Chat %s"
 
-#: ../libpurple/protocols/jabber/presence.c:412
+#: libpurple/protocols/jabber/presence.c:418
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Fehler beim Betreten des Chats %s"
 
-#: ../libpurple/protocols/jabber/si.c:769
+#: libpurple/protocols/jabber/si.c:769
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr ""
 "Kann die Datei nicht an %s senden, da der Client des Benutzers keine "
 "Datei端bertragung unterst端tzt"
 
-#: ../libpurple/protocols/jabber/si.c:770
-#: ../libpurple/protocols/jabber/si.c:771
-#: ../libpurple/protocols/jabber/si.c:839
+#: libpurple/protocols/jabber/si.c:770 libpurple/protocols/jabber/si.c:771
+#: libpurple/protocols/jabber/si.c:839
 msgid "File Send Failed"
 msgstr "Senden der Datei gescheitert"
 
-#: ../libpurple/protocols/jabber/si.c:832
+#: libpurple/protocols/jabber/si.c:832
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Kann die Nachricht an %s nicht senden, ung端ltige JID"
 
-#: ../libpurple/protocols/jabber/si.c:834
+#: libpurple/protocols/jabber/si.c:834
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Kann die Datei nicht an %s senden, Benutzer ist nicht online"
 
-#: ../libpurple/protocols/jabber/si.c:836
+#: libpurple/protocols/jabber/si.c:836
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
-msgstr "Kann die Datei nicht an %s senden, Anwesenheit des Benutzers nicht abonniert"
-
-#: ../libpurple/protocols/jabber/si.c:851
+msgstr ""
+"Kann die Datei nicht an %s senden, Anwesenheit des Benutzers nicht abonniert"
+
+#: libpurple/protocols/jabber/si.c:851
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
-msgstr "Bitte w辰hlen Sie, welcher Ressource von %s Sie eine Datei schicken m旦chten"
-
-#: ../libpurple/protocols/jabber/si.c:867
+msgstr ""
+"Bitte w辰hlen Sie, welcher Ressource von %s Sie eine Datei schicken m旦chten"
+
+#: libpurple/protocols/jabber/si.c:867
 msgid "Select a Resource"
 msgstr "W辰hlen Sie eine Ressource"
 
-#: ../libpurple/protocols/msn/dialog.c:110
+#: libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Fehler bei der Buddy-Listen-Synchronisation bei %s (%s)"
 
-#: ../libpurple/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. "
@@ -5250,7 +5119,7 @@
 "%s auf der lokalen Liste ist in der Gruppe ��%s��, aber nicht auf der "
 "Serverliste. M旦chten Sie, dass der Buddy hinzugef端gt wird?"
 
-#: ../libpurple/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 "
@@ -5259,269 +5128,318 @@
 "%s ist auf der lokalen Liste, aber nicht auf der Serverliste. M旦chten Sie, "
 "dass der Buddy hinzugef端gt wird?"
 
-#: ../libpurple/protocols/msn/error.c:36
+#: libpurple/protocols/msn/error.c:36
+#, c-format
 msgid "Unable to parse message"
 msgstr "Kann die Nachricht nicht parsen"
 
-#: ../libpurple/protocols/msn/error.c:41
+#: libpurple/protocols/msn/error.c:41
+#, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaxfehler (wahrscheinlich ein Client-Bug)"
 
-#: ../libpurple/protocols/msn/error.c:46
+#: libpurple/protocols/msn/error.c:46
+#, c-format
 msgid "Invalid e-mail address"
 msgstr "Ung端ltige E-Mail-Adresse"
 
-#: ../libpurple/protocols/msn/error.c:49
+#: libpurple/protocols/msn/error.c:49
+#, c-format
 msgid "User does not exist"
 msgstr "Benutzer existiert nicht"
 
-#: ../libpurple/protocols/msn/error.c:53
+#: libpurple/protocols/msn/error.c:53
+#, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Der Fully Qualified Domain Name fehlt"
 
-#: ../libpurple/protocols/msn/error.c:56
+#: libpurple/protocols/msn/error.c:56
+#, c-format
 msgid "Already logged in"
 msgstr "Schon angemeldet"
 
-#: ../libpurple/protocols/msn/error.c:59
+#: libpurple/protocols/msn/error.c:59
+#, c-format
 msgid "Invalid screen name"
 msgstr "Ung端ltiger Benutzername"
 
-#: ../libpurple/protocols/msn/error.c:62
+#: libpurple/protocols/msn/error.c:62
+#, c-format
 msgid "Invalid friendly name"
 msgstr "Ung端ltiger Freundesname"
 
-#: ../libpurple/protocols/msn/error.c:65
+#: libpurple/protocols/msn/error.c:65
+#, c-format
 msgid "List full"
 msgstr "Liste voll"
 
-#: ../libpurple/protocols/msn/error.c:68
+#: libpurple/protocols/msn/error.c:68
+#, c-format
 msgid "Already there"
 msgstr "Schon da"
 
-#: ../libpurple/protocols/msn/error.c:72
+#: libpurple/protocols/msn/error.c:72
+#, c-format
 msgid "Not on list"
 msgstr "Nicht auf der Liste"
 
-#: ../libpurple/protocols/msn/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:756
+#: libpurple/protocols/msn/error.c:75 libpurple/protocols/zephyr/zephyr.c:756
+#, c-format
 msgid "User is offline"
 msgstr "Benutzer ist offline"
 
-#: ../libpurple/protocols/msn/error.c:78
+#: libpurple/protocols/msn/error.c:78
+#, c-format
 msgid "Already in the mode"
 msgstr "Bereits in diesem Modus"
 
-#: ../libpurple/protocols/msn/error.c:82
+#: libpurple/protocols/msn/error.c:82
+#, c-format
 msgid "Already in opposite list"
 msgstr "Bereits in der ��Gegenteil-Liste��"
 
-#: ../libpurple/protocols/msn/error.c:86
+#: libpurple/protocols/msn/error.c:86
+#, c-format
 msgid "Too many groups"
 msgstr "Zu viele Gruppen"
 
-#: ../libpurple/protocols/msn/error.c:89
+#: libpurple/protocols/msn/error.c:89
+#, c-format
 msgid "Invalid group"
 msgstr "Ung端ltige Gruppe"
 
-#: ../libpurple/protocols/msn/error.c:92
+#: libpurple/protocols/msn/error.c:92
+#, c-format
 msgid "User not in group"
 msgstr "Benutzer ist nicht in der Gruppe"
 
-#: ../libpurple/protocols/msn/error.c:95
+#: libpurple/protocols/msn/error.c:95
+#, c-format
 msgid "Group name too long"
 msgstr "Name der Gruppe ist zu lang"
 
-#: ../libpurple/protocols/msn/error.c:98
+#: libpurple/protocols/msn/error.c:98
+#, c-format
 msgid "Cannot remove group zero"
 msgstr "Kann die Gruppe ��Null�� nicht entfernen"
 
-#: ../libpurple/protocols/msn/error.c:103
+#: libpurple/protocols/msn/error.c:103
+#, c-format
 msgid "Tried to add a user to a group that doesn't exist"
-msgstr "Versuchte einen Benutzer zu einer nichtexistierenden Gruppe hinzuzuf端gen"
-
-#: ../libpurple/protocols/msn/error.c:107
+msgstr ""
+"Versuchte einen Benutzer zu einer nichtexistierenden Gruppe hinzuzuf端gen"
+
+#: libpurple/protocols/msn/error.c:107
+#, c-format
 msgid "Switchboard failed"
 msgstr "Vermittlung gescheitert"
 
-#: ../libpurple/protocols/msn/error.c:111
+#: libpurple/protocols/msn/error.c:111
+#, c-format
 msgid "Notify transfer failed"
 msgstr "�bertragung der Benachrichtigung gescheitert"
 
-#: ../libpurple/protocols/msn/error.c:116
+#: libpurple/protocols/msn/error.c:116
+#, c-format
 msgid "Required fields missing"
 msgstr "Notwendige Felder fehlen"
 
-#: ../libpurple/protocols/msn/error.c:120
+#: libpurple/protocols/msn/error.c:120
+#, c-format
 msgid "Too many hits to a FND"
 msgstr "Zu viele Treffer zu einem FND"
 
-#: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:119
+#: libpurple/protocols/msn/error.c:124 libpurple/protocols/oscar/oscar.c:119
+#, c-format
 msgid "Not logged in"
 msgstr "Nicht angemeldet"
 
-#: ../libpurple/protocols/msn/error.c:128
+#: libpurple/protocols/msn/error.c:128
+#, c-format
 msgid "Service temporarily unavailable"
 msgstr "Dienst momentan nicht verf端gbar"
 
-#: ../libpurple/protocols/msn/error.c:131
+#: libpurple/protocols/msn/error.c:131
+#, c-format
 msgid "Database server error"
 msgstr "Fehler des Datenbank-Servers"
 
-#: ../libpurple/protocols/msn/error.c:135
+#: libpurple/protocols/msn/error.c:135
+#, c-format
 msgid "Command disabled"
 msgstr "Kommando abgeschaltet"
 
-#: ../libpurple/protocols/msn/error.c:139
+#: libpurple/protocols/msn/error.c:139
+#, c-format
 msgid "File operation error"
 msgstr "Dateiverarbeitungsfehler"
 
-#: ../libpurple/protocols/msn/error.c:143
+#: libpurple/protocols/msn/error.c:143
+#, c-format
 msgid "Memory allocation error"
 msgstr "Fehler bei der Speicheranforderung"
 
-#: ../libpurple/protocols/msn/error.c:147
+#: libpurple/protocols/msn/error.c:147
+#, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Falscher CHL-Wert zum Server gesendet"
 
-#: ../libpurple/protocols/msn/error.c:152
+#: libpurple/protocols/msn/error.c:152
+#, c-format
 msgid "Server busy"
 msgstr "Server besch辰ftigt"
 
-#: ../libpurple/protocols/msn/error.c:155
-#: ../libpurple/protocols/msn/error.c:170
-#: ../libpurple/protocols/msn/error.c:230
+#: libpurple/protocols/msn/error.c:155 libpurple/protocols/msn/error.c:170
+#: libpurple/protocols/msn/error.c:230
+#, c-format
 msgid "Server unavailable"
 msgstr "Server unerreichbar"
 
-#: ../libpurple/protocols/msn/error.c:158
+#: libpurple/protocols/msn/error.c:158
+#, c-format
 msgid "Peer notification server down"
 msgstr "Peer-Benachrichtigungsserver nicht erreichbar"
 
-#: ../libpurple/protocols/msn/error.c:162
+#: libpurple/protocols/msn/error.c:162
+#, c-format
 msgid "Database connect error"
 msgstr "Datenbank-Verbindungsfehler"
 
-#: ../libpurple/protocols/msn/error.c:167
+#: libpurple/protocols/msn/error.c:167
+#, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Server f辰hrt runter (melden Sie sich ab)"
 
-#: ../libpurple/protocols/msn/error.c:174
+#: libpurple/protocols/msn/error.c:174
+#, c-format
 msgid "Error creating connection"
 msgstr "Fehler beim Herstellen der Verbindung"
 
-#: ../libpurple/protocols/msn/error.c:179
+#: libpurple/protocols/msn/error.c:179
+#, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-Parameter sind entweder unbekannt oder nicht erlaubt"
 
-#: ../libpurple/protocols/msn/error.c:183
+#: libpurple/protocols/msn/error.c:183
+#, c-format
 msgid "Unable to write"
 msgstr "Schreiben nicht m旦glich"
 
-#: ../libpurple/protocols/msn/error.c:186
+#: libpurple/protocols/msn/error.c:186
+#, c-format
 msgid "Session overload"
 msgstr "Sitzung 端berlastet"
 
-#: ../libpurple/protocols/msn/error.c:190
+#: libpurple/protocols/msn/error.c:190
+#, c-format
 msgid "User is too active"
 msgstr "Benutzer ist zu aktiv"
 
-#: ../libpurple/protocols/msn/error.c:193
+#: libpurple/protocols/msn/error.c:193
+#, c-format
 msgid "Too many sessions"
 msgstr "Zu viele Sitzungen"
 
-#: ../libpurple/protocols/msn/error.c:196
+#: libpurple/protocols/msn/error.c:196
+#, c-format
 msgid "Passport not verified"
 msgstr "Passport (MSN Benutzerausweis) wurde nicht 端berpr端ft"
 
-#: ../libpurple/protocols/msn/error.c:199
+#: libpurple/protocols/msn/error.c:199
+#, c-format
 msgid "Bad friend file"
 msgstr "Falsche Friends-Datei"
 
-#: ../libpurple/protocols/msn/error.c:203
+#: libpurple/protocols/msn/error.c:203
+#, c-format
 msgid "Not expected"
 msgstr "Nicht erwartet"
 
-#: ../libpurple/protocols/msn/error.c:209
+#: libpurple/protocols/msn/error.c:209
+#, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Benutzernamen werden zu oft ge辰ndert"
 
-#: ../libpurple/protocols/msn/error.c:218
+#: libpurple/protocols/msn/error.c:218
+#, c-format
 msgid "Server too busy"
 msgstr "Server ist zu besch辰ftigt"
 
-#: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1381
-#: ../libpurple/protocols/silc/silc.c:233
-#: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
+#: libpurple/protocols/msn/error.c:222 libpurple/protocols/oscar/oscar.c:1381
+#: libpurple/protocols/silc/silc.c:233 libpurple/protocols/silc10/ops.c:1709
+#: libpurple/protocols/toc/toc.c:728 libpurple/proxy.c:1363
+#, c-format
 msgid "Authentication failed"
 msgstr "Authentifizierung fehlgeschlagen"
 
-#: ../libpurple/protocols/msn/error.c:225
+#: libpurple/protocols/msn/error.c:225
+#, c-format
 msgid "Not allowed when offline"
 msgstr "Nicht erlaubt im Offline-Modus"
 
-#: ../libpurple/protocols/msn/error.c:233
+#: libpurple/protocols/msn/error.c:233
+#, c-format
 msgid "Not accepting new users"
 msgstr "Akzeptiert keine neuen Benutzer"
 
-#: ../libpurple/protocols/msn/error.c:237
+#: libpurple/protocols/msn/error.c:237
+#, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kinder-Passwort ohne die Zustimmung der Eltern"
 
-#: ../libpurple/protocols/msn/error.c:241
+#: libpurple/protocols/msn/error.c:241
+#, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport-Konto wurde noch nicht 端berpr端ft"
 
-#: ../libpurple/protocols/msn/error.c:244
+#: libpurple/protocols/msn/error.c:244
+#, c-format
 msgid "Bad ticket"
 msgstr "Falsches Ticket"
 
-#: ../libpurple/protocols/msn/error.c:249
+#: libpurple/protocols/msn/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Unbekannter Fehlercode %d"
 
-#: ../libpurple/protocols/msn/error.c:263
+#: libpurple/protocols/msn/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN-Fehler: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:121
+#: libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
 msgstr "Sie haben gerade angeklopft!"
 
-#: ../libpurple/protocols/msn/msn.c:146
+#: libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
 msgstr "Ihr neuer MSN-Benutzername zu lang."
 
-#: ../libpurple/protocols/msn/msn.c:254
+#: libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr "Setze Ihren Spitznamen."
 
-#: ../libpurple/protocols/msn/msn.c:255
+#: libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Das ist der Name, den andere MSN-Buddys von Ihren sehen."
 
-#: ../libpurple/protocols/msn/msn.c:273
+#: libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr "Setze Ihre private Telefonnummer."
 
-#: ../libpurple/protocols/msn/msn.c:290
+#: libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr "Setze Ihre gesch辰ftliche Telefonnummer."
 
-#: ../libpurple/protocols/msn/msn.c:307
+#: libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
 msgstr "Setze Ihre Handynummer."
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr "Erlaube die SMS-Seiten von MSN?"
 
-#: ../libpurple/protocols/msn/msn.c:323
+#: libpurple/protocols/msn/msn.c:323
 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?"
@@ -5529,321 +5447,305 @@
 "M旦chten Sie anderen Leuten in Ihrer Buddy-Liste erlauben oder verbieten, "
 "Ihnen Nachrichten an Ihre Handy oder an andere mobile Ger辰te zu senden?"
 
-#: ../libpurple/protocols/msn/msn.c:329
+#: libpurple/protocols/msn/msn.c:329
 msgid "Allow"
 msgstr "Erlauben"
 
-#: ../libpurple/protocols/msn/msn.c:330
+#: libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr "Verbieten"
 
-#: ../libpurple/protocols/msn/msn.c:346
+#: libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
 msgstr "Dieses Hotmail-Konto ist vielleicht nicht aktiv."
 
-#: ../libpurple/protocols/msn/msn.c:372
+#: libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
 msgstr "Eine SMS senden."
 
-#: ../libpurple/protocols/msn/msn.c:374
+#: libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "Nachricht"
 
-#: ../libpurple/protocols/msn/msn.c:521
+#: libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr "Hat Sie"
 
-#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:2895
-#: ../libpurple/protocols/yahoo/yahoo.c:3504
+#: libpurple/protocols/msn/msn.c:551 libpurple/protocols/msn/state.c:33
+#: libpurple/protocols/yahoo/yahoo.c:2899
+#: libpurple/protocols/yahoo/yahoo.c:3508
 msgid "Be Right Back"
 msgstr "Bin gleich zur端ck"
 
-#: ../libpurple/protocols/msn/msn.c:555 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2822
-#: ../libpurple/protocols/novell/novell.c:2952
-#: ../libpurple/protocols/silc/buddy.c:1480
-#: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1480
-#: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:2897
-#: ../libpurple/protocols/yahoo/yahoo.c:3507
+#: libpurple/protocols/msn/msn.c:555 libpurple/protocols/msn/state.c:31
+#: libpurple/protocols/novell/novell.c:2822
+#: libpurple/protocols/novell/novell.c:2952
+#: libpurple/protocols/silc/buddy.c:1480 libpurple/protocols/silc/silc.c:56
+#: libpurple/protocols/silc10/buddy.c:1480
+#: libpurple/protocols/silc10/silc.c:47 libpurple/protocols/yahoo/yahoo.c:2901
+#: libpurple/protocols/yahoo/yahoo.c:3511
 msgid "Busy"
 msgstr "Besch辰ftigt"
 
-#: ../libpurple/protocols/msn/msn.c:559
-#: ../libpurple/protocols/yahoo/yahoo.c:2905
-#: ../libpurple/protocols/yahoo/yahoo.c:3519
+#: libpurple/protocols/msn/msn.c:559 libpurple/protocols/yahoo/yahoo.c:2909
+#: libpurple/protocols/yahoo/yahoo.c:3523
 msgid "On the Phone"
 msgstr "Am Telefon"
 
-#: ../libpurple/protocols/msn/msn.c:563
-#: ../libpurple/protocols/yahoo/yahoo.c:2909
-#: ../libpurple/protocols/yahoo/yahoo.c:3525
+#: libpurple/protocols/msn/msn.c:563 libpurple/protocols/yahoo/yahoo.c:2913
+#: libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Out to Lunch"
 msgstr "Zur Mittagspause"
 
-#: ../libpurple/protocols/msn/msn.c:591
+#: libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
 msgstr "Setze Spitzname..."
 
-#: ../libpurple/protocols/msn/msn.c:596
+#: libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr "Setze private Telefonnummer..."
 
-#: ../libpurple/protocols/msn/msn.c:600
+#: libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr "Setze gesch辰ftliche Telefonnummer..."
 
-#: ../libpurple/protocols/msn/msn.c:604
+#: libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
 msgstr "Setze Handynummer..."
 
-#: ../libpurple/protocols/msn/msn.c:610
+#: libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Erlaube/verbiete mobile Ger辰te..."
 
-#: ../libpurple/protocols/msn/msn.c:615
+#: libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Erlaube/verbiete mobile Webseiten..."
 
-#: ../libpurple/protocols/msn/msn.c:626
+#: libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr "�ffne Hotmail-Posteingang"
 
-#: ../libpurple/protocols/msn/msn.c:650
+#: libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
 msgstr "Sende an mobiles Ger辰t"
 
-#: ../libpurple/protocols/msn/msn.c:660
-#: ../libpurple/protocols/novell/novell.c:3408
+#: libpurple/protocols/msn/msn.c:660 libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Initiiere _Chat"
 
-#: ../libpurple/protocols/msn/msn.c:698
+#: libpurple/protocols/msn/msn.c:698
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr ""
 "F端r MSN wird SSL-Unterst端tzung ben旦tigt. Bitte installieren Sie eine "
 "unterst端tzte SSL-Bibliothek."
 
-#: ../libpurple/protocols/msn/msn.c:723
+#: libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr "Verbindung zum Server nicht m旦glich."
 
-#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
+#: libpurple/protocols/msn/msn.c:1479 libpurple/protocols/msn/msn.c:1827
+#: libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Fehler beim Empfangen des Profils"
 
-#: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:366
+#: libpurple/protocols/msn/msn.c:1550 pidgin/plugins/convcolors.c:309
+#: pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Allgemein"
 
-#: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3769
-#: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:219
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
+#: libpurple/protocols/msn/msn.c:1557 libpurple/protocols/oscar/oscar.c:3764
+#: libpurple/protocols/qq/buddy_info.c:45 libpurple/protocols/qq/qq.c:219
+#: libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Alter"
 
-#: ../libpurple/protocols/msn/msn.c:1559
-#: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
+#: libpurple/protocols/msn/msn.c:1559 libpurple/protocols/qq/buddy_info.c:51
+#: libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Beruf"
 
-#: ../libpurple/protocols/msn/msn.c:1560
-#: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
-#: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1215
+#: libpurple/protocols/msn/msn.c:1560 libpurple/protocols/novell/novell.c:1478
+#: libpurple/protocols/yahoo/yahoo_profile.c:1076
+#: libpurple/protocols/zephyr/zephyr.c:798
+#: libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Ort"
 
-#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
-#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
+#: libpurple/protocols/msn/msn.c:1565 libpurple/protocols/msn/msn.c:1757
+#: libpurple/protocols/msn/msn.c:1763 libpurple/protocols/msn/msn.c:1770
 msgid "Hobbies and Interests"
 msgstr "Hobbys und Interessen"
 
-#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
-#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
-#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
+#: libpurple/protocols/msn/msn.c:1571 libpurple/protocols/msn/msn.c:1691
+#: libpurple/protocols/msn/msn.c:1697 libpurple/protocols/msn/msn.c:1704
+#: libpurple/protocols/msn/msn.c:1712 libpurple/protocols/msn/msn.c:1719
 msgid "A Little About Me"
 msgstr "Einige Informationen 端ber mich"
 
-#: ../libpurple/protocols/msn/msn.c:1588
+#: libpurple/protocols/msn/msn.c:1588
 msgid "Social"
 msgstr "Sozial"
 
-#: ../libpurple/protocols/msn/msn.c:1590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
+#: libpurple/protocols/msn/msn.c:1590
+#: libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Familienstatus"
 
-#: ../libpurple/protocols/msn/msn.c:1591
+#: libpurple/protocols/msn/msn.c:1591
 msgid "Interests"
 msgstr "Interessen"
 
-#: ../libpurple/protocols/msn/msn.c:1592
+#: libpurple/protocols/msn/msn.c:1592
 msgid "Pets"
 msgstr "Haustiere"
 
-#: ../libpurple/protocols/msn/msn.c:1593
+#: libpurple/protocols/msn/msn.c:1593
 msgid "Hometown"
 msgstr "Heimatstadt"
 
-#: ../libpurple/protocols/msn/msn.c:1594
+#: libpurple/protocols/msn/msn.c:1594
 msgid "Places Lived"
 msgstr "Bisherige Wohnorte"
 
-#: ../libpurple/protocols/msn/msn.c:1595
+#: libpurple/protocols/msn/msn.c:1595
 msgid "Fashion"
 msgstr "Mode"
 
-#: ../libpurple/protocols/msn/msn.c:1596
+#: libpurple/protocols/msn/msn.c:1596
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1597
+#: libpurple/protocols/msn/msn.c:1597
 msgid "Music"
 msgstr "Musik"
 
-#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
-#: ../libpurple/protocols/msn/msn.c:1785
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
+#: libpurple/protocols/msn/msn.c:1598 libpurple/protocols/msn/msn.c:1779
+#: libpurple/protocols/msn/msn.c:1785
+#: libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Lieblingsspruch"
 
-#: ../libpurple/protocols/msn/msn.c:1615
+#: libpurple/protocols/msn/msn.c:1615
 msgid "Contact Info"
 msgstr "Kontakt-Info"
 
-#: ../libpurple/protocols/msn/msn.c:1616
+#: libpurple/protocols/msn/msn.c:1616
 msgid "Personal"
 msgstr "Privat"
 
-#: ../libpurple/protocols/msn/msn.c:1619
+#: libpurple/protocols/msn/msn.c:1619
 msgid "Significant Other"
 msgstr "Andere wichtige Dinge"
 
-#: ../libpurple/protocols/msn/msn.c:1620
+#: libpurple/protocols/msn/msn.c:1620
 msgid "Home Phone"
 msgstr "Telefon (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1621
+#: libpurple/protocols/msn/msn.c:1621
 msgid "Home Phone 2"
 msgstr "Telefon 2 (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3807
+#: libpurple/protocols/msn/msn.c:1622 libpurple/protocols/oscar/oscar.c:3802
 msgid "Home Address"
 msgstr "Privatadresse"
 
-#: ../libpurple/protocols/msn/msn.c:1623
+#: libpurple/protocols/msn/msn.c:1623
 msgid "Personal Mobile"
 msgstr "Handy (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1624
+#: libpurple/protocols/msn/msn.c:1624
 msgid "Home Fax"
 msgstr "Fax (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1625
+#: libpurple/protocols/msn/msn.c:1625
 msgid "Personal E-Mail"
 msgstr "E-Mail (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1626
+#: libpurple/protocols/msn/msn.c:1626
 msgid "Personal IM"
 msgstr "IM (privat)"
 
-#: ../libpurple/protocols/msn/msn.c:1628
+#: libpurple/protocols/msn/msn.c:1628
 msgid "Anniversary"
 msgstr "Jahrestag"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1644
+#: libpurple/protocols/msn/msn.c:1644
 msgid "Work"
 msgstr "Gesch辰ftlich"
 
-#: ../libpurple/protocols/msn/msn.c:1646
-#: ../libpurple/protocols/silc/ops.c:1010
-#: ../libpurple/protocols/silc10/ops.c:1044
+#: libpurple/protocols/msn/msn.c:1646 libpurple/protocols/silc/ops.c:1010
+#: libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Beruf"
 
-#: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3828
+#: libpurple/protocols/msn/msn.c:1647 libpurple/protocols/oscar/oscar.c:3823
 msgid "Company"
 msgstr "Firma"
 
-#: ../libpurple/protocols/msn/msn.c:1648
-#: ../libpurple/protocols/novell/novell.c:1480
+#: libpurple/protocols/msn/msn.c:1648 libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Abteilung"
 
-#: ../libpurple/protocols/msn/msn.c:1649
+#: libpurple/protocols/msn/msn.c:1649
 msgid "Profession"
 msgstr "Beruf"
 
-#: ../libpurple/protocols/msn/msn.c:1650
+#: libpurple/protocols/msn/msn.c:1650
 msgid "Work Phone"
 msgstr "Telefon (gesch辰ftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1651
+#: libpurple/protocols/msn/msn.c:1651
 msgid "Work Phone 2"
 msgstr "Telefon 2 (gesch辰ftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3820
+#: libpurple/protocols/msn/msn.c:1652 libpurple/protocols/oscar/oscar.c:3815
 msgid "Work Address"
 msgstr "Adresse (gesch辰ftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1653
+#: libpurple/protocols/msn/msn.c:1653
 msgid "Work Mobile"
 msgstr "Handy (gesch辰ftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1654
+#: libpurple/protocols/msn/msn.c:1654
 msgid "Work Pager"
 msgstr "Pager (gesch辰ftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1655
+#: libpurple/protocols/msn/msn.c:1655
 msgid "Work Fax"
 msgstr "Fax (gesch辰ftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1656
+#: libpurple/protocols/msn/msn.c:1656
 msgid "Work E-Mail"
 msgstr "E-Mail (gesch辰ftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1657
+#: libpurple/protocols/msn/msn.c:1657
 msgid "Work IM"
 msgstr "IM (gesch辰ftlich)"
 
-#: ../libpurple/protocols/msn/msn.c:1658
+#: libpurple/protocols/msn/msn.c:1658
 msgid "Start Date"
 msgstr "Anfangsdatum"
 
-#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
-#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
+#: libpurple/protocols/msn/msn.c:1728 libpurple/protocols/msn/msn.c:1734
+#: libpurple/protocols/msn/msn.c:1741 libpurple/protocols/msn/msn.c:1748
 msgid "Favorite Things"
 msgstr "Lieblingsdinge"
 
-#: ../libpurple/protocols/msn/msn.c:1793
+#: libpurple/protocols/msn/msn.c:1793
 msgid "Last Updated"
 msgstr "Zuletzt aktualisiert"
 
-#: ../libpurple/protocols/msn/msn.c:1804
-#: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1026
-#: ../libpurple/protocols/silc10/ops.c:1060
+#: libpurple/protocols/msn/msn.c:1804 libpurple/protocols/qq/buddy_info.c:60
+#: libpurple/protocols/silc/ops.c:1026 libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Homepage"
 
-#: ../libpurple/protocols/msn/msn.c:1828
+#: libpurple/protocols/msn/msn.c:1828
 msgid "The user has not created a public profile."
 msgstr "Der Benutzer hat kein 旦ffentliches Profil erstellt."
 
-#: ../libpurple/protocols/msn/msn.c:1829
+#: libpurple/protocols/msn/msn.c:1829
 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 "
@@ -5853,7 +5755,7 @@
 "der Benutzer nicht existiert oder dass der Benutzer zwar existiert, aber "
 "kein 旦ffentliches Profil angelegt hat."
 
-#: ../libpurple/protocols/msn/msn.c:1833
+#: libpurple/protocols/msn/msn.c:1833
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -5861,8 +5763,8 @@
 "Konnte keinerlei Information im Profil des Benutzers finden. Der Benutzer "
 "existiert wahrscheinlich nicht."
 
-#: ../libpurple/protocols/msn/msn.c:1841
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
+#: libpurple/protocols/msn/msn.c:1841
+#: libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL des Profils"
 
@@ -5876,96 +5778,93 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
+#: libpurple/protocols/msn/msn.c:2127 libpurple/protocols/msn/msn.c:2129
 msgid "MSN Protocol Plugin"
 msgstr "MSN-Protokoll-Plugin"
 
-#: ../libpurple/protocols/msn/msn.c:2163
+#: libpurple/protocols/msn/msn.c:2163
 msgid "Use HTTP Method"
 msgstr "Benutze HTTP"
 
-#: ../libpurple/protocols/msn/msn.c:2168
+#: libpurple/protocols/msn/msn.c:2168
 msgid "Show custom smileys"
 msgstr "Zeige benutzerdefinierte Smileys"
 
-#: ../libpurple/protocols/msn/msn.c:2176
+#: libpurple/protocols/msn/msn.c:2176
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Einen Kontakt ansto�en, um seine Aufmerksamkeit zu erhalten"
 
-#: ../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:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: 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:1320
+#: libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Unable to connect"
 msgstr "Verbindung nicht m旦glich"
 
-#: ../libpurple/protocols/msn/notification.c:178
+#: libpurple/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s ist keine g端ltige Gruppe."
 
-#: ../libpurple/protocols/msn/notification.c:184
-#: ../libpurple/protocols/msn/notification.c:532
-#: ../libpurple/protocols/msn/session.c:330
+#: libpurple/protocols/msn/notification.c:184
+#: libpurple/protocols/msn/notification.c:532
+#: libpurple/protocols/msn/session.c:330
 msgid "Unknown error."
 msgstr "Unbekannter Fehler."
 
-#: ../libpurple/protocols/msn/notification.c:187
+#: libpurple/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s auf %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:498
+#: libpurple/protocols/msn/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Kann den Benutzer nicht zu %s (%s) hinzuf端gen"
 
-#: ../libpurple/protocols/msn/notification.c:502
+#: libpurple/protocols/msn/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Kann den Benutzer nicht f端r %s (%s) blockieren"
 
-#: ../libpurple/protocols/msn/notification.c:506
+#: libpurple/protocols/msn/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Kann den Benutzer nicht f端r %s (%s) erlauben"
 
-#: ../libpurple/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 konnte nicht hinzugef端gt werden, da Ihre Buddy-Liste voll ist."
 
-#: ../libpurple/protocols/msn/notification.c:523
+#: libpurple/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s ist kein g端ltiges Passport-Konto."
 
-#: ../libpurple/protocols/msn/notification.c:528
+#: libpurple/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Dienst momentan nicht verf端gbar."
 
-#: ../libpurple/protocols/msn/notification.c:851
+#: libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "Kann die Gruppe nicht umbenennen"
 
-#: ../libpurple/protocols/msn/notification.c:906
+#: libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "Kann die Gruppe nicht l旦schen"
 
-#: ../libpurple/protocols/msn/notification.c:1325
+#: libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5996,15 +5895,15 @@
 "Nach Beendigung der Wartungsarbeiten k旦nnen Sie sich wieder problemlos "
 "anmelden."
 
-#: ../libpurple/protocols/msn/servconn.c:135
+#: libpurple/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Schreibfehler"
 
-#: ../libpurple/protocols/msn/servconn.c:137
+#: libpurple/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "Fehler beim Lesen"
 
-#: ../libpurple/protocols/msn/servconn.c:144
+#: libpurple/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -6013,101 +5912,101 @@
 "Verbindungsfehler vom %s-Server:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:299
+#: libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "Unser Protokoll wird vom Server nicht unterst端tzt."
 
-#: ../libpurple/protocols/msn/session.c:303
+#: libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Fehler beim Verarbeiten von HTTP."
 
-#: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3481
-#: ../libpurple/protocols/yahoo/yahoo.c:202
+#: libpurple/protocols/msn/session.c:307
+#: libpurple/protocols/oscar/flap_connection.c:384
+#: libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Sie haben sich von einem anderen Ort angemeldet."
 
-#: ../libpurple/protocols/msn/session.c:310
+#: libpurple/protocols/msn/session.c:310
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "Die MSN-Server sind tempor辰r nicht verf端gbar. Bitte warten Sie und versuchen "
 "Sie es sp辰ter nochmal."
 
-#: ../libpurple/protocols/msn/session.c:315
+#: libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "Die MSN-Server werden kurzzeitig heruntergefahren."
 
-#: ../libpurple/protocols/msn/session.c:320
+#: libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Kann nicht authentifizieren: %s"
 
-#: ../libpurple/protocols/msn/session.c:325
-msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
+#: libpurple/protocols/msn/session.c:325
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
 msgstr ""
 "Ihre MSN-Buddy-Liste ist tempor辰r nicht verf端gbar. Bitte warten Sie und "
 "versuchen Sie es sp辰ter nochmal."
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/msn/session.c:348
+#: libpurple/protocols/msn/session.c:346 libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "H辰ndedruck"
 
-#: ../libpurple/protocols/msn/session.c:349
+#: libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "Starte Authentifizierung"
 
-#: ../libpurple/protocols/msn/session.c:350
+#: libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "Cookie erhalten"
 
-#: ../libpurple/protocols/msn/session.c:352
+#: libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "Cookie senden"
 
-#: ../libpurple/protocols/msn/session.c:353
+#: libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "Abfragen der Buddy-Liste"
 
-#: ../libpurple/protocols/msn/state.c:34
+#: libpurple/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Abwesend"
 
-#: ../libpurple/protocols/msn/state.c:35
+#: libpurple/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "Am Telefon"
 
-#: ../libpurple/protocols/msn/state.c:36
+#: libpurple/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "Mittagspause"
 
-#: ../libpurple/protocols/msn/switchboard.c:400
+#: libpurple/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr ""
 "Nachricht konnte evtl. nicht gesendet werden, da eine Zeit端berschreitung "
 "aufgetreten ist:"
 
-#: ../libpurple/protocols/msn/switchboard.c:408
+#: libpurple/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr ""
 "Nachricht konnte nicht gesendet werden, da dies nicht erlaubt ist, wenn Sie "
 "unsichtbar angemeldet sind:"
 
-#: ../libpurple/protocols/msn/switchboard.c:412
+#: libpurple/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "Nachricht konnte nicht gesendet werden, da der Benutzer offline ist:"
 
-#: ../libpurple/protocols/msn/switchboard.c:416
+#: libpurple/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr ""
 "Nachricht konnte nicht gesendet werden, da ein Verbindungsfehler aufgetreten "
 "ist:"
 
-#: ../libpurple/protocols/msn/switchboard.c:420
+#: libpurple/protocols/msn/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Nachricht konnte nicht gesendet werden, da wir zu schnell senden:"
 
-#: ../libpurple/protocols/msn/switchboard.c:424
+#: libpurple/protocols/msn/switchboard.c:424
 msgid ""
 "Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
@@ -6116,211 +6015,215 @@
 "hergestellt werden konnte. Dies ist wahrscheinlich ein Server-Problem, "
 "versuchen Sie es in ein paar Minuten erneut:"
 
-#: ../libpurple/protocols/msn/switchboard.c:431
-msgid "Message could not be sent because an error with the switchboard occurred:"
+#: libpurple/protocols/msn/switchboard.c:431
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
 "Nachricht konnte nicht gesendet werden, da ein Fehler mit dem Switchboard "
 "aufgetreten ist:"
 
-#: ../libpurple/protocols/msn/switchboard.c:439
+#: libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
 msgstr ""
 "Nachricht konnte nicht gesendet werden, da ein unbekannter Fehler "
 "aufgetreten ist:"
 
-#: ../libpurple/protocols/msn/switchboard.c:963
+#: libpurple/protocols/msn/switchboard.c:963
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s hat Sie gerade angesto�en!"
 
-#: ../libpurple/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 "Der Benutzer %s hat Sie zu seiner Buddy-Liste hinzugef端gt."
 
-#: ../libpurple/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 "Der Benutzer %s hat Sie von seiner Buddy-Liste gel旦scht."
 
-#: ../libpurple/protocols/msn/userlist.c:641
+#: libpurple/protocols/msn/userlist.c:641
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Kann ��%s�� nicht hinzuf端gen."
 
-#: ../libpurple/protocols/msn/userlist.c:643
+#: libpurple/protocols/msn/userlist.c:643
 msgid "The screen name specified is invalid."
 msgstr "Der angegebene Benutzername ist ung端ltig."
 
-#: ../libpurple/protocols/novell/nmuser.c:1864
+#: libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Erforderliche Parameter nicht 端bergeben"
 
-#: ../libpurple/protocols/novell/nmuser.c:1867
+#: libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Kann nicht zum Netzwerk senden"
 
-#: ../libpurple/protocols/novell/nmuser.c:1870
+#: libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Kann vom Netzwerk empfangen"
 
-#: ../libpurple/protocols/novell/nmuser.c:1873
+#: libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Kommunikationsfehler mit dem Server"
 
-#: ../libpurple/protocols/novell/nmuser.c:1877
+#: libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "Konferenz nicht gefunden"
 
-#: ../libpurple/protocols/novell/nmuser.c:1880
+#: libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "Konferenz existiert nicht"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
+#: libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "Ein Ordner mit dem Namen existiert schon"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
+#: libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "Nicht unterst端tzt"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
+#: libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "Passwort ist abgelaufen"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
+#: libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Falsches Passwort"
 
-#: ../libpurple/protocols/novell/nmuser.c:1897
+#: libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "Benutzer nicht gefunden"
 
-#: ../libpurple/protocols/novell/nmuser.c:1900
+#: libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "Konto wurde deaktiviert"
 
-#: ../libpurple/protocols/novell/nmuser.c:1903
+#: libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "Server konnte nicht auf das Verzeichnis zugreifen"
 
-#: ../libpurple/protocols/novell/nmuser.c:1906
+#: libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "Ihr Systemadministrator hat diese Operation deaktiviert"
 
-#: ../libpurple/protocols/novell/nmuser.c:1909
+#: libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "Der Server ist nicht erreichbar; Versuchen Sie es sp辰ter nochmal"
 
-#: ../libpurple/protocols/novell/nmuser.c:1912
+#: libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Kann einen Kontakt nicht zweimal zum gleichen Ordner hinzuf端gen"
 
-#: ../libpurple/protocols/novell/nmuser.c:1915
+#: libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "Kann Sie nicht selbst hinzuf端gen"
 
-#: ../libpurple/protocols/novell/nmuser.c:1918
+#: libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Master-Archiv ist falsch konfiguriert"
 
-#: ../libpurple/protocols/novell/nmuser.c:1922
+#: libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "Falscher Benutzername oder falsches Passwort"
 
-#: ../libpurple/protocols/novell/nmuser.c:1925
+#: libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr ""
 "Konnte den Rechnernamen des Benutzers, den Sie eingegeben haben, nicht "
 "erkennen"
 
-#: ../libpurple/protocols/novell/nmuser.c:1928
+#: libpurple/protocols/novell/nmuser.c:1928
 msgid ""
 "Your account has been disabled because too many incorrect passwords were "
 "entered"
-msgstr "Ihr Konto wurde wegen zu vielen falsch eingegebenen Passworten gesperrt"
-
-#: ../libpurple/protocols/novell/nmuser.c:1931
+msgstr ""
+"Ihr Konto wurde wegen zu vielen falsch eingegebenen Passworten gesperrt"
+
+#: libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Sie k旦nnen die selbe Person nicht zweimal zu einem Gespr辰ch hinzuf端gen"
 
-#: ../libpurple/protocols/novell/nmuser.c:1935
+#: libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Sie haben die Grenze der maximal erlaubten Kontakte erreicht"
 
-#: ../libpurple/protocols/novell/nmuser.c:1938
+#: libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "Sie haben einen falschen Benutzernamen eingegeben"
 
-#: ../libpurple/protocols/novell/nmuser.c:1941
+#: libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "Beim Aktualisieren des Verzeichnisses trat ein Fehler auf"
 
-#: ../libpurple/protocols/novell/nmuser.c:1944
+#: libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Inkompatible Protokollversion"
 
-#: ../libpurple/protocols/novell/nmuser.c:1947
+#: libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "Der Benutzer hat Sie blockiert"
 
-#: ../libpurple/protocols/novell/nmuser.c:1950
+#: libpurple/protocols/novell/nmuser.c:1950
 msgid ""
 "This evaluation version does not allow more than ten users to log in at one "
 "time"
-msgstr "Diese Evaluationsversion erlaubt nicht mehr als 10 Benutzer gleichzeitig"
-
-#: ../libpurple/protocols/novell/nmuser.c:1953
+msgstr ""
+"Diese Evaluationsversion erlaubt nicht mehr als 10 Benutzer gleichzeitig"
+
+#: libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "Der Benutzer ist entweder offline oder Sie werden blockiert"
 
-#: ../libpurple/protocols/novell/nmuser.c:1956
+#: libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Unbekannter Fehler: 0x%X"
 
-#: ../libpurple/protocols/novell/novell.c:124
+#: libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Anmeldung fehlgeschlagen (%s)."
 
-#: ../libpurple/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 ""
 "Kann die Nachricht nicht senden. Kann die Details vom Benutzer nicht holen (%"
 "s)."
 
-#: ../libpurple/protocols/novell/novell.c:396
+#: libpurple/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Kann %s nicht zu Ihrer Buddy-Liste hinzuf端gen (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:422
+#: libpurple/protocols/novell/novell.c:422
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Kann die Nachricht nicht senden (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:493
-#: ../libpurple/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 "Kann den Benutzer nicht einladen (%s)."
 
-#: ../libpurple/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 ""
 "Kann die Nachricht nicht an %s senden. Kann die Konferenz nicht erstellen (%"
 "s)."
 
-#: ../libpurple/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 "Kann die Nachricht nicht senden. Kann die Konferenz nicht erstellen (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:584
+msgstr ""
+"Kann die Nachricht nicht senden. Kann die Konferenz nicht erstellen (%s)."
+
+#: libpurple/protocols/novell/novell.c:584
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
@@ -6329,7 +6232,7 @@
 "Fehler beim Verschieben des Benutzers %s zum Verzeichnis %s auf der "
 "serverseitigen Liste. Fehler beim Erstellen des Verzeichnisses (%s)."
 
-#: ../libpurple/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 "
@@ -6338,62 +6241,63 @@
 "Kann den Benutzer %s nicht zur Buddy-Liste hinzuf端gen. Fehler beim Erstellen "
 "des Verzeichnisses auf der serverseitigen Liste (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:705
+#: libpurple/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Kann die Details f端r den Benutzer %s nicht holen (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:751
-#: ../libpurple/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 "Kann den Benutzer nicht zu Ihrer Privatsph辰re-Liste hinzuf端gen (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:798
+#: libpurple/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Kann %s nicht zu Ihrer Verboten-Liste hinzuf端gen (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:851
+#: libpurple/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Kann %s nicht zu Ihrer Erlaubt-Liste hinzuf端gen (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:919
+#: libpurple/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Kann %s nicht zu Ihrer Privatsph辰re-Liste entfernen (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:942
-#: ../libpurple/protocols/novell/novell.c:1647
+#: libpurple/protocols/novell/novell.c:942
+#: libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
-msgstr "Kann die serverseitigen Einstellungen zur Privatsph辰re nicht 辰ndern (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:1012
+msgstr ""
+"Kann die serverseitigen Einstellungen zur Privatsph辰re nicht 辰ndern (%s)."
+
+#: libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Konferenz kann nicht erstellt werden (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1121
-#: ../libpurple/protocols/novell/novell.c:1692
+#: libpurple/protocols/novell/novell.c:1121
+#: libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "Kommunikationsfehler mit dem Server. Schlie�e die Verbindung."
 
-#: ../libpurple/protocols/novell/novell.c:1476
+#: libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Telefonnummer"
 
-#: ../libpurple/protocols/novell/novell.c:1482
+#: libpurple/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Pers旦nlicher Titel"
 
-#: ../libpurple/protocols/novell/novell.c:1486
+#: libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Hauspostcode"
 
-#: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4122
+#: libpurple/protocols/novell/novell.c:1502
+#: libpurple/protocols/sametime/sametime.c:4123
 msgid "User ID"
 msgstr "Benutzer-ID"
 
@@ -6403,41 +6307,41 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1515
+#: libpurple/protocols/novell/novell.c:1515
 msgid "Full name"
 msgstr "Vollst辰ndiger Name"
 
-#: ../libpurple/protocols/novell/novell.c:1637
+#: libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise-Konferenz %d"
 
-#: ../libpurple/protocols/novell/novell.c:1668
+#: libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "Kann keine SSL-Verbindung zum Server herstellen."
 
-#: ../libpurple/protocols/novell/novell.c:1720
+#: libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "Authentifizierung..."
 
-#: ../libpurple/protocols/novell/novell.c:1732
+#: libpurple/protocols/novell/novell.c:1732
 msgid "Unable to connect to server."
 msgstr "Verbindung zum Server nicht m旦glich."
 
-#: ../libpurple/protocols/novell/novell.c:1735
+#: libpurple/protocols/novell/novell.c:1735
 msgid "Waiting for response..."
 msgstr "Warte auf Antwort..."
 
-#: ../libpurple/protocols/novell/novell.c:1870
+#: libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s wurde zu diesem Gespr辰ch eingeladen."
 
-#: ../libpurple/protocols/novell/novell.c:1898
+#: libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "Einladung zur Unterhaltung"
 
-#: ../libpurple/protocols/novell/novell.c:1899
+#: libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -6448,20 +6352,21 @@
 "\n"
 "Gesendet: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "M旦chten der Konferenz beitreten?"
 
 #. we don't want to reconnect in this case
-#: ../libpurple/protocols/novell/novell.c:2012
+#: libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Sie wurden abgemeldet, weil Sie sich an einer anderen Workstation angemeldet "
 "haben."
 
-#: ../libpurple/protocols/novell/novell.c:2069
-#, c-format
-msgid "%s appears to be offline and did not receive the message that you just sent."
+#: libpurple/protocols/novell/novell.c:2069
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
 msgstr ""
 "%s scheint offline zu sein und hat die Nachricht, die Sie gerade gesendet "
 "haben, nicht empfangen."
@@ -6470,7 +6375,7 @@
 #. *  purple_request_fields(gc, _("Server Address"),...);
 #.
 #. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2167
+#: libpurple/protocols/novell/novell.c:2167
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
@@ -6478,11 +6383,12 @@
 "Kann keine Verbindung zum Server herstellen. Bitte geben Sie die Adresse des "
 "Servers ein, mit dem Sie sich verbinden wollen."
 
-#: ../libpurple/protocols/novell/novell.c:2195
+#: libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "Fehler. SSL ist nicht installiert."
 
-#: ../libpurple/protocols/novell/novell.c:2504
+#: libpurple/protocols/novell/novell.c:2504
+#, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr ""
 "Diese Konferenz wurde geschlossen. Es k旦nnen keine Nachrichten mehr gesendet "
@@ -6498,33 +6404,32 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3518
-#: ../libpurple/protocols/novell/novell.c:3520
+#: libpurple/protocols/novell/novell.c:3518
+#: libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protokoll-Plugin"
 
-#: ../libpurple/protocols/novell/novell.c:3545
+#: libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "Server-Adresse"
 
-#: ../libpurple/protocols/novell/novell.c:3549
+#: libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "Server-Port"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:379
-#: ../libpurple/protocols/yahoo/yahoo.c:2292
-#: ../libpurple/protocols/yahoo/yahoo.c:2459
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
-#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
-#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
+#: libpurple/protocols/oscar/flap_connection.c:387
+#: libpurple/protocols/yahoo/yahoo.c:2296
+#: libpurple/protocols/yahoo/yahoo.c:2463 libpurple/protocols/yahoo/ycht.c:481
+#: libpurple/proxy.c:580 libpurple/proxy.c:1099 libpurple/proxy.c:1208
+#: libpurple/proxy.c:1308 libpurple/proxy.c:1436
 msgid "Server closed the connection."
 msgstr "Der Server hat die Verbindung beendet."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:381
-#: ../libpurple/protocols/yahoo/yahoo.c:2286
-#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
-#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
-#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
+#: libpurple/protocols/oscar/flap_connection.c:389
+#: libpurple/protocols/yahoo/yahoo.c:2290
+#: libpurple/protocols/yahoo/yahoo.c:2457 libpurple/proxy.c:592
+#: libpurple/proxy.c:1111 libpurple/proxy.c:1220 libpurple/proxy.c:1320
+#: libpurple/proxy.c:1448
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -6533,10 +6438,9 @@
 "Verbindung zum Server verloren:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
-#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
-#: ../libpurple/proxy.c:1461
+#: libpurple/protocols/oscar/flap_connection.c:392 libpurple/proxy.c:1128
+#: libpurple/proxy.c:1233 libpurple/proxy.c:1332 libpurple/proxy.c:1404
+#: libpurple/proxy.c:1461
 msgid "Received invalid data on connection with server."
 msgstr "Ung端ltige Daten in der Verbindung mit dem Server empfangen."
 
@@ -6550,8 +6454,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libaim.c:118
-#: ../libpurple/protocols/oscar/libaim.c:120
+#: libpurple/protocols/oscar/libaim.c:118
+#: libpurple/protocols/oscar/libaim.c:120
 msgid "AIM Protocol Plugin"
 msgstr "AIM-Protokoll-Plugin"
 
@@ -6565,144 +6469,146 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/oscar/libicq.c:118
-#: ../libpurple/protocols/oscar/libicq.c:120
+#: libpurple/protocols/oscar/libicq.c:118
+#: libpurple/protocols/oscar/libicq.c:120
 msgid "ICQ Protocol Plugin"
 msgstr "IRC-Protokoll-Plugin"
 
-#: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4111
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
+#: libpurple/protocols/oscar/libicq.c:147
+#: libpurple/protocols/yahoo/yahoo.c:4115
+#: libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Kodierung"
 
-#: ../libpurple/protocols/oscar/odc.c:40
+#: libpurple/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "Der entfernte Benutzer hat das Gespr辰ch beendet."
 
-#: ../libpurple/protocols/oscar/odc.c:42
+#: libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
 msgstr "Der entfernte Benutzer hat Ihre Anfrage abgelehnt."
 
-#: ../libpurple/protocols/oscar/odc.c:44
+#: libpurple/protocols/oscar/odc.c:44
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Verbindung zum entfernten Benutzer verloren: <br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:47
+#: libpurple/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
-msgstr "Ung端ltige Daten in der Verbindung mit dem entfernten Benutzer empfangen."
-
-#: ../libpurple/protocols/oscar/odc.c:49
+msgstr ""
+"Ung端ltige Daten in der Verbindung mit dem entfernten Benutzer empfangen."
+
+#: libpurple/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
-msgstr "Die Verbindung mit dem entfernten Benutzer konnte nicht hergestellt werden."
-
-#: ../libpurple/protocols/oscar/odc.c:560
+msgstr ""
+"Die Verbindung mit dem entfernten Benutzer konnte nicht hergestellt werden."
+
+#: libpurple/protocols/oscar/odc.c:560
 msgid "Direct IM established"
 msgstr "Direkt-IM hergestellt"
 
-#: ../libpurple/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 "Datei %s (%s) ist gr旦�er als die maximale Gr旦�e von %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:115
+#: libpurple/protocols/oscar/oscar.c:115
 msgid "Invalid error"
 msgstr "Ung端ltiger Name"
 
-#: ../libpurple/protocols/oscar/oscar.c:116
+#: libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid SNAC"
 msgstr "Ung端ltiger SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
+#: libpurple/protocols/oscar/oscar.c:117
 msgid "Rate to host"
 msgstr "Bewertung zum Host"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
+#: libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to client"
 msgstr "Bewertung zum Client"
 
-#: ../libpurple/protocols/oscar/oscar.c:120
+#: libpurple/protocols/oscar/oscar.c:120
 msgid "Service unavailable"
 msgstr "Server unerreichbar"
 
-#: ../libpurple/protocols/oscar/oscar.c:121
+#: libpurple/protocols/oscar/oscar.c:121
 msgid "Service not defined"
 msgstr "Dienst nicht definiert"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
+#: libpurple/protocols/oscar/oscar.c:122
 msgid "Obsolete SNAC"
 msgstr "Obsoleteter SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
+#: libpurple/protocols/oscar/oscar.c:123
 msgid "Not supported by host"
 msgstr "Nicht unterst端tzt vom Host"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
+#: libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by client"
 msgstr "Nicht unterst端tzt vom Client"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
+#: libpurple/protocols/oscar/oscar.c:125
 msgid "Refused by client"
 msgstr "Abgelehnt vom Client"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
+#: libpurple/protocols/oscar/oscar.c:126
 msgid "Reply too big"
 msgstr "Antwort zu gro�"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
+#: libpurple/protocols/oscar/oscar.c:127
 msgid "Responses lost"
 msgstr "Antworten verloren"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
+#: libpurple/protocols/oscar/oscar.c:128
 msgid "Request denied"
 msgstr "Anfrage verweigert"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
+#: libpurple/protocols/oscar/oscar.c:129
 msgid "Busted SNAC payload"
 msgstr "Ruinierte SNAC-Daten"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
+#: libpurple/protocols/oscar/oscar.c:130
 msgid "Insufficient rights"
 msgstr "Ungen端gende Rechte"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
+#: libpurple/protocols/oscar/oscar.c:131
 msgid "In local permit/deny"
 msgstr "In lokaler erlaubt/verboten-Liste"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
+#: libpurple/protocols/oscar/oscar.c:132
 msgid "Too evil (sender)"
 msgstr "Zu boshaft (Sender)"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
+#: libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (receiver)"
 msgstr "Zu boshaft (Empf辰nger)"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
+#: libpurple/protocols/oscar/oscar.c:134
 msgid "User temporarily unavailable"
 msgstr "Benutzer ist tempor辰r nicht verf端gbar"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
+#: libpurple/protocols/oscar/oscar.c:135
 msgid "No match"
 msgstr "Keine �bereinstimmung"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
+#: libpurple/protocols/oscar/oscar.c:136
 msgid "List overflow"
 msgstr "Listen端berlauf"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
+#: libpurple/protocols/oscar/oscar.c:137
 msgid "Request ambiguous"
 msgstr "Anfrage ist nicht eindeutig"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
+#: libpurple/protocols/oscar/oscar.c:138
 msgid "Queue full"
 msgstr "Warteschlange voll"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
+#: libpurple/protocols/oscar/oscar.c:139
 msgid "Not while on AOL"
 msgstr "Nicht solange bei AOL angemeldet"
 
-#: ../libpurple/protocols/oscar/oscar.c:348
+#: libpurple/protocols/oscar/oscar.c:348
 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 "
@@ -6714,7 +6620,7 @@
 "erwartet.  Wenn Sie wissen, welche Kodierung er benutzt, k旦nnen Sie diese in "
 "den erweiterten Konto-Optionen Ihres AIM/ICQ-Kontos angeben.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:457
+#: libpurple/protocols/oscar/oscar.c:457
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6725,146 +6631,149 @@
 "Client.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2353
-#: ../pidgin/gtkutils.c:2383
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
+#: libpurple/protocols/oscar/oscar.c:639 pidgin/gtkutils.c:2376
+#: pidgin/gtkutils.c:2406 pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Buddy-Icon"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
+#: libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "Stimme"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
+#: libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "AIM direkte Nachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:768
-#: ../libpurple/protocols/silc/util.c:553
-#: ../libpurple/protocols/silc10/silc.c:679
-#: ../libpurple/protocols/silc10/util.c:549
+#: libpurple/protocols/oscar/oscar.c:648 libpurple/protocols/silc/silc.c:768
+#: libpurple/protocols/silc/util.c:553 libpurple/protocols/silc10/silc.c:679
+#: libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: libpurple/protocols/oscar/oscar.c:651
+#: libpurple/protocols/oscar/oscar.c:5989
 msgid "Get File"
 msgstr "Datei abrufen"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "Spiele"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "Zus辰tze"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "Buddy-Liste senden"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "ICQ direkte Verbindung"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "AP Benutzer"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr "ICQ Server Relay"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
+#: libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr "Altes ICQ UTF-8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
+#: libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
 msgstr "Trillian-Verschl端sselung"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
+#: libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr "ICQ UTF-8"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
+#: libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
+#: libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr "Sicherheit aktiviert"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
+#: libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "Video-Chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
+#: libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
+#: libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "Live-Video"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
+#: libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5759
+#: libpurple/protocols/oscar/oscar.c:725
+#: libpurple/protocols/oscar/oscar.c:5759
+#, c-format
 msgid "Free For Chat"
 msgstr "Bereit zum Chatten"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5794
+#: libpurple/protocols/oscar/oscar.c:729
+#: libpurple/protocols/oscar/oscar.c:5794
+#, c-format
 msgid "Not Available"
 msgstr "Nicht verf端gbar"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5780
+#: libpurple/protocols/oscar/oscar.c:731
+#: libpurple/protocols/oscar/oscar.c:5780
+#, c-format
 msgid "Occupied"
 msgstr "Besch辰ftigt"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
+#: libpurple/protocols/oscar/oscar.c:735
+#, c-format
 msgid "Web Aware"
 msgstr "In Web"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
+#: libpurple/protocols/oscar/oscar.c:737 libpurple/protocols/qq/qq.c:183
+#: libpurple/protocols/yahoo/yahoo.c:2917 libpurple/status.c:156
+#: pidgin/gtkdocklet.c:446 pidgin/gtkstatusbox.c:1058
+#, c-format
 msgid "Invisible"
 msgstr "Unsichtbar"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
+#: libpurple/protocols/oscar/oscar.c:739
+#, c-format
 msgid "Online"
 msgstr "Online"
 
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3721
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1121
+#: libpurple/protocols/oscar/oscar.c:838
+#: libpurple/protocols/oscar/oscar.c:3716
+#: libpurple/protocols/yahoo/yahoo_profile.c:721 pidgin/gtkprefs.c:1121
 msgid "IP Address"
 msgstr "IP-Adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2867
+#: libpurple/protocols/oscar/oscar.c:845
+#: libpurple/protocols/oscar/oscar.c:2863
 msgid "Warning Level"
 msgstr "Warnstufe"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
+#: libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "Buddy-Kommentar"
 
-#: ../libpurple/protocols/oscar/oscar.c:995
+#: libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6873,7 +6782,7 @@
 "Verbindung zum Authentifizierungsserver nicht m旦glich:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
+#: libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6882,20 +6791,20 @@
 "Verbindung zum BOS-Server nicht m旦glich\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
+#: libpurple/protocols/oscar/oscar.c:1043
 msgid "Screen name sent"
 msgstr "Benutzername gesendet"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
+#: libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr "Verbindung hergestellt. Cookie gesendet"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
+#: libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr "Verbindung herstellen"
 
-#: ../libpurple/protocols/oscar/oscar.c:1261
+#: libpurple/protocols/oscar/oscar.c:1261
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
@@ -6907,29 +6816,29 @@
 "sein oder mit einem Buchstaben beginnen und nur Buchstaben, Ziffern und "
 "Leerzeichen enthalten oder nur aus Ziffern bestehen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1346
-#: ../libpurple/protocols/yahoo/yahoo.c:1934
+#: libpurple/protocols/oscar/oscar.c:1346
+#: libpurple/protocols/yahoo/yahoo.c:1935
 msgid "Invalid screen name."
 msgstr "Ung端ltiger Benutzername."
 
-#: ../libpurple/protocols/oscar/oscar.c:1353
-#: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1037
-#: ../libpurple/protocols/yahoo/yahoo.c:1952
+#: libpurple/protocols/oscar/oscar.c:1353
+#: libpurple/protocols/qq/login_logout.c:483
+#: libpurple/protocols/simple/simple.c:1039
+#: libpurple/protocols/yahoo/yahoo.c:1956
 msgid "Incorrect password."
 msgstr "Falsches Passwort."
 
-#: ../libpurple/protocols/oscar/oscar.c:1358
+#: libpurple/protocols/oscar/oscar.c:1358
 msgid "Your account is currently suspended."
 msgstr "Ihr Benutzerkonto ist momentan gesperrt."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1362
+#: libpurple/protocols/oscar/oscar.c:1362
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Der AOL-Sofortnachrichtendienst ist zur Zeit nicht erreichbar."
 
-#: ../libpurple/protocols/oscar/oscar.c:1367
-#: ../libpurple/protocols/oscar/oscar.c:1378
+#: libpurple/protocols/oscar/oscar.c:1367
+#: libpurple/protocols/oscar/oscar.c:1378
 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."
@@ -6938,44 +6847,45 @@
 "versuchen Sie es noch einmal. Wenn Sie es weiterversuchen, m端ssen Sie sogar "
 "noch l辰nger warten."
 
-#: ../libpurple/protocols/oscar/oscar.c:1372
+#: libpurple/protocols/oscar/oscar.c:1372
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
-msgstr "Die Client-Version, die Sie nutzen ist zu alt. Bitte updaten Sie unter %s"
-
-#: ../libpurple/protocols/oscar/oscar.c:1412
+msgstr ""
+"Die Client-Version, die Sie nutzen ist zu alt. Bitte updaten Sie unter %s"
+
+#: libpurple/protocols/oscar/oscar.c:1411
 msgid "Could Not Connect"
 msgstr "Verbinden nicht m旦glich"
 
-#: ../libpurple/protocols/oscar/oscar.c:1417
+#: libpurple/protocols/oscar/oscar.c:1415
 msgid "Received authorization"
 msgstr "Autorisierung empfangen"
 
-#: ../libpurple/protocols/oscar/oscar.c:1440
+#: libpurple/protocols/oscar/oscar.c:1437
 msgid "The SecurID key entered is invalid."
 msgstr "Der eingegebene SecurID-Schl端ssel ist falsch."
 
-#: ../libpurple/protocols/oscar/oscar.c:1454
+#: libpurple/protocols/oscar/oscar.c:1450
 msgid "Enter SecurID"
 msgstr "SecurID-Eingabe"
 
-#: ../libpurple/protocols/oscar/oscar.c:1455
+#: libpurple/protocols/oscar/oscar.c:1451
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Geben Sie die 6-stellige Nummer vom Digital-Display ein."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1457
-#: ../libpurple/protocols/oscar/oscar.c:2250
-#: ../libpurple/protocols/oscar/oscar.c:2297
-#: ../libpurple/protocols/oscar/oscar.c:5864
-#: ../libpurple/protocols/oscar/oscar.c:6145 ../libpurple/request.h:1387
+#: libpurple/protocols/oscar/oscar.c:1453
+#: libpurple/protocols/oscar/oscar.c:2246
+#: libpurple/protocols/oscar/oscar.c:2293
+#: libpurple/protocols/oscar/oscar.c:5864
+#: libpurple/protocols/oscar/oscar.c:6145 libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1496
-#: ../libpurple/protocols/oscar/oscar.c:1539
+#: libpurple/protocols/oscar/oscar.c:1492
+#: libpurple/protocols/oscar/oscar.c:1535
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6984,55 +6894,56 @@
 "Die Verbindung kann schnell unterbrochen werden. Vielleicht wollen Sie TOC "
 "benutzen bis dieser Fehler behoben wurde. Suchen Sie auf %s nach Updates."
 
-#: ../libpurple/protocols/oscar/oscar.c:1499
-#: ../libpurple/protocols/oscar/oscar.c:1542
+#: libpurple/protocols/oscar/oscar.c:1495
+#: libpurple/protocols/oscar/oscar.c:1538
 msgid "Unable to get a valid AIM login hash."
 msgstr "Konnte keinen g端ltigen AIM Login-Hash bekommen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1627
+#: libpurple/protocols/oscar/oscar.c:1623
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
-msgstr "Sie wurden in kurzer Zeit abgemeldet.  �berpr端fen Sie %s wegen Updates."
-
-#: ../libpurple/protocols/oscar/oscar.c:1630
+msgstr ""
+"Sie wurden in kurzer Zeit abgemeldet.  �berpr端fen Sie %s wegen Updates."
+
+#: libpurple/protocols/oscar/oscar.c:1626
 msgid "Unable to get a valid login hash."
 msgstr "Konnte keinen g端ltigen Login-Hash bekommen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1659
+#: libpurple/protocols/oscar/oscar.c:1655
 msgid "Password sent"
 msgstr "Passwort gesendet"
 
-#: ../libpurple/protocols/oscar/oscar.c:1715
+#: libpurple/protocols/oscar/oscar.c:1711
 msgid "Unable to initialize connection"
 msgstr "Kann Verbindung nicht erstellen"
 
-#: ../libpurple/protocols/oscar/oscar.c:2220
+#: libpurple/protocols/oscar/oscar.c:2216
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Bitte autorisieren Sie mich, sodass ich Sie in meine Buddy-Liste aufnehmen "
 "kann."
 
-#: ../libpurple/protocols/oscar/oscar.c:2248
+#: libpurple/protocols/oscar/oscar.c:2244
 msgid "Authorization Request Message:"
 msgstr "Autorisierungsanfrage:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2249
+#: libpurple/protocols/oscar/oscar.c:2245
 msgid "Please authorize me!"
 msgstr "Bitte autorisiere mich!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2289
-#: ../libpurple/protocols/oscar/oscar.c:2296
-#: ../libpurple/protocols/oscar/oscar.c:2423
-#: ../libpurple/protocols/oscar/oscar.c:5242
-#: ../libpurple/protocols/yahoo/yahoo.c:987
+#: libpurple/protocols/oscar/oscar.c:2285
+#: libpurple/protocols/oscar/oscar.c:2292
+#: libpurple/protocols/oscar/oscar.c:2419
+#: libpurple/protocols/oscar/oscar.c:5242
+#: libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "Kein Grund angegeben."
 
-#: ../libpurple/protocols/oscar/oscar.c:2295
+#: libpurple/protocols/oscar/oscar.c:2291
 msgid "Authorization Denied Message:"
 msgstr "Nachricht f端r die Ablehnung der Autorisierung:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -7043,19 +6954,19 @@
 "Liste hinzuf端gen zu d端rfen, und zwar aus folgendem Grund:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2424
+#: libpurple/protocols/oscar/oscar.c:2420
 msgid "ICQ authorization denied."
 msgstr "ICQ-Autorisierung verweigert."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2431
+#: libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "Der Benutzer %u hat Ihre Anfrage akzeptiert, ihn bzw. sie zu Ihrer Buddy-"
 "Liste hinzuf端gen zu d端rfen."
 
-#: ../libpurple/protocols/oscar/oscar.c:2439
+#: libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -7068,7 +6979,7 @@
 "Von: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2447
+#: libpurple/protocols/oscar/oscar.c:2443
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -7081,7 +6992,7 @@
 "Von: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2455
+#: libpurple/protocols/oscar/oscar.c:2451
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -7094,41 +7005,45 @@
 "Nachricht:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2476
+#: libpurple/protocols/oscar/oscar.c:2472
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Der ICQ Benutzer %u hat Ihnen einen Buddy gesendet: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2482
+#: libpurple/protocols/oscar/oscar.c:2478
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "M旦chten Sie diesen Buddy zu Ihrer Buddy-Liste hinzuf端gen?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2487 ../pidgin/gtkroomlist.c:308
+#: libpurple/protocols/oscar/oscar.c:2483 pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Hinzuf端gen"
 
-#: ../libpurple/protocols/oscar/oscar.c:2488
+#: libpurple/protocols/oscar/oscar.c:2484
 msgid "_Decline"
 msgstr "_Ablehnen"
 
-#: ../libpurple/protocols/oscar/oscar.c:2572
+#: libpurple/protocols/oscar/oscar.c:2568
 #, 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] "Sie haben %hu Nachricht von %s nicht erhalten, da sie ung端ltig war."
-msgstr[1] "Sie haben %hu Nachrichten von %s nicht erhalten, da sie ung端ltig waren."
-
-#: ../libpurple/protocols/oscar/oscar.c:2581
+msgstr[1] ""
+"Sie haben %hu Nachrichten von %s nicht erhalten, da sie ung端ltig waren."
+
+#: libpurple/protocols/oscar/oscar.c:2577
 #, 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] "Sie haben %hu Nachricht von %s nicht erhalten, da sie zu gro� war."
-msgstr[1] "Sie haben %hu Nachrichten von %s nicht erhalten, da sie zu gro� waren."
-
-#: ../libpurple/protocols/oscar/oscar.c:2590
-#, 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[1] ""
+"Sie haben %hu Nachrichten von %s nicht erhalten, da sie zu gro� waren."
+
+#: libpurple/protocols/oscar/oscar.c:2586
+#, 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] ""
 "Sie haben %hu Nachricht von %s nicht erhalten, da die Senderate "
 "端berschritten wurde."
@@ -7136,77 +7051,83 @@
 "Sie haben %hu Nachrichten von %s nicht erhalten, da die Senderate "
 "端berschritten wurde."
 
-#: ../libpurple/protocols/oscar/oscar.c:2599
+#: libpurple/protocols/oscar/oscar.c:2595
 #, 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] "Sie haben %hu Nachricht von %s nicht erhalten, da er/sie zu boshaft war."
-msgstr[1] "Sie haben %hu Nachrichten von %s nicht erhalten,/sie zu boshaft war."
-
-#: ../libpurple/protocols/oscar/oscar.c:2608
+msgstr[0] ""
+"Sie haben %hu Nachricht von %s nicht erhalten, da er/sie zu boshaft war."
+msgstr[1] ""
+"Sie haben %hu Nachrichten von %s nicht erhalten,/sie zu boshaft war."
+
+#: libpurple/protocols/oscar/oscar.c:2604
 #, 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] "Sie haben %hu Nachricht von %s nicht erhalten, da Sie zu boshaft sind."
-msgstr[1] "Sie haben %hu Nachrichten von %s nicht erhalten, da Sie zu boshaft sind."
-
-#: ../libpurple/protocols/oscar/oscar.c:2617
+msgstr[0] ""
+"Sie haben %hu Nachricht von %s nicht erhalten, da Sie zu boshaft sind."
+msgstr[1] ""
+"Sie haben %hu Nachrichten von %s nicht erhalten, da Sie zu boshaft sind."
+
+#: libpurple/protocols/oscar/oscar.c:2613
 #, 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] "Sie haben %hu Nachricht von %s aus unbekannten Gr端nden nicht erhalten."
-msgstr[1] "Sie haben %hu Nachrichten von %s aus unbekannten Gr端nden nicht erhalten."
+msgstr[0] ""
+"Sie haben %hu Nachricht von %s aus unbekannten Gr端nden nicht erhalten."
+msgstr[1] ""
+"Sie haben %hu Nachrichten von %s aus unbekannten Gr端nden nicht erhalten."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2772
+#: libpurple/protocols/oscar/oscar.c:2768
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kann die Nachricht nicht senden: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2772
-#: ../libpurple/protocols/oscar/oscar.c:2777
-#: ../libpurple/protocols/oscar/oscar.c:2841
+#: libpurple/protocols/oscar/oscar.c:2768
+#: libpurple/protocols/oscar/oscar.c:2773
+#: libpurple/protocols/oscar/oscar.c:2837
 msgid "Unknown reason."
 msgstr "Unbekannter Grund."
 
-#: ../libpurple/protocols/oscar/oscar.c:2775
-#: ../libpurple/protocols/sametime/sametime.c:2409
+#: libpurple/protocols/oscar/oscar.c:2771
+#: libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kann die Nachricht an %s nicht senden:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2841
+#: libpurple/protocols/oscar/oscar.c:2837
 #, c-format
 msgid "User information not available: %s"
 msgstr "Benutzerinformation nicht verf端gbar: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2872
+#: libpurple/protocols/oscar/oscar.c:2868
 msgid "Online Since"
 msgstr "Online seit"
 
-#: ../libpurple/protocols/oscar/oscar.c:2877
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
+#: libpurple/protocols/oscar/oscar.c:2873
+#: libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Mitglied seit"
 
-#: ../libpurple/protocols/oscar/oscar.c:2882
+#: libpurple/protocols/oscar/oscar.c:2878
 msgid "Capabilities"
 msgstr "F辰higkeiten"
 
-#: ../libpurple/protocols/oscar/oscar.c:2912
+#: libpurple/protocols/oscar/oscar.c:2908
 msgid "Available Message"
 msgstr "Verf端gbarkeitsnachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:2940
+#: libpurple/protocols/oscar/oscar.c:2936
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3020
+#: libpurple/protocols/oscar/oscar.c:3016
 msgid "Your AIM connection may be lost."
 msgstr "Ihre AIM-Verbindung k旦nnte unterbrochen sein."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3208
+#: libpurple/protocols/oscar/oscar.c:3204
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7214,7 +7135,7 @@
 "[Kann die Nachricht von diesem Benutzer nicht anzeigen, da sie ung端ltige "
 "Zeichen enth辰lt.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3411
+#: libpurple/protocols/oscar/oscar.c:3407
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7223,88 +7144,83 @@
 "Senderate 端berschritten wurde. Bitte warten Sie 10 Sekunden und versuchen "
 "Sie es erneut."
 
-#: ../libpurple/protocols/oscar/oscar.c:3483
-msgid "You have been signed off for an unknown reason."
-msgstr "Sie wurden aus einem unbekannten Grund abgemeldet."
-
-#: ../libpurple/protocols/oscar/oscar.c:3496
-#: ../libpurple/protocols/toc/toc.c:977
+#: libpurple/protocols/oscar/oscar.c:3490 libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Die Verbindung zum Raum %s wurde unterbrochen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3743
-#: ../libpurple/protocols/silc/util.c:585
-#: ../libpurple/protocols/silc10/util.c:581
+#: libpurple/protocols/oscar/oscar.c:3738 libpurple/protocols/silc/util.c:585
+#: libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Handynummer"
 
-#: ../libpurple/protocols/oscar/oscar.c:3773
+#: libpurple/protocols/oscar/oscar.c:3768
 msgid "Personal Web Page"
 msgstr "Pers旦nliche Webseite"
 
-#: ../libpurple/protocols/oscar/oscar.c:3797
-#: ../libpurple/protocols/qq/buddy_info.c:40
+#: libpurple/protocols/oscar/oscar.c:3792
+#: libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Zus辰tzliche Informationen"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: libpurple/protocols/oscar/oscar.c:3800
+#: libpurple/protocols/oscar/oscar.c:3813
 msgid "Zip Code"
 msgstr "PLZ"
 
-#: ../libpurple/protocols/oscar/oscar.c:3829
+#: libpurple/protocols/oscar/oscar.c:3824
 msgid "Division"
 msgstr "Abteilung"
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
+#: libpurple/protocols/oscar/oscar.c:3825
 msgid "Position"
 msgstr "Position"
 
-#: ../libpurple/protocols/oscar/oscar.c:3832
+#: libpurple/protocols/oscar/oscar.c:3827
 msgid "Web Page"
 msgstr "Webseite"
 
-#: ../libpurple/protocols/oscar/oscar.c:3835
+#: libpurple/protocols/oscar/oscar.c:3830
 msgid "Work Information"
 msgstr "Information (Arbeit)"
 
-#: ../libpurple/protocols/oscar/oscar.c:3891
+#: libpurple/protocols/oscar/oscar.c:3886
 msgid "Pop-Up Message"
 msgstr "Pop-Up Nachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:3931
+#: libpurple/protocols/oscar/oscar.c:3926
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Die folgende Benutzername ist verbunden mit %s"
 msgstr[1] "Die folgenden Benutzernamen sind verbunden mit %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3936
+#: libpurple/protocols/oscar/oscar.c:3931
 msgid "Screen name"
 msgstr "Benutzername"
 
-#: ../libpurple/protocols/oscar/oscar.c:3962
+#: libpurple/protocols/oscar/oscar.c:3957
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Keine Ergebnisse f端r die E-Mail-Adresse %s gefunden"
 
-#: ../libpurple/protocols/oscar/oscar.c:3983
+#: libpurple/protocols/oscar/oscar.c:3978
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr ""
 "Sie sollten eine E-Mail erhalten, in der Sie aufgefordert werden, %s zu "
 "best辰tigen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3985
+#: libpurple/protocols/oscar/oscar.c:3980
 msgid "Account Confirmation Requested"
 msgstr "Kontobest辰tigung wurde angefragt"
 
-#: ../libpurple/protocols/oscar/oscar.c:4016
+#: libpurple/protocols/oscar/oscar.c:4011
+#, c-format
 msgid "Error Changing Account Info"
 msgstr "Fehler beim �ndern der Konten-Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:4019
+#: libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7313,14 +7229,14 @@
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name vom "
 "Original abweicht."
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil er ung端ltig "
 "ist."
 
-#: ../libpurple/protocols/oscar/oscar.c:4025
+#: libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7329,7 +7245,7 @@
 "Fehler 0x%04x: Kann den Benutzernamen nicht formatieren, weil der Name zu "
 "lang ist."
 
-#: ../libpurple/protocols/oscar/oscar.c:4028
+#: libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7338,7 +7254,7 @@
 "Error 0x%04x: Kann die E-Mail-Adresse nicht 辰ndern, weil es schon eine "
 "laufende Anfrage f端r diesen Benutzernamen gibt."
 
-#: ../libpurple/protocols/oscar/oscar.c:4031
+#: libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7347,7 +7263,7 @@
 "Fehler 0x%04x: Kann die E-Mail-Adresse nicht 辰ndern, weil es schon zu viele "
 "E-Mail-Adressen gibt, die zum Benutzernamen geh旦ren."
 
-#: ../libpurple/protocols/oscar/oscar.c:4034
+#: libpurple/protocols/oscar/oscar.c:4029
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7356,31 +7272,32 @@
 "Fehler 0x%04x: Kann die E-Mail-Adresse nicht 辰ndern, weil die angegebene "
 "Adresse falsch ist."
 
-#: ../libpurple/protocols/oscar/oscar.c:4037
+#: libpurple/protocols/oscar/oscar.c:4032
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fehler 0x%04x: Unbekannter Fehler."
 
-#: ../libpurple/protocols/oscar/oscar.c:4047
+#: libpurple/protocols/oscar/oscar.c:4042
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Die E-Mail-Adresse f端r %s ist %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4049
+#: libpurple/protocols/oscar/oscar.c:4044
 msgid "Account Info"
 msgstr "Konto-Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:4221
-msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
+#: libpurple/protocols/oscar/oscar.c:4216
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Ihr IM-Bild wurde nicht gesendet. Sie m端ssen direkt verbunden sein, um IM-"
 "Bilder senden zu k旦nnen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4487
+#: libpurple/protocols/oscar/oscar.c:4487
 msgid "Unable to set AIM profile."
 msgstr "Kann das AIM-Profil nicht setzen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4488
+#: libpurple/protocols/oscar/oscar.c:4488
 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 "
@@ -7390,7 +7307,7 @@
 "Anmeldeprozedur abgeschlossen war. Das Profil bleibt ungesetzt. Versuchen "
 "Sie es wieder, wenn Sie vollst辰ndig verbunden sind."
 
-#: ../libpurple/protocols/oscar/oscar.c:4502
+#: libpurple/protocols/oscar/oscar.c:4502
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7405,11 +7322,11 @@
 "Die maximale Profilgr旦�e von %d Bytes wurde 端berschritten.  Es wurde f端r Sie "
 "abgeschnitten."
 
-#: ../libpurple/protocols/oscar/oscar.c:4507
+#: libpurple/protocols/oscar/oscar.c:4507
 msgid "Profile too long."
 msgstr "Profil zu lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4552
+#: libpurple/protocols/oscar/oscar.c:4552
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7424,11 +7341,11 @@
 "Die Abwesenheitsnachricht hat die maximale Gr旦�e von %d Bytes "
 "端berschritten.  Sie wurde f端r Sie abgeschnitten."
 
-#: ../libpurple/protocols/oscar/oscar.c:4557
+#: libpurple/protocols/oscar/oscar.c:4557
 msgid "Away message too long."
 msgstr "Abwesenheitsmitteilungen zu lang."
 
-#: ../libpurple/protocols/oscar/oscar.c:4626
+#: libpurple/protocols/oscar/oscar.c:4626
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
@@ -7440,17 +7357,17 @@
 "beginnen und nur Buchstaben, Ziffern und Leerzeichen enthalten oder nur aus "
 "Ziffern bestehen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4628
-#: ../libpurple/protocols/oscar/oscar.c:5051
-#: ../libpurple/protocols/oscar/oscar.c:5066
+#: libpurple/protocols/oscar/oscar.c:4628
+#: libpurple/protocols/oscar/oscar.c:5051
+#: libpurple/protocols/oscar/oscar.c:5066
 msgid "Unable To Add"
 msgstr "Kann nicht hinzuf端gen"
 
-#: ../libpurple/protocols/oscar/oscar.c:4732
+#: libpurple/protocols/oscar/oscar.c:4732
 msgid "Unable To Retrieve Buddy List"
 msgstr "Konnte Buddy-Liste nicht laden"
 
-#: ../libpurple/protocols/oscar/oscar.c:4733
+#: libpurple/protocols/oscar/oscar.c:4733
 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."
@@ -7459,16 +7376,16 @@
 "versenden. Ihre Buddy-Liste ist nicht verloren und wird wahrscheinlich in "
 "ein paar Stunden wieder verf端gbar sein."
 
-#: ../libpurple/protocols/oscar/oscar.c:4937
-#: ../libpurple/protocols/oscar/oscar.c:4938
-#: ../libpurple/protocols/oscar/oscar.c:4943
-#: ../libpurple/protocols/oscar/oscar.c:5120
-#: ../libpurple/protocols/oscar/oscar.c:5121
-#: ../libpurple/protocols/oscar/oscar.c:5126
+#: libpurple/protocols/oscar/oscar.c:4937
+#: libpurple/protocols/oscar/oscar.c:4938
+#: libpurple/protocols/oscar/oscar.c:4943
+#: libpurple/protocols/oscar/oscar.c:5120
+#: libpurple/protocols/oscar/oscar.c:5121
+#: libpurple/protocols/oscar/oscar.c:5126
 msgid "Orphans"
 msgstr "Waisen"
 
-#: ../libpurple/protocols/oscar/oscar.c:5049
+#: libpurple/protocols/oscar/oscar.c:5049
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7477,17 +7394,17 @@
 "Kann den Buddy %s nicht hinzuf端gen, weil Sie schon zu viele Buddys in Ihrer "
 "Buddy-Liste haben. Bitte entfernen Sie einen und versuchen Sie es nochmal."
 
-#: ../libpurple/protocols/oscar/oscar.c:5049
-#: ../libpurple/protocols/oscar/oscar.c:5064
+#: libpurple/protocols/oscar/oscar.c:5049
+#: libpurple/protocols/oscar/oscar.c:5064
 msgid "(no name)"
 msgstr "(kein Name)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5063
+#: libpurple/protocols/oscar/oscar.c:5063
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
 msgstr "Konnte den Buddy %s aus einem unbekannten Grund nicht hinzuf端gen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5157
+#: libpurple/protocols/oscar/oscar.c:5157
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7496,24 +7413,24 @@
 "Der Benutzer %s hat Ihnen gestattet, Sie zu seiner Buddy-Liste hinzuzuf端gen. "
 "M旦chten Sie ihn hinzuf端gen?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5165
+#: libpurple/protocols/oscar/oscar.c:5165
 msgid "Authorization Given"
 msgstr "Autorisierung wurde gegeben"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5238
+#: libpurple/protocols/oscar/oscar.c:5238
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "Der Benutzer %s hat Ihre Anfrage akzeptiert, ihn bzw. sie zu Ihrer Buddy-"
 "Liste hinzuf端gen zu d端rfen."
 
-#: ../libpurple/protocols/oscar/oscar.c:5239
+#: libpurple/protocols/oscar/oscar.c:5239
 msgid "Authorization Granted"
 msgstr "Autorisierung erteilt"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5242
+#: libpurple/protocols/oscar/oscar.c:5242
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7524,53 +7441,52 @@
 "Liste hinzuf端gen zu d端rfen, und zwar aus folgendem Grund:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5243
+#: libpurple/protocols/oscar/oscar.c:5243
 msgid "Authorization Denied"
 msgstr "Autorisierung abgelehnt"
 
-#: ../libpurple/protocols/oscar/oscar.c:5279
-#: ../libpurple/protocols/toc/toc.c:1371
+#: libpurple/protocols/oscar/oscar.c:5279 libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "A_ustausch:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5319
+#: libpurple/protocols/oscar/oscar.c:5319
 msgid "Invalid chat name specified."
 msgstr "Ung端ltiger Chat-Name angegeben."
 
-#: ../libpurple/protocols/oscar/oscar.c:5388
+#: libpurple/protocols/oscar/oscar.c:5388
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Ihr IM-Bild wurde nicht gesendet. Sie k旦nnen keine IM-Bilder in AIM-Chats "
 "senden."
 
-#: ../libpurple/protocols/oscar/oscar.c:5548
-#: ../libpurple/protocols/oscar/oscar.c:5553
+#: libpurple/protocols/oscar/oscar.c:5548
+#: libpurple/protocols/oscar/oscar.c:5553
 msgid "Away Message"
 msgstr "Abwesenheitsnachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:5553
+#: libpurple/protocols/oscar/oscar.c:5553
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(empfange)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5753
+#: libpurple/protocols/oscar/oscar.c:5753
 msgid "iTunes Music Store Link"
 msgstr "iTunes Music Store Link"
 
-#: ../libpurple/protocols/oscar/oscar.c:5861
+#: libpurple/protocols/oscar/oscar.c:5861
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Buddy-Kommentar f端r %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5862
+#: libpurple/protocols/oscar/oscar.c:5862
 msgid "Buddy Comment:"
 msgstr "Buddy-Kommentar:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5909
+#: libpurple/protocols/oscar/oscar.c:5909
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Sie haben eine direkte IM-Verbindung mit %s ausgew辰hlt."
 
-#: ../libpurple/protocols/oscar/oscar.c:5913
+#: libpurple/protocols/oscar/oscar.c:5913
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7578,66 +7494,66 @@
 "Da dies Ihre IP-Adresse sichtbar macht, kann es als Sicherheitsrisiko "
 "betrachtet werden. M旦chten Sie fortfahren?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5919
-#: ../libpurple/protocols/oscar/peer.c:1022
+#: libpurple/protocols/oscar/oscar.c:5919
+#: libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "V_erbinden"
 
-#: ../libpurple/protocols/oscar/oscar.c:5954
+#: libpurple/protocols/oscar/oscar.c:5954
 msgid "Get AIM Info"
 msgstr "AIM-Info"
 
-#: ../libpurple/protocols/oscar/oscar.c:5960
+#: libpurple/protocols/oscar/oscar.c:5960
 msgid "Edit Buddy Comment"
 msgstr "Buddy-Kommentar bearbeiten"
 
-#: ../libpurple/protocols/oscar/oscar.c:5968
+#: libpurple/protocols/oscar/oscar.c:5968
 msgid "Get Status Msg"
 msgstr "Abwesenheitsmitteilung abrufen"
 
-#: ../libpurple/protocols/oscar/oscar.c:5981
+#: libpurple/protocols/oscar/oscar.c:5981
 msgid "Direct IM"
 msgstr "Direkte Nachricht"
 
-#: ../libpurple/protocols/oscar/oscar.c:6003
+#: libpurple/protocols/oscar/oscar.c:6003
 msgid "Re-request Authorization"
 msgstr "Nochmal nach Autorisierung fragen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6062
+#: libpurple/protocols/oscar/oscar.c:6062
 msgid "Require authorization"
 msgstr "Autorisierung erforderlich"
 
-#: ../libpurple/protocols/oscar/oscar.c:6065
+#: libpurple/protocols/oscar/oscar.c:6065
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web aware (Wenn Sie dies aktivieren, werden Sie SPAM erhalten!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6070
+#: libpurple/protocols/oscar/oscar.c:6070
 msgid "ICQ Privacy Options"
 msgstr "ICQ Privatsph辰renoptionen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6089
+#: libpurple/protocols/oscar/oscar.c:6089
 msgid "The new formatting is invalid."
 msgstr "Die neue Formatierung ist ung端ltig."
 
-#: ../libpurple/protocols/oscar/oscar.c:6090
+#: libpurple/protocols/oscar/oscar.c:6090
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Benutzernamen-Formatierung kann nur die Gro�-/Kleinschreibung und "
 "Leerzeichen 辰ndern."
 
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: libpurple/protocols/oscar/oscar.c:6143
 msgid "Change Address To:"
 msgstr "�ndere die Adresse zu:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6189
+#: libpurple/protocols/oscar/oscar.c:6189
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Sie warten derzeit auf keine Autorisierungen</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6192
+#: libpurple/protocols/oscar/oscar.c:6192
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Sie warten auf Autorisierung von den folgenden Buddys"
 
-#: ../libpurple/protocols/oscar/oscar.c:6193
+#: libpurple/protocols/oscar/oscar.c:6193
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7646,73 +7562,73 @@
 "den Buddy mit einem Rechtsklick anklicken und ��Nochmal nach Autorisierung "
 "fragen�� ausw辰hlen."
 
-#: ../libpurple/protocols/oscar/oscar.c:6210
+#: libpurple/protocols/oscar/oscar.c:6210
 msgid "Find Buddy by E-Mail"
 msgstr "Suche Buddys nach E-Mail-Adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6211
+#: libpurple/protocols/oscar/oscar.c:6211
 msgid "Search for a buddy by e-mail address"
 msgstr "Suche nach einem Buddy mit einer bestimmten E-Mail-Adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6212
+#: libpurple/protocols/oscar/oscar.c:6212
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Geben Sie die E-Mail-Adresse des Buddys ein, nach dem Sie suchen."
 
-#: ../libpurple/protocols/oscar/oscar.c:6215
+#: libpurple/protocols/oscar/oscar.c:6215
 msgid "_Search"
 msgstr "_Suchen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6373
+#: libpurple/protocols/oscar/oscar.c:6373
 msgid "Set User Info (URL)..."
 msgstr "Benutzer-Info (URL) setzen..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6384
+#: libpurple/protocols/oscar/oscar.c:6384
 msgid "Change Password (URL)"
 msgstr "�ndere Passwort (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6388
+#: libpurple/protocols/oscar/oscar.c:6388
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfiguriere IM-Weiterleitung (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6398
+#: libpurple/protocols/oscar/oscar.c:6398
 msgid "Set Privacy Options..."
 msgstr "Privatsph辰renoptionen setzen..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: libpurple/protocols/oscar/oscar.c:6405
 msgid "Confirm Account"
 msgstr "Konto best辰tigen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6409
+#: libpurple/protocols/oscar/oscar.c:6409
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Zeige die aktuell registrierte E-Mail-Adresse"
 
-#: ../libpurple/protocols/oscar/oscar.c:6413
+#: libpurple/protocols/oscar/oscar.c:6413
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "�ndere die aktuell registrierte E-Mail-Adresse..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6420
+#: libpurple/protocols/oscar/oscar.c:6420
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Zeige Buddys, von denen Sie Autorisierung erwarten"
 
-#: ../libpurple/protocols/oscar/oscar.c:6426
+#: libpurple/protocols/oscar/oscar.c:6426
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Suche Buddys nach E-Mail-Adresse..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6431
+#: libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by Information"
 msgstr "Suche Buddy nach Information"
 
-#: ../libpurple/protocols/oscar/oscar.c:6499
+#: libpurple/protocols/oscar/oscar.c:6499
 msgid "Use recent buddies group"
 msgstr "Benutze neueste Gruppe"
 
-#: ../libpurple/protocols/oscar/oscar.c:6502
+#: libpurple/protocols/oscar/oscar.c:6502
 msgid "Show how long you have been idle"
 msgstr "Anzeigen, wie lange ich unt辰tig war"
 
-#: ../libpurple/protocols/oscar/oscar.c:6657
+#: libpurple/protocols/oscar/oscar.c:6657
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7720,26 +7636,27 @@
 "Benutze immer den AIM/ICQ-Proxyserver\n"
 "(langsamer, aber zeigt Ihre IP-Adresse nicht)"
 
-#: ../libpurple/protocols/oscar/peer.c:674
+#: libpurple/protocols/oscar/peer.c:674
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Frage %s, ob er sich zu uns auf %s:%hu f端r Direkt-IM verbinden m旦chte."
 
-#: ../libpurple/protocols/oscar/peer.c:759
+#: libpurple/protocols/oscar/peer.c:759
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Verbindungsversuch mit %s:%hu."
 
-#: ../libpurple/protocols/oscar/peer.c:833
+#: libpurple/protocols/oscar/peer.c:833
+#, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Verbindungsversuch 端ber einen Proxyserver."
 
-#: ../libpurple/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 hat nach einer direkten Verbindung zu %s gefragt"
 
-#: ../libpurple/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 "
@@ -7749,398 +7666,393 @@
 "ist notwendig f端r IM-Bilder. Da Ihre IP-Adresse verwendet wird, kann dies "
 "eine Verletzung der Privatsph辰re bedeuten."
 
-#: ../libpurple/protocols/qq/buddy_info.c:39
+#: libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Prim辰re Informationen"
 
-#: ../libpurple/protocols/qq/buddy_info.c:41
+#: libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr "Pers旦nliche Vorstellung"
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
+#: libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "QQ-Nummer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:47
+#: libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "Land/Region"
 
-#: ../libpurple/protocols/qq/buddy_info.c:48
+#: libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "Provinz/Staat"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
+#: libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "Horoskopsymbol"
 
-#: ../libpurple/protocols/qq/buddy_info.c:52
+#: libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Sternzeichen"
 
-#: ../libpurple/protocols/qq/buddy_info.c:53
+#: libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Blutgruppe"
 
-#: ../libpurple/protocols/qq/buddy_info.c:54
+#: libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "College"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
+#: libpurple/protocols/qq/buddy_info.c:55
 msgid "Email"
 msgstr "E-Mail"
 
-#: ../libpurple/protocols/qq/buddy_info.c:57
+#: libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "PLZ"
 
-#: ../libpurple/protocols/qq/buddy_info.c:58
+#: libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "Handy-Telefonnummer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:59
+#: libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
+#: libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "Wassermann"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
+#: libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "Fische"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
+#: libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Widder"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
+#: libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "Stier"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
+#: libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "Zwillinge"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
+#: libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "Krebs"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
+#: libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "L旦we"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
+#: libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Jungfrau"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
+#: libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "Waage"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
+#: libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Skorpion"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
+#: libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Sch端tze"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
+#: libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Steinbock"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
+#: libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "Ratte"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
+#: libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "Ochse"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
+#: libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Tiger"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
+#: libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Kaninchen"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
+#: libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Drache"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
+#: libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Schlange"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
+#: libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "Pferd"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
+#: libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Gans"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
+#: libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Affe"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
+#: libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Hahn"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
+#: libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Hund"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
+#: libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Schwein"
 
-#: ../libpurple/protocols/qq/buddy_info.c:78
+#: libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "Andere"
 
-#: ../libpurple/protocols/qq/buddy_info.c:481
-#: ../libpurple/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 "Meine Informationen bearbeiten"
 
-#: ../libpurple/protocols/qq/buddy_info.c:483
+#: libpurple/protocols/qq/buddy_info.c:483
 msgid "Update my information"
 msgstr "Meine Informationen aktualisieren"
 
-#: ../libpurple/protocols/qq/buddy_info.c:507
+#: libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "Ihre Informationen wurden aktualisiert"
 
-#: ../libpurple/protocols/qq/buddy_info.c:560
+#: libpurple/protocols/qq/buddy_info.c:560
 #, c-format
 msgid ""
 "Setting custom faces is not currently supported. Please choose an image from "
 "%s."
 msgstr ""
 "Das Setzen von benutzerdefinierten Gesichtern wird momentan nicht "
-"unterst端tzt. Bitte w辰hlen Sie ein BIld von %s."
-
-#: ../libpurple/protocols/qq/buddy_info.c:577
-#: ../libpurple/protocols/qq/buddy_info.c:590
+"unterst端tzt. Bitte w辰hlen Sie ein Bild von %s."
+
+#: libpurple/protocols/qq/buddy_info.c:577
+#: libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "Ung端ltiges QQ-Gesicht"
 
 # c-format
-#: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:136
+#: libpurple/protocols/qq/buddy_opt.c:208
+#: libpurple/protocols/qq/group_opt.c:136
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Sie haben die Anfrage von %d abgelehnt"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:137
+#: libpurple/protocols/qq/buddy_opt.c:209
+#: libpurple/protocols/qq/group_opt.c:137
 msgid "Input your reason:"
 msgstr "Geben Sie Ihren Grund an:"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
+#: libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Anfrage ablehnen"
 
 #. title
-#: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:141
+#: libpurple/protocols/qq/buddy_opt.c:213
+#: libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
 msgstr "Tut mir Leid, du bist nicht mein Typ..."
 
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:144
-#: ../libpurple/protocols/qq/group_opt.c:127
-#: ../libpurple/protocols/qq/sys_msg.c:91
-#: ../libpurple/protocols/qq/sys_msg.c:249
+#: libpurple/protocols/qq/buddy_opt.c:214
+#: libpurple/protocols/qq/group_im.c:144
+#: libpurple/protocols/qq/group_opt.c:127 libpurple/protocols/qq/sys_msg.c:91
+#: libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Ablehnen"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:277
+#: libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request fails"
 msgstr "Benutzer hinzuf端gen, wenn Autorisierungsanfrage fehlschl辰gt"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:308
+#: libpurple/protocols/qq/buddy_opt.c:308
 msgid "You have successfully removed a buddy"
 msgstr "Sie haben einen Buddy entfernt"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:336
+#: libpurple/protocols/qq/buddy_opt.c:336
 msgid "You have successfully removed yourself from a buddy"
 msgstr "Sie haben sich erfolgreich von einem Buddy entfernt"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:402
+#: libpurple/protocols/qq/buddy_opt.c:402
 #, c-format
 msgid "User %d needs authentication"
 msgstr "Benutzer %d ben旦tigt Authentifizierung"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
-#: ../libpurple/protocols/qq/group_join.c:136
+#: libpurple/protocols/qq/buddy_opt.c:404
+#: libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Anfrage hier eingeben"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:405
-#: ../libpurple/protocols/qq/group_join.c:137
+#: libpurple/protocols/qq/buddy_opt.c:405
+#: libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "M旦chten Sie mein Freund sein?"
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:143
+#: libpurple/protocols/qq/buddy_opt.c:406
+#: libpurple/protocols/qq/group_join.c:138
+#: libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Senden"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:416
+#: libpurple/protocols/qq/buddy_opt.c:416
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "Sie haben %d zu Ihrer Buddy-Liste hinzugef端gt"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:513
+#: libpurple/protocols/qq/buddy_opt.c:513
 msgid "QQid Error"
 msgstr "QQid-Fehler"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:514
+#: libpurple/protocols/qq/buddy_opt.c:514
 msgid "Invalid QQid"
 msgstr "Ung端ltige QQid"
 
-#: ../libpurple/protocols/qq/group.c:65
+#: libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID: "
 
-#: ../libpurple/protocols/qq/group.c:98
+#: libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "Gruppen-ID"
 
-#: ../libpurple/protocols/qq/group.c:100
+#: libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Ersteller"
 
-#: ../libpurple/protocols/qq/group.c:103
+#: libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Gruppenbeschreibung"
 
-#: ../libpurple/protocols/qq/group.c:109
+#: libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "Autorisieren"
 
-#: ../libpurple/protocols/qq/group.c:119
+#: libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "QQ-Qun"
 
-#: ../libpurple/protocols/qq/group.c:120
+#: libpurple/protocols/qq/group.c:120
 msgid "Please input external group ID"
 msgstr "Bitte geben sie die externe Gruppen-ID an"
 
-#: ../libpurple/protocols/qq/group.c:121
+#: libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "Sie k旦nnen nur nach permanenten QQ-Gruppen suchen\n"
 
-#: ../libpurple/protocols/qq/group_im.c:126
+#: libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "Benutzer %d m旦chte der Gruppe %d beitreten"
 
-#: ../libpurple/protocols/qq/group_im.c:127
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:195
+#: libpurple/protocols/qq/group_im.c:127 libpurple/protocols/qq/group_im.c:181
+#: libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "Grund: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:136
-#: ../libpurple/protocols/qq/group_im.c:183
-#: ../libpurple/protocols/qq/group_im.c:223
-#: ../libpurple/protocols/qq/group_im.c:258
-#: ../libpurple/protocols/qq/group_im.c:292
-#: ../libpurple/protocols/qq/group_join.c:233
-#: ../libpurple/protocols/qq/group_join.c:359
-#: ../libpurple/protocols/qq/group_opt.c:235
-#: ../libpurple/protocols/qq/group_opt.c:305
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: libpurple/protocols/qq/group_im.c:136 libpurple/protocols/qq/group_im.c:183
+#: libpurple/protocols/qq/group_im.c:223 libpurple/protocols/qq/group_im.c:258
+#: libpurple/protocols/qq/group_im.c:292
+#: libpurple/protocols/qq/group_join.c:233
+#: libpurple/protocols/qq/group_join.c:359
+#: libpurple/protocols/qq/group_opt.c:235
+#: libpurple/protocols/qq/group_opt.c:305
+#: libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr "QQ-Qun-Operation"
 
-#: ../libpurple/protocols/qq/group_im.c:141
-#: ../libpurple/protocols/qq/group_opt.c:128
-#: ../libpurple/protocols/qq/sys_msg.c:92
-#: ../libpurple/protocols/qq/sys_msg.c:251
+#: libpurple/protocols/qq/group_im.c:141
+#: libpurple/protocols/qq/group_opt.c:128 libpurple/protocols/qq/sys_msg.c:92
+#: libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Akzeptieren"
 
-#: ../libpurple/protocols/qq/group_im.c:180
+#: libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "Ihre Anfrage, der Gruppe %d beizutreten wurde von Admin %d abgelehnt"
 
-#: ../libpurple/protocols/qq/group_im.c:221
+#: libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr "Ihre Anfrage, der Gruppe %d beizutreten wurde von Admin %d akzeptiert"
 
-#: ../libpurple/protocols/qq/group_im.c:257
+#: libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "Sie [%d] haben die Gruppe \"%d\" verlassen"
 
-#: ../libpurple/protocols/qq/group_im.c:291
+#: libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "Sie [%d] wurden der Gruppe \"%d\" hinzugef端gt"
 
-#: ../libpurple/protocols/qq/group_im.c:292
+#: libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Diese Gruppe wurde Ihrer Buddy-Liste hinzugef端gt"
 
-#: ../libpurple/protocols/qq/group_internal.c:41
+#: libpurple/protocols/qq/group_internal.c:41
 msgid "I am not member"
 msgstr "Ich bin kein Mitglied"
 
-#: ../libpurple/protocols/qq/group_internal.c:44
+#: libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "Ich bin Mitglied"
 
-#: ../libpurple/protocols/qq/group_internal.c:47
+#: libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "Ich m旦chte beitreten"
 
-#: ../libpurple/protocols/qq/group_internal.c:50
+#: libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "Ich bin der Admin"
 
-#: ../libpurple/protocols/qq/group_internal.c:53
+#: libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Unbekannter Status"
 
-#: ../libpurple/protocols/qq/group_join.c:82
+#: libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "Dieser Gruppe k旦nnen andere nicht beitreten"
 
-#: ../libpurple/protocols/qq/group_join.c:233
+#: libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully exited the group"
 msgstr "Sie haben die Gruppe verlassen"
 
-#: ../libpurple/protocols/qq/group_join.c:257
+#: libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "QQ-Gruppenauthentifikation"
 
-#: ../libpurple/protocols/qq/group_join.c:258
+#: libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "Ihre Autorisierungsoperation wurde vom QQ-Server akzeptiert"
 
-#: ../libpurple/protocols/qq/group_join.c:329
+#: libpurple/protocols/qq/group_join.c:329
 msgid "You inputted a group id outside the acceptable range"
 msgstr "Sie haben eine Gruppen-ID au�erhalb des erlaubten Bereichs angegeben"
 
-#: ../libpurple/protocols/qq/group_join.c:360
+#: libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure to exit this Qun?"
 msgstr "Wollen Sie dieses Qun wirklich verlassen?"
 
-#: ../libpurple/protocols/qq/group_join.c:362
+#: libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -8148,172 +8060,172 @@
 "Beachten Sie, dass diese Operation den Qun entfernen k旦nnte, \n"
 "wenn Sie der Ersteller sind."
 
-#: ../libpurple/protocols/qq/group_join.c:367
+#: libpurple/protocols/qq/group_join.c:367
 msgid "Go ahead"
 msgstr "Fortfahren"
 
-#: ../libpurple/protocols/qq/group_network.c:92
+#: libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Code [0x%02X]: %s"
 
-#: ../libpurple/protocols/qq/group_network.c:93
+#: libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr "Gruppenoperationsfehler"
 
 #. we wanna see window
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:88
+#: libpurple/protocols/qq/group_opt.c:124 libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "Wollen sie die Anfrage akzeptieren?"
 
-#: ../libpurple/protocols/qq/group_opt.c:235
+#: libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modify Qun member"
 msgstr "Sie haben die Qun-Mitgliedschaft erfolgreich modifiziert"
 
-#: ../libpurple/protocols/qq/group_opt.c:305
+#: libpurple/protocols/qq/group_opt.c:305
 msgid "You have successfully modify Qun information"
 msgstr "Sie haben die Qun-Information erfolgreich modifiziert"
 
-#: ../libpurple/protocols/qq/group_opt.c:392
+#: libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr "Sie haben einen Qun angelegt"
 
-#: ../libpurple/protocols/qq/group_opt.c:394
+#: libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
 msgstr "M旦chten Sie jetzt die Qun-Details einstellen?"
 
-#: ../libpurple/protocols/qq/group_opt.c:398
+#: libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "Setup"
 
-#: ../libpurple/protocols/qq/im.c:432
+#: libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Systemnachricht"
 
-#: ../libpurple/protocols/qq/im.c:576
+#: libpurple/protocols/qq/im.c:576
 msgid "Server ACK"
 msgstr "Server-ACK"
 
-#: ../libpurple/protocols/qq/im.c:576
+#: libpurple/protocols/qq/im.c:576
 msgid "Failed to send IM."
 msgstr "Senden der Nachricht fehlgeschlagen."
 
-#: ../libpurple/protocols/qq/keep_alive.c:87
+#: libpurple/protocols/qq/keep_alive.c:87
 msgid "Keep alive error, seems connection lost!"
-msgstr "\"Keep-alive\"-Fehler, wahrscheinlich ist die Verbindung zusammengebrochen!"
-
-#: ../libpurple/protocols/qq/login_logout.c:408
+msgstr ""
+"\"Keep-alive\"-Fehler, wahrscheinlich ist die Verbindung zusammengebrochen!"
+
+#: libpurple/protocols/qq/login_logout.c:408
 msgid "Request login token error!"
 msgstr "Fehler beim Anmelden!"
 
-#: ../libpurple/protocols/qq/login_logout.c:486
+#: libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
 msgstr "Anmeldung fehlgeschlagen, Debugmitschnitt beachten"
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
-#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
-#: ../libpurple/protocols/yahoo/ycht.c:549
+#: libpurple/protocols/qq/qq.c:139 libpurple/protocols/toc/toc.c:173
+#: libpurple/protocols/yahoo/yahoo_filexfer.c:109
+#: libpurple/protocols/yahoo/yahoo_filexfer.c:189
+#: libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Verbindung nicht m旦glich."
 
-#: ../libpurple/protocols/qq/qq.c:186
+#: libpurple/protocols/qq/qq.c:186
 #, c-format
 msgid "Unknown-%d"
 msgstr "Unbekannt-%d"
 
-#: ../libpurple/protocols/qq/qq.c:209
+#: libpurple/protocols/qq/qq.c:209
 #, c-format
 msgid "%s Address"
 msgstr "%s Adresse"
 
-#: ../libpurple/protocols/qq/qq.c:240
+#: libpurple/protocols/qq/qq.c:240
 msgid "Level"
 msgstr "Stufe"
 
-#: ../libpurple/protocols/qq/qq.c:278
+#: libpurple/protocols/qq/qq.c:278
 msgid "QQ: Available"
 msgstr "QQ: Verf端gbar"
 
-#: ../libpurple/protocols/qq/qq.c:282
+#: libpurple/protocols/qq/qq.c:282
 msgid "QQ: Away"
 msgstr "QQ: Abwesend"
 
-#: ../libpurple/protocols/qq/qq.c:286
+#: libpurple/protocols/qq/qq.c:286
 msgid "QQ: Invisible"
 msgstr "QQ: Unsichtbar"
 
-#: ../libpurple/protocols/qq/qq.c:290
+#: libpurple/protocols/qq/qq.c:290
 msgid "QQ: Offline"
 msgstr "QQ: Offline"
 
-#: ../libpurple/protocols/qq/qq.c:371
+#: libpurple/protocols/qq/qq.c:371
 msgid "Invalid name"
 msgstr "QQ: Ung端ltiger Name"
 
-#: ../libpurple/protocols/qq/qq.c:437
+#: libpurple/protocols/qq/qq.c:437
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Aktuell online:</b> %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:438
+#: libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Letzte Aktualisierung</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:442
+#: libpurple/protocols/qq/qq.c:442
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Verbindungsmodus</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:443
+#: libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>Server-IP</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Meine 旦ffentlich IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:449
+#: libpurple/protocols/qq/qq.c:449
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Anmeldezeit</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:450
+#: libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Letzte Anmelde-IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Letzte Anmeldezeit</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:455
+#: libpurple/protocols/qq/qq.c:455
 msgid "Login Information"
 msgstr "Login-Informationen"
 
-#: ../libpurple/protocols/qq/qq.c:531
+#: libpurple/protocols/qq/qq.c:531
 msgid "Modify My Information"
 msgstr "Meine Informationen bearbeiten"
 
-#: ../libpurple/protocols/qq/qq.c:534 ../libpurple/protocols/toc/toc.c:1680
+#: libpurple/protocols/qq/qq.c:534 libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Passwort 辰ndern"
 
-#: ../libpurple/protocols/qq/qq.c:537
+#: libpurple/protocols/qq/qq.c:537
 msgid "Show Login Information"
 msgstr "Login-Informationen anzeigen"
 
-#: ../libpurple/protocols/qq/qq.c:558
+#: libpurple/protocols/qq/qq.c:558
 msgid "Exit this QQ Qun"
 msgstr "Dieses QQ-Qun verlassen"
 
-#: ../libpurple/protocols/qq/qq.c:582
+#: libpurple/protocols/qq/qq.c:582
 msgid "Block this buddy"
 msgstr "Diesen Buddy blockieren"
 
@@ -8327,247 +8239,249 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
+#: libpurple/protocols/qq/qq.c:723 libpurple/protocols/qq/qq.c:725
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ-Protokoll-Plugin"
 
-#: ../libpurple/protocols/qq/qq.c:750
+#: libpurple/protocols/qq/qq.c:750
 msgid "Login in TCP"
 msgstr "Anmeldung mit TCP"
 
-#: ../libpurple/protocols/qq/qq.c:753
+#: libpurple/protocols/qq/qq.c:753
 msgid "Login Hidden"
 msgstr "Unsichtbar anmelden"
 
-#: ../libpurple/protocols/qq/qq_proxy.c:497
+#: libpurple/protocols/qq/qq_proxy.c:497
 msgid "Socket send error"
 msgstr "Socket-Sendefehler"
 
-#: ../libpurple/protocols/qq/qq_proxy.c:500
+#: libpurple/protocols/qq/qq_proxy.c:500
 msgid "Connection refused"
 msgstr "Verbindung abgelehnt"
 
-#: ../libpurple/protocols/qq/recv_core.c:309
+#: libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
 msgstr "Socket-Fehler"
 
-#: ../libpurple/protocols/qq/recv_core.c:319
+#: libpurple/protocols/qq/recv_core.c:319
 msgid "Unable to read from socket"
 msgstr "Socket kann nicht gelesen werden"
 
-#: ../libpurple/protocols/qq/send_file.c:707
+#: libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d hat die Datei %s abgelehnt"
 
-#: ../libpurple/protocols/qq/send_file.c:710
-#: ../libpurple/protocols/qq/send_file.c:739
+#: libpurple/protocols/qq/send_file.c:710
+#: libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "Datei端bertragung"
 
-#: ../libpurple/protocols/qq/send_file.c:736
+#: libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d hat die �bertragung von %s abgebrochen"
 
-#: ../libpurple/protocols/qq/sendqueue.c:123
+#: libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "Verbindung verloren"
 
 #. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:131
+#: libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "Anmeldung fehlgeschlagen, keine Antwort"
 
-#: ../libpurple/protocols/qq/sys_msg.c:112
+#: libpurple/protocols/qq/sys_msg.c:112
 msgid "Do you wanna add this buddy?"
 msgstr "M旦chten Sie diesen Buddy zu Ihrer Buddy-Liste hinzuf端gen?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:168
+#: libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "Sie wurden von %s hinzugef端gt"
 
-#: ../libpurple/protocols/qq/sys_msg.c:171
+#: libpurple/protocols/qq/sys_msg.c:171
 msgid "Would like to add him?"
 msgstr "M旦chten Sie ihn hinzuf端gen?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:178
+#: libpurple/protocols/qq/sys_msg.c:178
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s hat Sie [%s] hinzugef端gt"
 
-#: ../libpurple/protocols/qq/sys_msg.c:194
+#: libpurple/protocols/qq/sys_msg.c:194
 #, c-format
 msgid "User %s rejected your request"
 msgstr "Benutzer %s hat Ihre Anfrage abgelehnt"
 
-#: ../libpurple/protocols/qq/sys_msg.c:214
+#: libpurple/protocols/qq/sys_msg.c:214
 #, c-format
 msgid "User %s has approved your request"
 msgstr "Benutzer %s hat Ihre Anfrage akzeptiert"
 
 #. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:241
+#: libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s m旦chte Sie [%s] als Freund hinzuf端gen"
 
-#: ../libpurple/protocols/qq/sys_msg.c:242
+#: libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Nachricht: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:264
+#: libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s ist nicht in Ihrer Buddy-Liste"
 
-#: ../libpurple/protocols/qq/sys_msg.c:266
+#: libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "M旦chten Sie ihn hinzuf端gen?"
 
-#: ../libpurple/protocols/sametime/sametime.c:417
+#: libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Verbindung geschlossen (schreibend)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1290
+#: libpurple/protocols/sametime/sametime.c:1290
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Gruppentitel:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1291
+#: libpurple/protocols/sametime/sametime.c:1291
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notes-Gruppen-ID:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
+#: libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "Info for Group %s"
 msgstr "Info zur Gruppe %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
+#: libpurple/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
 msgstr "Notes Adressbuch-Information"
 
-#: ../libpurple/protocols/sametime/sametime.c:1327
+#: libpurple/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
 msgstr "Gruppe zu Konferenz einladen..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1337
+#: libpurple/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
 msgstr "Notes Adressbuch-Info anzeigen"
 
-#: ../libpurple/protocols/sametime/sametime.c:1504
+#: libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
 msgstr "Sende Handshake"
 
-#: ../libpurple/protocols/sametime/sametime.c:1509
+#: libpurple/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Warte auf Best辰tigung des Handshakes"
 
-#: ../libpurple/protocols/sametime/sametime.c:1514
+#: libpurple/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Handshake best辰tigt, sende Login"
 
-#: ../libpurple/protocols/sametime/sametime.c:1519
+#: libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
 msgstr "Warte auf Login-Best辰tigung"
 
-#: ../libpurple/protocols/sametime/sametime.c:1524
+#: libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
 msgstr "Login umgeleitet"
 
-#: ../libpurple/protocols/sametime/sametime.c:1530
+#: libpurple/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
 msgstr "Erzwinge Login"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
+#: libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
 msgstr "Login best辰tigt"
 
-#: ../libpurple/protocols/sametime/sametime.c:1539
+#: libpurple/protocols/sametime/sametime.c:1539
 msgid "Starting Services"
 msgstr "Starte Dienste"
 
-#: ../libpurple/protocols/sametime/sametime.c:1544
+#: libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../libpurple/protocols/sametime/sametime.c:1645
-#, c-format
-msgid "A Sametime administrator has issued the following announcement on server %s"
-msgstr "Ein Sametime-Administrator hat die folgende Ank端ndigung auf Server %s gemacht"
-
-#: ../libpurple/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 ""
+"Ein Sametime-Administrator hat die folgende Ank端ndigung auf Server %s gemacht"
+
+#: libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-Administrator-Ank端ndigung"
 
-#: ../libpurple/protocols/sametime/sametime.c:1702
+#: libpurple/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
 msgstr "Verbindung zur端ckgesetzt"
 
-#: ../libpurple/protocols/sametime/sametime.c:1709
+#: libpurple/protocols/sametime/sametime.c:1709
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Fehler beim Lesen des Socket: %s"
 
 #. this is a regular connect, error out
-#: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
+#: libpurple/protocols/sametime/sametime.c:1732
+#: libpurple/protocols/sametime/sametime.c:3727
 msgid "Unable to connect to host"
 msgstr "Verbindung zum Server nicht m旦glich"
 
-#: ../libpurple/protocols/sametime/sametime.c:1770
+#: libpurple/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
 msgstr "Ank端ndigung von %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1944
+#: libpurple/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
 msgstr "Konferenz geschlossen"
 
-#: ../libpurple/protocols/sametime/sametime.c:2403
+#: libpurple/protocols/sametime/sametime.c:2403
 msgid "Unable to send message: "
 msgstr "Kann die Nachricht nicht senden: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2959
+#: libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "Platz geschlossen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
+#: libpurple/protocols/sametime/sametime.c:3230
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: libpurple/protocols/sametime/sametime.c:3231
 msgid "Speakers"
 msgstr "Lautsprecher"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: libpurple/protocols/sametime/sametime.c:3232
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3235
+#: libpurple/protocols/sametime/sametime.c:3236
 msgid "File Transfer"
 msgstr "Datei端bertragung"
 
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
+#: libpurple/protocols/sametime/sametime.c:3270
+#: libpurple/protocols/sametime/sametime.c:4146
 msgid "Supports"
 msgstr "Unterst端tzt"
 
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
+#: libpurple/protocols/sametime/sametime.c:3275
+#: libpurple/protocols/sametime/sametime.c:4120
 msgid "External User"
 msgstr "Externer Benutzer"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
+#: libpurple/protocols/sametime/sametime.c:3381
 msgid "Create conference with user"
 msgstr "Konferenz mit dem Benutzer beginnen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: libpurple/protocols/sametime/sametime.c:3382
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -8576,27 +8490,27 @@
 "Bitte geben sie ein Thema f端r die neue Konferenz und eine "
 "Einladungsnachricht f端r %s ein"
 
-#: ../libpurple/protocols/sametime/sametime.c:3385
+#: libpurple/protocols/sametime/sametime.c:3386
 msgid "New Conference"
 msgstr "Neue Konferenz"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
+#: libpurple/protocols/sametime/sametime.c:3388
 msgid "Create"
 msgstr "Erzeugen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
+#: libpurple/protocols/sametime/sametime.c:3453
 msgid "Available Conferences"
 msgstr "Verf端gbare Konferenzen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
+#: libpurple/protocols/sametime/sametime.c:3459
 msgid "Create New Conference..."
 msgstr "Neue Konferenz erzeugen..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3465
+#: libpurple/protocols/sametime/sametime.c:3466
 msgid "Invite user to a conference"
 msgstr "Benutzer zu einer Konferenz einladen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: libpurple/protocols/sametime/sametime.c:3467
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -8607,27 +8521,27 @@
 "m旦chten. W辰hlen sie ��Neue Konferenz erzeugen��, wenn Sie den Benutzer zu "
 "einer neuen Konferenz einladen m旦chten."
 
-#: ../libpurple/protocols/sametime/sametime.c:3471
+#: libpurple/protocols/sametime/sametime.c:3472
 msgid "Invite to Conference"
 msgstr "Zur Konferenz einladen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
+#: libpurple/protocols/sametime/sametime.c:3563
 msgid "Invite to Conference..."
 msgstr "Zur Konferenz einladen..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3567
+#: libpurple/protocols/sametime/sametime.c:3568
 msgid "Send TEST Announcement"
 msgstr "Sende TEST-Nachricht"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4275
+#: libpurple/protocols/sametime/sametime.c:3587 pidgin/gtkconv.c:4302
 msgid "Topic:"
 msgstr "Thema:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
+#: libpurple/protocols/sametime/sametime.c:3615
 msgid "No Sametime Community Server specified"
 msgstr "Kein Sametime-Community Server angegeben"
 
-#: ../libpurple/protocols/sametime/sametime.c:3636
+#: libpurple/protocols/sametime/sametime.c:3637
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8636,42 +8550,42 @@
 "Es wurde kein Rechner f端r das Meanwhile-Konto %s angegeben. Bitte geben Sie "
 "einen Rechner an, um die Anmeldung fortzusetzen."
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: libpurple/protocols/sametime/sametime.c:3642
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile-Verbindungseinstellungen"
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: libpurple/protocols/sametime/sametime.c:3643
 msgid "No Sametime Community Server Specified"
 msgstr "Kein Sametime-Community Server angegeben"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4015
+#: libpurple/protocols/sametime/sametime.c:3645 pidgin/gtkblist.c:4025
 msgid "Connect"
 msgstr "Verbinden"
 
-#: ../libpurple/protocols/sametime/sametime.c:4135
+#: libpurple/protocols/sametime/sametime.c:4136
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Unbekannt (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4137
+#: libpurple/protocols/sametime/sametime.c:4138
 msgid "Last Known Client"
 msgstr "Letzter bekannter Client"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
+#: libpurple/protocols/sametime/sametime.c:4302
+#: libpurple/protocols/sametime/sametime.c:5507
 msgid "User Name"
 msgstr "Benutzername"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
+#: libpurple/protocols/sametime/sametime.c:4305
+#: libpurple/protocols/sametime/sametime.c:5510
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: libpurple/protocols/sametime/sametime.c:4329
 msgid "An ambiguous user ID was entered"
 msgstr "Eine mehrdeutige ID wurde angegeben"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: libpurple/protocols/sametime/sametime.c:4330
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8681,15 +8595,15 @@
 "beziehen. Bitte w辰hlen Sie den korrekten Benutzer vor der untenstehenden "
 "Liste, um ihn zu Ihrer Buddy-Liste hinzuzuf端gen."
 
-#: ../libpurple/protocols/sametime/sametime.c:4334
+#: libpurple/protocols/sametime/sametime.c:4335
 msgid "Select User"
 msgstr "Benutzer w辰hlen"
 
-#: ../libpurple/protocols/sametime/sametime.c:4418
+#: libpurple/protocols/sametime/sametime.c:4419
 msgid "Unable to add user: user not found"
 msgstr "Kann den Benutzer nicht hinzuf端gen: Benutzer nicht gefunden"
 
-#: ../libpurple/protocols/sametime/sametime.c:4420
+#: libpurple/protocols/sametime/sametime.c:4421
 #, c-format
 msgid ""
 "The identifier '%s' did not match any users in your Sametime community. This "
@@ -8698,11 +8612,11 @@
 "Der Bezeichner '%s' passt zu keinem der Benutzer in Ihrer Sametime-"
 "Community. Der Eintrag wurde von Ihrer Buddy-Liste entfernt."
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
+#: libpurple/protocols/sametime/sametime.c:4426
 msgid "Unable to add user"
 msgstr "Kann den Benutzer nicht hinzuf端gen"
 
-#: ../libpurple/protocols/sametime/sametime.c:5011
+#: libpurple/protocols/sametime/sametime.c:5012
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8711,63 +8625,63 @@
 "Fehler beim Lesen von %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
+#: libpurple/protocols/sametime/sametime.c:5147
 msgid "Remotely Stored Buddy List"
 msgstr "Entfernt gespeicherte Buddy-Liste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5151
+#: libpurple/protocols/sametime/sametime.c:5152
 msgid "Buddy List Storage Mode"
 msgstr "Buddy-Listen-Speicherungsmethode"
 
-#: ../libpurple/protocols/sametime/sametime.c:5154
+#: libpurple/protocols/sametime/sametime.c:5155
 msgid "Local Buddy List Only"
 msgstr "Nur lokale Buddy-Liste"
 
-#: ../libpurple/protocols/sametime/sametime.c:5156
+#: libpurple/protocols/sametime/sametime.c:5157
 msgid "Merge List from Server"
 msgstr "Mit Buddy-Liste vom Server zusammenf端hren"
 
-#: ../libpurple/protocols/sametime/sametime.c:5158
+#: libpurple/protocols/sametime/sametime.c:5159
 msgid "Merge and Save List to Server"
 msgstr "Buddy-Liste zusammenf端hren und zum Server exportieren"
 
-#: ../libpurple/protocols/sametime/sametime.c:5160
+#: libpurple/protocols/sametime/sametime.c:5161
 msgid "Synchronize List with Server"
 msgstr "Buddy-Liste mit Server abgleichen"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
+#: libpurple/protocols/sametime/sametime.c:5216
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Sametime-Buddy-Liste f端r Konto %s importieren"
 
-#: ../libpurple/protocols/sametime/sametime.c:5255
+#: libpurple/protocols/sametime/sametime.c:5256
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Sametime-Buddy-Liste f端r Konto %s exportieren"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
+#: libpurple/protocols/sametime/sametime.c:5310
 msgid "Unable to add group: group exists"
 msgstr "Kann Gruppe nicht hinzuf端gen: Gruppe existiert"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: libpurple/protocols/sametime/sametime.c:5311
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Eine Gruppe mit dem Namen '%s' existiert bereits in Ihrer Buddy-Liste."
 
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
+#: libpurple/protocols/sametime/sametime.c:5314
+#: libpurple/protocols/sametime/sametime.c:5444
 msgid "Unable to add group"
 msgstr "Kann die Gruppe nicht hinzuf端gen"
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
+#: libpurple/protocols/sametime/sametime.c:5373
 msgid "Possible Matches"
 msgstr "M旦gliche �bereinstimmungen"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: libpurple/protocols/sametime/sametime.c:5389
 msgid "Notes Address Book group results"
 msgstr "Notes-Adressbuchgruppenergebnisse"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: libpurple/protocols/sametime/sametime.c:5390
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8778,15 +8692,15 @@
 "Adressbuchgruppen. Bitte w辰hlen Sie die richtige Gruppe aus der Liste, um "
 "sie Ihrer Buddy-Liste hinzuzuf端gen."
 
-#: ../libpurple/protocols/sametime/sametime.c:5394
+#: libpurple/protocols/sametime/sametime.c:5395
 msgid "Select Notes Address Book"
 msgstr "W辰hlen Sie das Notes-Adressbuch"
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: libpurple/protocols/sametime/sametime.c:5438
 msgid "Unable to add group: group not found"
 msgstr "Kann Gruppe nicht hinzuf端gen: Gruppe nicht gefunden"
 
-#: ../libpurple/protocols/sametime/sametime.c:5439
+#: libpurple/protocols/sametime/sametime.c:5440
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -8795,11 +8709,11 @@
 "Der Bezeichner '%s' stimmt mit keiner Notes-Adressbuchgruppe in Ihrer "
 "Sametime-Community 端berein."
 
-#: ../libpurple/protocols/sametime/sametime.c:5480
+#: libpurple/protocols/sametime/sametime.c:5481
 msgid "Notes Address Book Group"
 msgstr "Notes-Adressbuchgruppe"
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: libpurple/protocols/sametime/sametime.c:5482
 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."
@@ -8807,12 +8721,12 @@
 "Geben Sie den Namen einer Notes-Adressbuchgruppe in das Feld ein um die "
 "Gruppe und ihre Mitglieder zu ihrer Buddy-Liste hinzuzuf端gen."
 
-#: ../libpurple/protocols/sametime/sametime.c:5530
+#: libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Suchergebnisse f端r '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: libpurple/protocols/sametime/sametime.c:5532
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8825,30 +8739,30 @@
 "senden, indem sie die folgenden Aktions-Buttons benutzen."
 
 #. Create the window
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:719
+#: libpurple/protocols/sametime/sametime.c:5539 pidgin/gtknotify.c:718
 msgid "Search Results"
 msgstr "Suchergebnisse"
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: libpurple/protocols/sametime/sametime.c:5564
 msgid "No matches"
 msgstr "Keine �bereinstimmung"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: libpurple/protocols/sametime/sametime.c:5565
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "Der Bezeichner '%s' stimmt mit keinem Benutzer in Ihrer Sametime-Community "
 "端berein."
 
-#: ../libpurple/protocols/sametime/sametime.c:5568
+#: libpurple/protocols/sametime/sametime.c:5569
 msgid "No Matches"
 msgstr "Keine �bereinstimmung"
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: libpurple/protocols/sametime/sametime.c:5606
 msgid "Search for a user"
 msgstr "Suche nach einem Benutzer"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: libpurple/protocols/sametime/sametime.c:5607
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -8856,115 +8770,97 @@
 "Geben die einen Namen oder den Teil einer ID in das folgende Feld ein, um "
 "nach entsprechenden Benutzern in Ihrer Sametime-Community zu suchen."
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: libpurple/protocols/sametime/sametime.c:5610
 msgid "User Search"
 msgstr "Benutzersuche"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: libpurple/protocols/sametime/sametime.c:5623
 msgid "Import Sametime List..."
 msgstr "Import der Sametime-Liste..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
+#: libpurple/protocols/sametime/sametime.c:5627
 msgid "Export Sametime List..."
 msgstr "Export der Sametime-Liste..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5630
+#: libpurple/protocols/sametime/sametime.c:5631
 msgid "Add Notes Address Book Group..."
 msgstr "Zum Notes-Adressbuch hinzuf端gen..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
+#: libpurple/protocols/sametime/sametime.c:5635
 msgid "User Search..."
 msgstr "Benutzersuche..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
+#: libpurple/protocols/sametime/sametime.c:5741
 msgid "Force login (ignore server redirects)"
 msgstr "Erzwinge Login (ignoriere Serverumleitungen)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
+#: libpurple/protocols/sametime/sametime.c:5751
 msgid "Hide client identity"
 msgstr "Client-Identit辰t verbergen"
 
-#: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:410
-#: ../libpurple/protocols/silc/buddy.c:538
-#: ../libpurple/protocols/silc/buddy.c:700
-#: ../libpurple/protocols/silc/ft.c:423
-#: ../libpurple/protocols/silc10/buddy.c:52
-#: ../libpurple/protocols/silc10/buddy.c:421
-#: ../libpurple/protocols/silc10/buddy.c:546
-#: ../libpurple/protocols/silc10/buddy.c:712
-#: ../libpurple/protocols/silc10/ft.c:338
+#: libpurple/protocols/silc/buddy.c:52 libpurple/protocols/silc/buddy.c:410
+#: libpurple/protocols/silc/buddy.c:538 libpurple/protocols/silc/buddy.c:700
+#: libpurple/protocols/silc/ft.c:423 libpurple/protocols/silc10/buddy.c:52
+#: libpurple/protocols/silc10/buddy.c:421
+#: libpurple/protocols/silc10/buddy.c:546
+#: libpurple/protocols/silc10/buddy.c:712 libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Der Benutzer %s ist nicht im Netzwerk"
 
-#: ../libpurple/protocols/silc/buddy.c:53
-#: ../libpurple/protocols/silc/buddy.c:110
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:119
-#: ../libpurple/protocols/silc/buddy.c:124
-#: ../libpurple/protocols/silc/buddy.c:129
-#: ../libpurple/protocols/silc/buddy.c:134
-#: ../libpurple/protocols/silc/buddy.c:254
-#: ../libpurple/protocols/silc10/buddy.c:53
-#: ../libpurple/protocols/silc10/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:124
-#: ../libpurple/protocols/silc10/buddy.c:129
-#: ../libpurple/protocols/silc10/buddy.c:134
-#: ../libpurple/protocols/silc10/buddy.c:139
-#: ../libpurple/protocols/silc10/buddy.c:257
+#: libpurple/protocols/silc/buddy.c:53 libpurple/protocols/silc/buddy.c:110
+#: libpurple/protocols/silc/buddy.c:115 libpurple/protocols/silc/buddy.c:119
+#: libpurple/protocols/silc/buddy.c:124 libpurple/protocols/silc/buddy.c:129
+#: libpurple/protocols/silc/buddy.c:134 libpurple/protocols/silc/buddy.c:254
+#: libpurple/protocols/silc10/buddy.c:53
+#: libpurple/protocols/silc10/buddy.c:115
+#: libpurple/protocols/silc10/buddy.c:120
+#: libpurple/protocols/silc10/buddy.c:124
+#: libpurple/protocols/silc10/buddy.c:129
+#: libpurple/protocols/silc10/buddy.c:134
+#: libpurple/protocols/silc10/buddy.c:139
+#: libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Schl端sselaustausch"
 
-#: ../libpurple/protocols/silc/buddy.c:54
-#: ../libpurple/protocols/silc10/buddy.c:54
+#: libpurple/protocols/silc/buddy.c:54 libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Kann den Schl端sselaustausch nicht durchf端hren"
 
-#: ../libpurple/protocols/silc/buddy.c:111
-#: ../libpurple/protocols/silc10/buddy.c:116
+#: libpurple/protocols/silc/buddy.c:111 libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Beim Schl端sselaustausch ist ein Fehler aufgetreten"
 
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
+#: libpurple/protocols/silc/buddy.c:115 libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Schl端sselaustausch fehlgeschlagen"
 
-#: ../libpurple/protocols/silc/buddy.c:120
-#: ../libpurple/protocols/silc10/buddy.c:125
+#: libpurple/protocols/silc/buddy.c:120 libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Zeit端berschreitung beim Schl端sselaustausch"
 
-#: ../libpurple/protocols/silc/buddy.c:125
-#: ../libpurple/protocols/silc10/buddy.c:130
+#: libpurple/protocols/silc/buddy.c:125 libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Schl端sselaustausch wurde abgebrochen"
 
-#: ../libpurple/protocols/silc/buddy.c:130
-#: ../libpurple/protocols/silc10/buddy.c:135
+#: libpurple/protocols/silc/buddy.c:130 libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Schl端sselaustausch wurde schon gestartet"
 
-#: ../libpurple/protocols/silc/buddy.c:135
-#: ../libpurple/protocols/silc10/buddy.c:140
+#: libpurple/protocols/silc/buddy.c:135 libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Schl端sselaustausch kann nicht mit Ihnen selbst gestartet werden"
 
-#: ../libpurple/protocols/silc/buddy.c:255
-#: ../libpurple/protocols/silc/buddy.c:383
-#: ../libpurple/protocols/silc/buddy.c:497
-#: ../libpurple/protocols/silc/buddy.c:508
-#: ../libpurple/protocols/silc10/buddy.c:258
-#: ../libpurple/protocols/silc10/buddy.c:389
-#: ../libpurple/protocols/silc10/buddy.c:514
+#: libpurple/protocols/silc/buddy.c:255 libpurple/protocols/silc/buddy.c:383
+#: libpurple/protocols/silc/buddy.c:497 libpurple/protocols/silc/buddy.c:508
+#: libpurple/protocols/silc10/buddy.c:258
+#: libpurple/protocols/silc10/buddy.c:389
+#: libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "Der entfernte Benutzer ist nicht mehr im Netzwerk pr辰sent"
 
-#: ../libpurple/protocols/silc/buddy.c:298
-#: ../libpurple/protocols/silc10/buddy.c:295
+#: libpurple/protocols/silc/buddy.c:298 libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8973,8 +8869,7 @@
 "Anfrage nach Schl端sselaustausch wurde von %s empfangen. M旦chten Sie den "
 "Schl端sselaustausch durchf端hren?"
 
-#: ../libpurple/protocols/silc/buddy.c:302
-#: ../libpurple/protocols/silc10/buddy.c:299
+#: libpurple/protocols/silc/buddy.c:302 libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8985,99 +8880,74 @@
 "Remote-Computer: %s\n"
 "Remote-Port: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc10/buddy.c:312
+#: libpurple/protocols/silc/buddy.c:315 libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Anfrage nach Schl端sselaustausch"
 
-#: ../libpurple/protocols/silc/buddy.c:382
-#: ../libpurple/protocols/silc/buddy.c:412
-#: ../libpurple/protocols/silc/buddy.c:452
-#: ../libpurple/protocols/silc10/buddy.c:388
-#: ../libpurple/protocols/silc10/buddy.c:423
-#: ../libpurple/protocols/silc10/buddy.c:465
+#: libpurple/protocols/silc/buddy.c:382 libpurple/protocols/silc/buddy.c:412
+#: libpurple/protocols/silc/buddy.c:452 libpurple/protocols/silc10/buddy.c:388
+#: libpurple/protocols/silc10/buddy.c:423
+#: libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "IM mit Passwort"
 
-#: ../libpurple/protocols/silc/buddy.c:413
-#: ../libpurple/protocols/silc10/buddy.c:424
+#: libpurple/protocols/silc/buddy.c:413 libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Kann IM-Schl端ssel nicht setzen"
 
-#: ../libpurple/protocols/silc/buddy.c:453
-#: ../libpurple/protocols/silc10/buddy.c:466
+#: libpurple/protocols/silc/buddy.c:453 libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Setze IM-Passwort"
 
-#: ../libpurple/protocols/silc/buddy.c:496
-#: ../libpurple/protocols/silc/buddy.c:507
-#: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1499
-#: ../libpurple/protocols/silc/ops.c:1510
-#: ../libpurple/protocols/silc10/buddy.c:513
-#: ../libpurple/protocols/silc10/buddy.c:548
-#: ../libpurple/protocols/silc10/ops.c:1494
-#: ../libpurple/protocols/silc10/ops.c:1505
+#: libpurple/protocols/silc/buddy.c:496 libpurple/protocols/silc/buddy.c:507
+#: libpurple/protocols/silc/buddy.c:540 libpurple/protocols/silc/ops.c:1499
+#: libpurple/protocols/silc/ops.c:1510 libpurple/protocols/silc10/buddy.c:513
+#: libpurple/protocols/silc10/buddy.c:548
+#: libpurple/protocols/silc10/ops.c:1494 libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "�ffentlichen Schl端ssel abrufen"
 
-#: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1500
-#: ../libpurple/protocols/silc/ops.c:1511
-#: ../libpurple/protocols/silc10/buddy.c:549
-#: ../libpurple/protocols/silc10/ops.c:1495
-#: ../libpurple/protocols/silc10/ops.c:1506
+#: libpurple/protocols/silc/buddy.c:541 libpurple/protocols/silc/ops.c:1500
+#: libpurple/protocols/silc/ops.c:1511 libpurple/protocols/silc10/buddy.c:549
+#: libpurple/protocols/silc10/ops.c:1495 libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Konnte den 旦ffentlichen Schl端ssel nicht abrufen"
 
-#: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1655
-#: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1654
+#: libpurple/protocols/silc/buddy.c:622 libpurple/protocols/silc/buddy.c:1655
+#: libpurple/protocols/silc10/buddy.c:635
+#: libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Zeige 旦ffentlichen Schl端ssel"
 
-#: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1027
-#: ../libpurple/protocols/silc/chat.c:237
-#: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1033
-#: ../libpurple/protocols/silc10/chat.c:237
+#: libpurple/protocols/silc/buddy.c:623 libpurple/protocols/silc/buddy.c:1027
+#: libpurple/protocols/silc/chat.c:237 libpurple/protocols/silc10/buddy.c:636
+#: libpurple/protocols/silc10/buddy.c:1033
+#: libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Konnte den 旦ffentlichen Schl端ssel nicht laden"
 
-#: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1053
-#: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1288
-#: ../libpurple/protocols/silc/ops.c:1289
-#: ../libpurple/protocols/silc/ops.c:1307
-#: ../libpurple/protocols/silc10/buddy.c:713
-#: ../libpurple/protocols/silc10/ops.c:1087
-#: ../libpurple/protocols/silc10/ops.c:1159
-#: ../libpurple/protocols/silc10/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1295
-#: ../libpurple/protocols/silc10/ops.c:1313
+#: libpurple/protocols/silc/buddy.c:701 libpurple/protocols/silc/ops.c:1053
+#: libpurple/protocols/silc/ops.c:1168 libpurple/protocols/silc/ops.c:1288
+#: libpurple/protocols/silc/ops.c:1289 libpurple/protocols/silc/ops.c:1307
+#: libpurple/protocols/silc10/buddy.c:713
+#: libpurple/protocols/silc10/ops.c:1087 libpurple/protocols/silc10/ops.c:1159
+#: libpurple/protocols/silc10/ops.c:1294 libpurple/protocols/silc10/ops.c:1295
+#: libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Benutzer-Information"
 
-#: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1308
-#: ../libpurple/protocols/silc10/buddy.c:714
-#: ../libpurple/protocols/silc10/ops.c:1160
-#: ../libpurple/protocols/silc10/ops.c:1314
+#: libpurple/protocols/silc/buddy.c:702 libpurple/protocols/silc/ops.c:1169
+#: libpurple/protocols/silc/ops.c:1308 libpurple/protocols/silc10/buddy.c:714
+#: libpurple/protocols/silc10/ops.c:1160 libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Kann die Benutzerinformation nicht abrufen"
 
-#: ../libpurple/protocols/silc/buddy.c:723
-#: ../libpurple/protocols/silc10/buddy.c:735
+#: libpurple/protocols/silc/buddy.c:723 libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Dem Buddy %s wird nicht (kryptografisch) vertraut"
 
-#: ../libpurple/protocols/silc/buddy.c:726
-#: ../libpurple/protocols/silc10/buddy.c:738
+#: libpurple/protocols/silc/buddy.c:726 libpurple/protocols/silc10/buddy.c:738
 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."
@@ -9088,19 +8958,19 @@
 "erhalten."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1059
-#: ../libpurple/protocols/silc10/buddy.c:1067
+#: libpurple/protocols/silc/buddy.c:1059
+#: libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "�ffnen..."
 
-#: ../libpurple/protocols/silc/buddy.c:1070
-#: ../libpurple/protocols/silc10/buddy.c:1078
+#: libpurple/protocols/silc/buddy.c:1070
+#: libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Der Benutzer %s ist nicht im Netzwerk pr辰sent"
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
+#: libpurple/protocols/silc/buddy.c:1073
+#: libpurple/protocols/silc10/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -9109,18 +8979,18 @@
 "Schl端ssel importieren. Dr端cken Sie auf Import, um den 旦ffentlichen Schl端ssel "
 "zu importieren."
 
-#: ../libpurple/protocols/silc/buddy.c:1077
-#: ../libpurple/protocols/silc10/buddy.c:1085
+#: libpurple/protocols/silc/buddy.c:1077
+#: libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "_Import..."
 
-#: ../libpurple/protocols/silc/buddy.c:1183
-#: ../libpurple/protocols/silc10/buddy.c:1181
+#: libpurple/protocols/silc/buddy.c:1183
+#: libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "W辰hlen Sie den richtigen Benutzer"
 
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:1183
+#: libpurple/protocols/silc/buddy.c:1185
+#: libpurple/protocols/silc10/buddy.c:1183
 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."
@@ -9129,8 +8999,8 @@
 "gefunden. W辰hlen Sie den richtigen Benutzer, um ihn zur Buddy-Liste "
 "hinzuzuf端gen."
 
-#: ../libpurple/protocols/silc/buddy.c:1187
-#: ../libpurple/protocols/silc10/buddy.c:1185
+#: libpurple/protocols/silc/buddy.c:1187
+#: libpurple/protocols/silc10/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -9138,319 +9008,258 @@
 "Mehr als ein Benutzer wurde mit dem gleichen Namen gefunden. W辰hlen Sie den "
 "richtigen Benutzer, um ihn zur Buddy-Liste hinzuzuf端gen."
 
-#: ../libpurple/protocols/silc/buddy.c:1474
-#: ../libpurple/protocols/silc10/buddy.c:1474
+#: libpurple/protocols/silc/buddy.c:1474
+#: libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "Unbeteiligt"
 
-#: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1478
-#: ../libpurple/protocols/silc10/silc.c:49
+#: libpurple/protocols/silc/buddy.c:1478 libpurple/protocols/silc/silc.c:58
+#: libpurple/protocols/silc10/buddy.c:1478
+#: libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Indisponiert"
 
-#: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1482
-#: ../libpurple/protocols/silc10/silc.c:51
+#: libpurple/protocols/silc/buddy.c:1482 libpurple/protocols/silc/silc.c:60
+#: libpurple/protocols/silc10/buddy.c:1482
+#: libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Wecke mich auf"
 
-#: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1484
-#: ../libpurple/protocols/silc10/silc.c:43
+#: libpurple/protocols/silc/buddy.c:1484 libpurple/protocols/silc/silc.c:52
+#: libpurple/protocols/silc10/buddy.c:1484
+#: libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hyperaktiv"
 
-#: ../libpurple/protocols/silc/buddy.c:1486
-#: ../libpurple/protocols/silc10/buddy.c:1486
+#: libpurple/protocols/silc/buddy.c:1486
+#: libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:743
-#: ../libpurple/protocols/silc/util.c:516
-#: ../libpurple/protocols/silc10/buddy.c:1493
-#: ../libpurple/protocols/silc10/silc.c:654
-#: ../libpurple/protocols/silc10/util.c:512
+#: libpurple/protocols/silc/buddy.c:1493 libpurple/protocols/silc/silc.c:743
+#: libpurple/protocols/silc/util.c:516 libpurple/protocols/silc10/buddy.c:1493
+#: libpurple/protocols/silc10/silc.c:654 libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Gl端cklich"
 
-#: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:745
-#: ../libpurple/protocols/silc/util.c:518
-#: ../libpurple/protocols/silc10/buddy.c:1495
-#: ../libpurple/protocols/silc10/silc.c:656
-#: ../libpurple/protocols/silc10/util.c:514
+#: libpurple/protocols/silc/buddy.c:1495 libpurple/protocols/silc/silc.c:745
+#: libpurple/protocols/silc/util.c:518 libpurple/protocols/silc10/buddy.c:1495
+#: libpurple/protocols/silc10/silc.c:656 libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Traurig"
 
-#: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:747
-#: ../libpurple/protocols/silc/util.c:520
-#: ../libpurple/protocols/silc10/buddy.c:1497
-#: ../libpurple/protocols/silc10/silc.c:658
-#: ../libpurple/protocols/silc10/util.c:516
+#: libpurple/protocols/silc/buddy.c:1497 libpurple/protocols/silc/silc.c:747
+#: libpurple/protocols/silc/util.c:520 libpurple/protocols/silc10/buddy.c:1497
+#: libpurple/protocols/silc10/silc.c:658 libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Ver辰rgert"
 
-#: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:749
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1499
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:518
+#: libpurple/protocols/silc/buddy.c:1499 libpurple/protocols/silc/silc.c:749
+#: libpurple/protocols/silc/util.c:522 libpurple/protocols/silc10/buddy.c:1499
+#: libpurple/protocols/silc10/silc.c:660 libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Eifers端chtig"
 
-#: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:751
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1501
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:520
+#: libpurple/protocols/silc/buddy.c:1501 libpurple/protocols/silc/silc.c:751
+#: libpurple/protocols/silc/util.c:524 libpurple/protocols/silc10/buddy.c:1501
+#: libpurple/protocols/silc10/silc.c:662 libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Besch辰mt"
 
-#: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:753
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1503
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:522
+#: libpurple/protocols/silc/buddy.c:1503 libpurple/protocols/silc/silc.c:753
+#: libpurple/protocols/silc/util.c:526 libpurple/protocols/silc10/buddy.c:1503
+#: libpurple/protocols/silc10/silc.c:664 libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Unersch端tterlich"
 
-#: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1505
-#: ../libpurple/protocols/silc10/util.c:524
+#: libpurple/protocols/silc/buddy.c:1505 libpurple/protocols/silc/util.c:528
+#: libpurple/protocols/silc10/buddy.c:1505
+#: libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Verliebt"
 
-#: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:757
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1507
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:526
+#: libpurple/protocols/silc/buddy.c:1507 libpurple/protocols/silc/silc.c:757
+#: libpurple/protocols/silc/util.c:530 libpurple/protocols/silc10/buddy.c:1507
+#: libpurple/protocols/silc10/silc.c:668 libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "M端de"
 
-#: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:759
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1509
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:528
+#: libpurple/protocols/silc/buddy.c:1509 libpurple/protocols/silc/silc.c:759
+#: libpurple/protocols/silc/util.c:532 libpurple/protocols/silc10/buddy.c:1509
+#: libpurple/protocols/silc10/silc.c:670 libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Gelangweilt"
 
-#: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:761
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1511
-#: ../libpurple/protocols/silc10/silc.c:672
-#: ../libpurple/protocols/silc10/util.c:530
+#: libpurple/protocols/silc/buddy.c:1511 libpurple/protocols/silc/silc.c:761
+#: libpurple/protocols/silc/util.c:534 libpurple/protocols/silc10/buddy.c:1511
+#: libpurple/protocols/silc10/silc.c:672 libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Aufgeregt"
 
-#: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:763
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1513
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:532
+#: libpurple/protocols/silc/buddy.c:1513 libpurple/protocols/silc/silc.c:763
+#: libpurple/protocols/silc/util.c:536 libpurple/protocols/silc10/buddy.c:1513
+#: libpurple/protocols/silc10/silc.c:674 libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Besorgt"
 
-#: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1545
-#: ../libpurple/protocols/silc10/ops.c:1202
+#: libpurple/protocols/silc/buddy.c:1545 libpurple/protocols/silc/ops.c:1207
+#: libpurple/protocols/silc10/buddy.c:1545
+#: libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Benutzermodi"
 
-#: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1557
-#: ../libpurple/protocols/silc10/ops.c:1207
+#: libpurple/protocols/silc/buddy.c:1557 libpurple/protocols/silc/ops.c:1212
+#: libpurple/protocols/silc10/buddy.c:1557
+#: libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Stimmung"
 
-#: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1562
-#: ../libpurple/protocols/silc10/ops.c:1219
+#: libpurple/protocols/silc/buddy.c:1562 libpurple/protocols/silc/ops.c:1224
+#: libpurple/protocols/silc10/buddy.c:1562
+#: libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Bevorzugter Kontakt"
 
-#: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1567
-#: ../libpurple/protocols/silc10/ops.c:1224
+#: libpurple/protocols/silc/buddy.c:1567 libpurple/protocols/silc/ops.c:1229
+#: libpurple/protocols/silc10/buddy.c:1567
+#: libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Bevorzugte Sprache"
 
-#: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1572
-#: ../libpurple/protocols/silc10/ops.c:1229
+#: libpurple/protocols/silc/buddy.c:1572 libpurple/protocols/silc/ops.c:1234
+#: libpurple/protocols/silc10/buddy.c:1572
+#: libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Ger辰t"
 
-#: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1577
-#: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:722
-#: ../libpurple/protocols/silc10/silc.c:724
+#: libpurple/protocols/silc/buddy.c:1577 libpurple/protocols/silc/ops.c:1239
+#: libpurple/protocols/silc10/buddy.c:1577
+#: libpurple/protocols/silc10/ops.c:1234 libpurple/protocols/silc10/silc.c:722
+#: libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Zeitzone"
 
-#: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1582
-#: ../libpurple/protocols/silc10/ops.c:1239
+#: libpurple/protocols/silc/buddy.c:1582 libpurple/protocols/silc/ops.c:1244
+#: libpurple/protocols/silc10/buddy.c:1582
+#: libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Geographische Koordinaten"
 
-#: ../libpurple/protocols/silc/buddy.c:1638
-#: ../libpurple/protocols/silc10/buddy.c:1636
+#: libpurple/protocols/silc/buddy.c:1638
+#: libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "IM-Schl端ssel zur端cksetzen"
 
-#: ../libpurple/protocols/silc/buddy.c:1643
-#: ../libpurple/protocols/silc10/buddy.c:1642
+#: libpurple/protocols/silc/buddy.c:1643
+#: libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "IM mit Schl端sselaustausch"
 
-#: ../libpurple/protocols/silc/buddy.c:1648
-#: ../libpurple/protocols/silc10/buddy.c:1647
+#: libpurple/protocols/silc/buddy.c:1648
+#: libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr "IM mit Passwort"
 
-#: ../libpurple/protocols/silc/buddy.c:1661
-#: ../libpurple/protocols/silc10/buddy.c:1660
+#: libpurple/protocols/silc/buddy.c:1661
+#: libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "�ffentlichen Schl端ssel abrufen..."
 
-#: ../libpurple/protocols/silc/buddy.c:1668
-#: ../libpurple/protocols/silc/ops.c:1608
-#: ../libpurple/protocols/silc10/buddy.c:1667
-#: ../libpurple/protocols/silc10/ops.c:1624
+#: libpurple/protocols/silc/buddy.c:1668 libpurple/protocols/silc/ops.c:1608
+#: libpurple/protocols/silc10/buddy.c:1667
+#: libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Benutzer hinauswerfen"
 
-#: ../libpurple/protocols/silc/buddy.c:1678
-#: ../libpurple/protocols/silc/chat.c:993
-#: ../libpurple/protocols/silc10/buddy.c:1677
-#: ../libpurple/protocols/silc10/chat.c:977
+#: libpurple/protocols/silc/buddy.c:1678 libpurple/protocols/silc/chat.c:993
+#: libpurple/protocols/silc10/buddy.c:1677
+#: libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Auf Whiteboard malen"
 
-#: ../libpurple/protocols/silc/chat.c:39
-#: ../libpurple/protocols/silc10/chat.c:39
+#: libpurple/protocols/silc/chat.c:39 libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Passphrase:"
 
-#: ../libpurple/protocols/silc/chat.c:80
-#: ../libpurple/protocols/silc10/chat.c:80
+#: libpurple/protocols/silc/chat.c:80 libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kanal %s existiert nicht im Netzwerk"
 
-#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:175
-#: ../libpurple/protocols/silc10/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:174
+#: libpurple/protocols/silc/chat.c:81 libpurple/protocols/silc/chat.c:175
+#: libpurple/protocols/silc10/chat.c:81 libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Kanal-Information"
 
-#: ../libpurple/protocols/silc/chat.c:82
-#: ../libpurple/protocols/silc10/chat.c:82
+#: libpurple/protocols/silc/chat.c:82 libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Kann die Kanal-Informationen nicht abrufen"
 
-#: ../libpurple/protocols/silc/chat.c:119
-#: ../libpurple/protocols/silc10/chat.c:119
+#: libpurple/protocols/silc/chat.c:119 libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Kanalname:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:122
-#: ../libpurple/protocols/silc10/chat.c:122
+#: libpurple/protocols/silc/chat.c:122 libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Benutzeranzahl:</b> %d"
 
-#: ../libpurple/protocols/silc/chat.c:129
-#: ../libpurple/protocols/silc10/chat.c:129
+#: libpurple/protocols/silc/chat.c:129 libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Gr端nder des Kanals:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:138
-#: ../libpurple/protocols/silc10/chat.c:138
+#: libpurple/protocols/silc/chat.c:138 libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Kanal-Chiffrierung:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:143
-#: ../libpurple/protocols/silc10/chat.c:142
+#: libpurple/protocols/silc/chat.c:143 libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Kanal-HMAC:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:148
-#: ../libpurple/protocols/silc10/chat.c:147
+#: libpurple/protocols/silc/chat.c:148 libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Thema des Kanals:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:153
-#: ../libpurple/protocols/silc10/chat.c:152
+#: libpurple/protocols/silc/chat.c:153 libpurple/protocols/silc10/chat.c:152
+#, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanal-Modi:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:166
-#: ../libpurple/protocols/silc10/chat.c:165
+#: libpurple/protocols/silc/chat.c:166 libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Schl端ssel-Fingerprint des Gr端nders:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:167
-#: ../libpurple/protocols/silc10/chat.c:166
+#: libpurple/protocols/silc/chat.c:167 libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Schl端ssel-Babbleprint des Gr端nders:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:236
-#: ../libpurple/protocols/silc10/chat.c:236
+#: libpurple/protocols/silc/chat.c:236 libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "�ffentlichen Schl端ssel des Kanals hinzuf端gen"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:304
-#: ../libpurple/protocols/silc10/chat.c:291
+#: libpurple/protocols/silc/chat.c:304 libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "�ffentlichen Schl端ssel 旦ffnen..."
 
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:401
+#: libpurple/protocols/silc/chat.c:423 libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Kanal-Passphrase"
 
-#: ../libpurple/protocols/silc/chat.c:430
-#: ../libpurple/protocols/silc10/chat.c:408
+#: libpurple/protocols/silc/chat.c:430 libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Liste der 旦ffentlichen Schl端ssel des Kanals"
 
-#: ../libpurple/protocols/silc/chat.c:435
-#: ../libpurple/protocols/silc10/chat.c:413
+#: libpurple/protocols/silc/chat.c:435 libpurple/protocols/silc10/chat.c:413
+#, c-format
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9465,447 +9274,367 @@
 "Schl端ssel gew辰hlt werden, k旦nnen nur solche Benutzer den Kanal betreten, "
 "deren Schl端ssel aufgelistet sind."
 
-#: ../libpurple/protocols/silc/chat.c:444
-#: ../libpurple/protocols/silc/chat.c:445
-#: ../libpurple/protocols/silc/chat.c:479
-#: ../libpurple/protocols/silc/chat.c:480
-#: ../libpurple/protocols/silc/chat.c:927
-#: ../libpurple/protocols/silc10/chat.c:422
-#: ../libpurple/protocols/silc10/chat.c:423
-#: ../libpurple/protocols/silc10/chat.c:461
-#: ../libpurple/protocols/silc10/chat.c:462
-#: ../libpurple/protocols/silc10/chat.c:911
+#: libpurple/protocols/silc/chat.c:444 libpurple/protocols/silc/chat.c:445
+#: libpurple/protocols/silc/chat.c:479 libpurple/protocols/silc/chat.c:480
+#: libpurple/protocols/silc/chat.c:927 libpurple/protocols/silc10/chat.c:422
+#: libpurple/protocols/silc10/chat.c:423 libpurple/protocols/silc10/chat.c:461
+#: libpurple/protocols/silc10/chat.c:462 libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Kanal-Authentifikation"
 
-#: ../libpurple/protocols/silc/chat.c:446
-#: ../libpurple/protocols/silc/chat.c:481
-#: ../libpurple/protocols/silc10/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:463
+#: libpurple/protocols/silc/chat.c:446 libpurple/protocols/silc/chat.c:481
+#: libpurple/protocols/silc10/chat.c:424 libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Hinzuf端gen / Entfernen"
 
-#: ../libpurple/protocols/silc/chat.c:597
-#: ../libpurple/protocols/silc10/chat.c:581
+#: libpurple/protocols/silc/chat.c:597 libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Gruppenname"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc/ops.c:1813
-#: ../libpurple/protocols/silc/silc.c:1020
-#: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1901
-#: ../libpurple/protocols/silc10/silc.c:931
+#: libpurple/protocols/silc/chat.c:601 libpurple/protocols/silc/ops.c:1813
+#: libpurple/protocols/silc/silc.c:1020 libpurple/protocols/silc10/chat.c:585
+#: libpurple/protocols/silc10/ops.c:1901 libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Passphrase"
 
-#: ../libpurple/protocols/silc/chat.c:612
-#: ../libpurple/protocols/silc10/chat.c:596
+#: libpurple/protocols/silc/chat.c:612 libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr ""
 "Bitte geben Sie f端r den Kanal %s den Namen der privaten Gruppe und die "
 "Passphrase an."
 
-#: ../libpurple/protocols/silc/chat.c:614
-#: ../libpurple/protocols/silc10/chat.c:598
+#: libpurple/protocols/silc/chat.c:614 libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Private Gruppe im Kanal hinzuf端gen"
 
-#: ../libpurple/protocols/silc/chat.c:742
-#: ../libpurple/protocols/silc10/chat.c:726
+#: libpurple/protocols/silc/chat.c:742 libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Benutzer-Limit"
 
-#: ../libpurple/protocols/silc/chat.c:743
-#: ../libpurple/protocols/silc10/chat.c:727
+#: libpurple/protocols/silc/chat.c:743 libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
-msgstr "Setze Benutzerlimit auf dem Kanal. W辰hlen Sie 0, um das Limit aufzuheben."
-
-#: ../libpurple/protocols/silc/chat.c:907
-#: ../libpurple/protocols/silc10/chat.c:891
+msgstr ""
+"Setze Benutzerlimit auf dem Kanal. W辰hlen Sie 0, um das Limit aufzuheben."
+
+#: libpurple/protocols/silc/chat.c:907 libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "Einladungsliste"
 
-#: ../libpurple/protocols/silc/chat.c:912
-#: ../libpurple/protocols/silc10/chat.c:896
+#: libpurple/protocols/silc/chat.c:912 libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Verbannungsliste"
 
-#: ../libpurple/protocols/silc/chat.c:920
-#: ../libpurple/protocols/silc10/chat.c:904
+#: libpurple/protocols/silc/chat.c:920 libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Private Gruppe hinzuf端gen"
 
-#: ../libpurple/protocols/silc/chat.c:933
-#: ../libpurple/protocols/silc10/chat.c:917
+#: libpurple/protocols/silc/chat.c:933 libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Permanent zur端cksetzen"
 
-#: ../libpurple/protocols/silc/chat.c:938
-#: ../libpurple/protocols/silc10/chat.c:922
+#: libpurple/protocols/silc/chat.c:938 libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Permanent setzen"
 
-#: ../libpurple/protocols/silc/chat.c:946
-#: ../libpurple/protocols/silc10/chat.c:930
+#: libpurple/protocols/silc/chat.c:946 libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Setze Benutzer-Limit"
 
-#: ../libpurple/protocols/silc/chat.c:952
-#: ../libpurple/protocols/silc10/chat.c:936
+#: libpurple/protocols/silc/chat.c:952 libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Themenbeschr辰nkung zur端cknehmen"
 
-#: ../libpurple/protocols/silc/chat.c:957
-#: ../libpurple/protocols/silc10/chat.c:941
+#: libpurple/protocols/silc/chat.c:957 libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Setze Themenbeschr辰nkung"
 
-#: ../libpurple/protocols/silc/chat.c:964
-#: ../libpurple/protocols/silc10/chat.c:948
+#: libpurple/protocols/silc/chat.c:964 libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Privaten Kanal zur端cksetzen"
 
-#: ../libpurple/protocols/silc/chat.c:969
-#: ../libpurple/protocols/silc10/chat.c:953
+#: libpurple/protocols/silc/chat.c:969 libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Setze privaten Kanal"
 
-#: ../libpurple/protocols/silc/chat.c:976
-#: ../libpurple/protocols/silc10/chat.c:960
+#: libpurple/protocols/silc/chat.c:976 libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Geheimen Kanal zur端cksetzen"
 
-#: ../libpurple/protocols/silc/chat.c:981
-#: ../libpurple/protocols/silc10/chat.c:965
+#: libpurple/protocols/silc/chat.c:981 libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Setze geheimen Kanal"
 
-#: ../libpurple/protocols/silc/chat.c:1045
-#: ../libpurple/protocols/silc10/chat.c:1102
-#, c-format
-msgid "You have to join the %s channel before you are able to join the private group"
+#: libpurple/protocols/silc/chat.c:1045 libpurple/protocols/silc10/chat.c:1102
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
 msgstr ""
 "Sie m端ssen den Kanal %s betreten, bevor Sie die private Gruppe betreten "
 "k旦nnen"
 
-#: ../libpurple/protocols/silc/chat.c:1047
-#: ../libpurple/protocols/silc10/chat.c:1104
+#: libpurple/protocols/silc/chat.c:1047 libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Private Gruppe betreten"
 
-#: ../libpurple/protocols/silc/chat.c:1048
-#: ../libpurple/protocols/silc10/chat.c:1105
+#: libpurple/protocols/silc/chat.c:1048 libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Kann die private Gruppe nicht betreten"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1217
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: libpurple/protocols/silc/chat.c:1260 libpurple/protocols/silc/silc.c:1217
+#: libpurple/protocols/silc10/chat.c:1299
+#: libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "Kommando ausf端hren"
 
-#: ../libpurple/protocols/silc/chat.c:1260
-#: ../libpurple/protocols/silc/silc.c:1218
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: libpurple/protocols/silc/chat.c:1260 libpurple/protocols/silc/silc.c:1218
+#: libpurple/protocols/silc10/chat.c:1299
+#: libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "Kommando nicht aufrufbar"
 
-#: ../libpurple/protocols/silc/chat.c:1261
-#: ../libpurple/protocols/silc/silc.c:1219
-#: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
+#: libpurple/protocols/silc/chat.c:1261 libpurple/protocols/silc/silc.c:1219
+#: libpurple/protocols/silc10/chat.c:1300
+#: libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "Unbekanntes Kommando"
 
-#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
-#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
-#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
-#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
-#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
-#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
-#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
-#: ../libpurple/protocols/silc10/ft.c:96
-#: ../libpurple/protocols/silc10/ft.c:100
-#: ../libpurple/protocols/silc10/ft.c:104
-#: ../libpurple/protocols/silc10/ft.c:205
-#: ../libpurple/protocols/silc10/ft.c:210
-#: ../libpurple/protocols/silc10/ft.c:215
-#: ../libpurple/protocols/silc10/ft.c:221
-#: ../libpurple/protocols/silc10/ft.c:340
+#: libpurple/protocols/silc/ft.c:85 libpurple/protocols/silc/ft.c:101
+#: libpurple/protocols/silc/ft.c:104 libpurple/protocols/silc/ft.c:108
+#: libpurple/protocols/silc/ft.c:112 libpurple/protocols/silc/ft.c:116
+#: libpurple/protocols/silc/ft.c:120 libpurple/protocols/silc/ft.c:272
+#: libpurple/protocols/silc/ft.c:277 libpurple/protocols/silc/ft.c:282
+#: libpurple/protocols/silc/ft.c:288 libpurple/protocols/silc/ft.c:425
+#: libpurple/protocols/silc10/ft.c:89 libpurple/protocols/silc10/ft.c:92
+#: libpurple/protocols/silc10/ft.c:96 libpurple/protocols/silc10/ft.c:100
+#: libpurple/protocols/silc10/ft.c:104 libpurple/protocols/silc10/ft.c:205
+#: libpurple/protocols/silc10/ft.c:210 libpurple/protocols/silc10/ft.c:215
+#: libpurple/protocols/silc10/ft.c:221 libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Sichere Datei端bertragungen"
 
-#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
-#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
-#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
-#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
-#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
-#: ../libpurple/protocols/silc10/ft.c:101
-#: ../libpurple/protocols/silc10/ft.c:105
+#: libpurple/protocols/silc/ft.c:86 libpurple/protocols/silc/ft.c:102
+#: libpurple/protocols/silc/ft.c:105 libpurple/protocols/silc/ft.c:109
+#: libpurple/protocols/silc/ft.c:113 libpurple/protocols/silc/ft.c:117
+#: libpurple/protocols/silc/ft.c:121 libpurple/protocols/silc10/ft.c:90
+#: libpurple/protocols/silc10/ft.c:93 libpurple/protocols/silc10/ft.c:97
+#: libpurple/protocols/silc10/ft.c:101 libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Fehler bei der Datei端bertragung"
 
-#: ../libpurple/protocols/silc/ft.c:87
+#: libpurple/protocols/silc/ft.c:87
 msgid "Remote disconnected"
 msgstr "Die entfernte Seite hat sich abgemeldet"
 
-#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
+#: libpurple/protocols/silc/ft.c:106 libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Zugriff verweigert"
 
-#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
+#: libpurple/protocols/silc/ft.c:110 libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Schl端sselaustausch ist fehlgeschlagen"
 
-#: ../libpurple/protocols/silc/ft.c:114
+#: libpurple/protocols/silc/ft.c:114
 msgid "Connection timed out"
 msgstr "Verbindungsabbruch wegen Zeit端berschreitung"
 
-#: ../libpurple/protocols/silc/ft.c:118
+#: libpurple/protocols/silc/ft.c:118
 msgid "Creating connection failed"
 msgstr "Verbindungsherstellung fehlgeschlagen"
 
-#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
+#: libpurple/protocols/silc/ft.c:122 libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Datei端bertragungssitzung existiert nicht"
 
-#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
+#: libpurple/protocols/silc/ft.c:273 libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Keine Datei端bertragungssitzung aktiv"
 
-#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
+#: libpurple/protocols/silc/ft.c:278 libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Datei端bertragung wurde schon gestartet"
 
-#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
+#: libpurple/protocols/silc/ft.c:283 libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Kann den Schl端sselaustausch f端r die Datei端bertragung nicht vollziehen"
 
-#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
+#: libpurple/protocols/silc/ft.c:289 libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Konnte die Datei端bertragung nicht starten"
 
-#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
+#: libpurple/protocols/silc/ft.c:426 libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Kann Datei nicht senden"
 
-#: ../libpurple/protocols/silc/ops.c:57
+#: libpurple/protocols/silc/ops.c:57
 msgid "Error occurred"
 msgstr "Fehler aufgetreten"
 
-#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
-#: ../libpurple/protocols/silc/ops.c:551
-#: ../libpurple/protocols/silc10/ops.c:554
-#: ../libpurple/protocols/silc10/ops.c:563
-#: ../libpurple/protocols/silc10/ops.c:572
+#: libpurple/protocols/silc/ops.c:533 libpurple/protocols/silc/ops.c:542
+#: libpurple/protocols/silc/ops.c:551 libpurple/protocols/silc10/ops.c:554
+#: libpurple/protocols/silc10/ops.c:563 libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s hat das Thema von <I>%s</I> zu %s abge辰ndert"
 
-#: ../libpurple/protocols/silc/ops.c:617
-#: ../libpurple/protocols/silc10/ops.c:638
+#: libpurple/protocols/silc/ops.c:617 libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> setzt die Kanalmodi von <I>%s</I> auf: %s"
 
-#: ../libpurple/protocols/silc/ops.c:621
-#: ../libpurple/protocols/silc10/ops.c:642
+#: libpurple/protocols/silc/ops.c:621 libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> entfernte alle Kanalmodi auf <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:654
-#: ../libpurple/protocols/silc10/ops.c:675
+#: libpurple/protocols/silc/ops.c:654 libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> setzte die Modi von <I>%s</I> auf: %s"
 
-#: ../libpurple/protocols/silc/ops.c:662
-#: ../libpurple/protocols/silc10/ops.c:683
+#: libpurple/protocols/silc/ops.c:662 libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> entfernte alle Kanalmodi von <I>%s's</I>"
 
-#: ../libpurple/protocols/silc/ops.c:691
-#: ../libpurple/protocols/silc10/ops.c:712
+#: libpurple/protocols/silc/ops.c:691 libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "Sie wurden aus <I>%s</I> hinausgeworfen von <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
-#: ../libpurple/protocols/silc/ops.c:728
-#: ../libpurple/protocols/silc10/ops.c:742
-#: ../libpurple/protocols/silc10/ops.c:747
-#: ../libpurple/protocols/silc10/ops.c:752
+#: libpurple/protocols/silc/ops.c:718 libpurple/protocols/silc/ops.c:723
+#: libpurple/protocols/silc/ops.c:728 libpurple/protocols/silc10/ops.c:742
+#: libpurple/protocols/silc10/ops.c:747 libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "Sie wurden hinausgeworfen von %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
-#: ../libpurple/protocols/silc/ops.c:759
-#: ../libpurple/protocols/silc10/ops.c:773
-#: ../libpurple/protocols/silc10/ops.c:778
-#: ../libpurple/protocols/silc10/ops.c:783
+#: libpurple/protocols/silc/ops.c:749 libpurple/protocols/silc/ops.c:754
+#: libpurple/protocols/silc/ops.c:759 libpurple/protocols/silc10/ops.c:773
+#: libpurple/protocols/silc10/ops.c:778 libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Hinausgeworfen durch %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:796
-#: ../libpurple/protocols/silc10/ops.c:829
+#: libpurple/protocols/silc/ops.c:796 libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Server abgemeldet"
 
-#: ../libpurple/protocols/silc/ops.c:983
-#: ../libpurple/protocols/silc10/ops.c:1017
+#: libpurple/protocols/silc/ops.c:983 libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Pers旦nliche Informationen"
 
-#: ../libpurple/protocols/silc/ops.c:1006
-#: ../libpurple/protocols/silc10/ops.c:1040
+#: libpurple/protocols/silc/ops.c:1006 libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Geburtstag"
 
-#: ../libpurple/protocols/silc/ops.c:1014
-#: ../libpurple/protocols/silc10/ops.c:1048
+#: libpurple/protocols/silc/ops.c:1014 libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Position"
 
-#: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1013
-#: ../libpurple/protocols/silc10/ops.c:1052
-#: ../libpurple/protocols/silc10/silc.c:924
+#: libpurple/protocols/silc/ops.c:1018 libpurple/protocols/silc/silc.c:1013
+#: libpurple/protocols/silc10/ops.c:1052 libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "Organisation"
 
-#: ../libpurple/protocols/silc/ops.c:1022
-#: ../libpurple/protocols/silc10/ops.c:1056
+#: libpurple/protocols/silc/ops.c:1022 libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Abteilung"
 
-#: ../libpurple/protocols/silc/ops.c:1046
-#: ../libpurple/protocols/silc10/ops.c:1080
+#: libpurple/protocols/silc/ops.c:1046 libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Bemerkung"
 
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
+#: libpurple/protocols/silc/ops.c:1093 libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Chat betreten"
 
-#: ../libpurple/protocols/silc/ops.c:1127
-#: ../libpurple/protocols/silc10/chat.c:1039
+#: libpurple/protocols/silc/ops.c:1127 libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Sie sind der Gr端nder des Kanals <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1131
-#: ../libpurple/protocols/silc10/chat.c:1043
+#: libpurple/protocols/silc/ops.c:1131 libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Gr端nder des Kanals <I>%s</I> ist <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1326
-#: ../libpurple/protocols/silc10/ops.c:1183
-#: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
+#: libpurple/protocols/silc/ops.c:1190 libpurple/protocols/silc/ops.c:1326
+#: libpurple/protocols/silc10/ops.c:1183 libpurple/protocols/silc10/ops.c:1332
+#: libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "Echter Name"
 
-#: ../libpurple/protocols/silc/ops.c:1218
-#: ../libpurple/protocols/silc10/ops.c:1213
+#: libpurple/protocols/silc/ops.c:1218 libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Statustext"
 
-#: ../libpurple/protocols/silc/ops.c:1279
-#: ../libpurple/protocols/silc/ops.c:1351
-#: ../libpurple/protocols/silc10/ops.c:1285
-#: ../libpurple/protocols/silc10/ops.c:1357
+#: libpurple/protocols/silc/ops.c:1279 libpurple/protocols/silc/ops.c:1351
+#: libpurple/protocols/silc10/ops.c:1285 libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "�ffentlicher Schl端ssel-Fingerprint"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1352
-#: ../libpurple/protocols/silc10/ops.c:1286
-#: ../libpurple/protocols/silc10/ops.c:1358
+#: libpurple/protocols/silc/ops.c:1280 libpurple/protocols/silc/ops.c:1352
+#: libpurple/protocols/silc10/ops.c:1286 libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "�ffentlicher Schl端ssel-Babbleprint"
 
-#: ../libpurple/protocols/silc/ops.c:1292
-#: ../libpurple/protocols/silc10/ops.c:1298
+#: libpurple/protocols/silc/ops.c:1292 libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Mehr..."
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc/silc.c:1077
-#: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
+#: libpurple/protocols/silc/ops.c:1369 libpurple/protocols/silc/silc.c:1077
+#: libpurple/protocols/silc10/ops.c:1371 libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "Vom Server trennen"
 
-#: ../libpurple/protocols/silc/ops.c:1369
-#: ../libpurple/protocols/silc10/ops.c:1371
+#: libpurple/protocols/silc/ops.c:1369 libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Trennung nicht m旦glich"
 
-#: ../libpurple/protocols/silc/ops.c:1389
-#: ../libpurple/protocols/silc10/ops.c:1382
+#: libpurple/protocols/silc/ops.c:1389 libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Kann das Thema nicht setzen"
 
-#: ../libpurple/protocols/silc/ops.c:1418
-#: ../libpurple/protocols/silc10/ops.c:1414
+#: libpurple/protocols/silc/ops.c:1418 libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Kann den Nickname nicht 辰ndern"
 
-#: ../libpurple/protocols/silc/ops.c:1467
-#: ../libpurple/protocols/silc10/ops.c:1462
+#: libpurple/protocols/silc/ops.c:1467 libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Raumliste"
 
-#: ../libpurple/protocols/silc/ops.c:1467
-#: ../libpurple/protocols/silc10/ops.c:1462
+#: libpurple/protocols/silc/ops.c:1467 libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Kamm die Raumliste nicht abrufen"
 
-#: ../libpurple/protocols/silc/ops.c:1468
+#: libpurple/protocols/silc/ops.c:1468
 msgid "Network is empty"
 msgstr "Netzwerk ist leer"
 
-#: ../libpurple/protocols/silc/ops.c:1512
-#: ../libpurple/protocols/silc10/ops.c:1507
+#: libpurple/protocols/silc/ops.c:1512 libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Kein 旦ffentlicher Schl端ssel empfangen"
 
-#: ../libpurple/protocols/silc/ops.c:1524
-#: ../libpurple/protocols/silc/ops.c:1537
-#: ../libpurple/protocols/silc10/ops.c:1519
-#: ../libpurple/protocols/silc10/ops.c:1532
+#: libpurple/protocols/silc/ops.c:1524 libpurple/protocols/silc/ops.c:1537
+#: libpurple/protocols/silc10/ops.c:1519 libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Serverinformation"
 
-#: ../libpurple/protocols/silc/ops.c:1525
-#: ../libpurple/protocols/silc10/ops.c:1520
+#: libpurple/protocols/silc/ops.c:1525 libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Kann die Serverinformation nicht abrufen"
 
-#: ../libpurple/protocols/silc/ops.c:1548
-#: ../libpurple/protocols/silc10/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1558
+#: libpurple/protocols/silc/ops.c:1548 libpurple/protocols/silc10/ops.c:1549
+#: libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Serverstatistik"
 
-#: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1550
+#: libpurple/protocols/silc/ops.c:1549 libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Kann die Serverstatistik nicht abrufen"
 
-#: ../libpurple/protocols/silc/ops.c:1556
-#: ../libpurple/protocols/silc10/ops.c:1581
+#: libpurple/protocols/silc/ops.c:1556 libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9940,66 +9669,54 @@
 "Server-Operatoren insgesamt: %d\n"
 "Router-Operatoren insgesamt: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1588
-#: ../libpurple/protocols/silc10/ops.c:1604
+#: libpurple/protocols/silc/ops.c:1588 libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Netzwerkstatistik"
 
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
+#: libpurple/protocols/silc/ops.c:1596 libpurple/protocols/silc/ops.c:1601
+#: libpurple/protocols/silc10/ops.c:1612 libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/silc/ops.c:1596
-#: ../libpurple/protocols/silc10/ops.c:1612
+#: libpurple/protocols/silc/ops.c:1596 libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping fehlgeschlagen"
 
-#: ../libpurple/protocols/silc/ops.c:1601
-#: ../libpurple/protocols/silc10/ops.c:1617
+#: libpurple/protocols/silc/ops.c:1601 libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Antwort auf ein Ping vom Server empfangen"
 
-#: ../libpurple/protocols/silc/ops.c:1609
-#: ../libpurple/protocols/silc10/ops.c:1625
+#: libpurple/protocols/silc/ops.c:1609 libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Kann den Benutzer nicht hinauswerfen"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: libpurple/protocols/silc/ops.c:1648
 msgid "WATCH"
 msgstr "Beobachten"
 
-#: ../libpurple/protocols/silc/ops.c:1648
+#: libpurple/protocols/silc/ops.c:1648
 msgid "Cannot watch user"
 msgstr "Kann den Benutzer nicht beobachten"
 
-#: ../libpurple/protocols/silc/ops.c:1724
-#: ../libpurple/protocols/silc/ops.c:1775
-#: ../libpurple/protocols/silc/silc.c:277
-#: ../libpurple/protocols/silc10/ops.c:1811
-#: ../libpurple/protocols/silc10/ops.c:1858
-#: ../libpurple/protocols/silc10/silc.c:190
+#: libpurple/protocols/silc/ops.c:1724 libpurple/protocols/silc/ops.c:1775
+#: libpurple/protocols/silc/silc.c:277 libpurple/protocols/silc10/ops.c:1811
+#: libpurple/protocols/silc10/ops.c:1858 libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Sitzung wird fortgesetzt"
 
-#: ../libpurple/protocols/silc/ops.c:1726
-#: ../libpurple/protocols/silc10/ops.c:1813
+#: libpurple/protocols/silc/ops.c:1726 libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Verbindung wird authentifiziert"
 
-#: ../libpurple/protocols/silc/ops.c:1777
-#: ../libpurple/protocols/silc10/ops.c:1860
+#: libpurple/protocols/silc/ops.c:1777 libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "�berpr端fung des 旦ffentlichen Schl端ssels des Servers"
 
-#: ../libpurple/protocols/silc/ops.c:1814
-#: ../libpurple/protocols/silc10/ops.c:1902
+#: libpurple/protocols/silc/ops.c:1814 libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Passphrase erforderlich"
 
-#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
+#: libpurple/protocols/silc/pk.c:98 libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -10009,14 +9726,14 @@
 "nicht mit diesem Schl端ssel 端berein. M旦chten Sie trotzdem diesen (neuen) "
 "Schl端ssel akzeptieren?"
 
-#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
+#: libpurple/protocols/silc/pk.c:103 libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr ""
 "�ffentlicher Schl端ssel von %s wurde empfangen. M旦chten Sie diesen "
 "旦ffentlichen Schl端ssel akzeptieren?"
 
-#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
+#: libpurple/protocols/silc/pk.c:107 libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -10029,99 +9746,88 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
-#: ../libpurple/protocols/silc10/pk.c:116
-#: ../libpurple/protocols/silc10/pk.c:142
+#: libpurple/protocols/silc/pk.c:110 libpurple/protocols/silc/pk.c:139
+#: libpurple/protocols/silc10/pk.c:116 libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "�ffentlichen Schl端ssel ansehen"
 
-#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
+#: libpurple/protocols/silc/pk.c:115 libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Ansehen..."
 
-#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
+#: libpurple/protocols/silc/pk.c:140 libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Nicht-unterst端tzter Typ f端r den 旦ffentlichen Schl端ssel"
 
-#: ../libpurple/protocols/silc/silc.c:217
-#: ../libpurple/protocols/silc10/ops.c:1749
+#: libpurple/protocols/silc/silc.c:217 libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr "Abgemeldet vom Server"
 
-#: ../libpurple/protocols/silc/silc.c:224
-#: ../libpurple/protocols/silc10/ops.c:1700
+#: libpurple/protocols/silc/silc.c:224 libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
 msgstr "Fehler beim Verbinden mit dem SILC-Server"
 
-#: ../libpurple/protocols/silc/silc.c:229
-#: ../libpurple/protocols/silc10/ops.c:1705
+#: libpurple/protocols/silc/silc.c:229 libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "Schl端sselaustausch gescheitert"
 
-#: ../libpurple/protocols/silc/silc.c:238
-#: ../libpurple/protocols/silc10/ops.c:1714
-msgid "Resuming detached session failed. Press Reconnect to create new connection."
+#: libpurple/protocols/silc/silc.c:238 libpurple/protocols/silc10/ops.c:1714
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
 msgstr ""
 "Das Fortsetzen der angehaltenen Sitzung ist fehlgeschlagen. Bitte dr端cken "
 "Sie ��Neu Verbinden��, um eine neue Verbindung zu erzeugen."
 
-#: ../libpurple/protocols/silc/silc.c:265
-#: ../libpurple/protocols/silc/silc.c:311
-#: ../libpurple/protocols/silc10/silc.c:161
+#: libpurple/protocols/silc/silc.c:265 libpurple/protocols/silc/silc.c:311
+#: libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Verbindung fehlgeschlagen"
 
-#: ../libpurple/protocols/silc/silc.c:280
-#: ../libpurple/protocols/silc10/silc.c:193
+#: libpurple/protocols/silc/silc.c:280 libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Schl端sselaustausch"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:343
-#: ../libpurple/protocols/silc10/silc.c:325
+#: libpurple/protocols/silc/silc.c:343 libpurple/protocols/silc10/silc.c:325
 msgid "Connecting to SILC Server"
 msgstr "Verbinde mit SILC-Server"
 
-#: ../libpurple/protocols/silc/silc.c:352
+#: libpurple/protocols/silc/silc.c:352
+#, c-format
 msgid "Could not load SILC key pair"
 msgstr "Konnte SILC-Schl端sselpaar nicht laden"
 
-#: ../libpurple/protocols/silc/silc.c:366
-#: ../libpurple/protocols/silc10/silc.c:355
+#: libpurple/protocols/silc/silc.c:366 libpurple/protocols/silc10/silc.c:355
 msgid "Unable to create connection"
 msgstr "Kann Verbindung nicht erstellen"
 
-#: ../libpurple/protocols/silc/silc.c:395
-#: ../libpurple/protocols/silc10/silc.c:267
+#: libpurple/protocols/silc/silc.c:395 libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Kein Speicher verf端gbar"
 
-#: ../libpurple/protocols/silc/silc.c:438
-#: ../libpurple/protocols/silc10/silc.c:313
+#: libpurple/protocols/silc/silc.c:438 libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Kann das SILC-Protokoll nicht initialisieren"
 
-#: ../libpurple/protocols/silc/silc.c:445
+#: libpurple/protocols/silc/silc.c:445
 msgid "Error loading SILC key pair"
 msgstr "Fehler beim Laden des SILC-Schl端sselpaares"
 
-#: ../libpurple/protocols/silc/silc.c:739
-#: ../libpurple/protocols/silc10/silc.c:650
+#: libpurple/protocols/silc/silc.c:739 libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Ihre momentane Stimmung"
 
-#: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1636
+#: libpurple/protocols/silc/silc.c:741 libpurple/protocols/silc10/silc.c:652
+#: pidgin/gtkprefs.c:1636
+#, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:755
-#: ../libpurple/protocols/silc10/silc.c:666
+#: libpurple/protocols/silc/silc.c:755 libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Verliebt"
 
-#: ../libpurple/protocols/silc/silc.c:766
-#: ../libpurple/protocols/silc10/silc.c:677
+#: libpurple/protocols/silc/silc.c:766 libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -10129,63 +9835,50 @@
 "\n"
 "Ihre gew端nschten Kontaktmethoden"
 
-#: ../libpurple/protocols/silc/silc.c:774
-#: ../libpurple/protocols/silc/util.c:561
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:557
+#: libpurple/protocols/silc/silc.c:774 libpurple/protocols/silc/util.c:561
+#: libpurple/protocols/silc10/silc.c:685 libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:776
-#: ../libpurple/protocols/silc/util.c:563
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/util.c:559
+#: libpurple/protocols/silc/silc.c:776 libpurple/protocols/silc/util.c:563
+#: libpurple/protocols/silc10/silc.c:687 libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:689
+#: libpurple/protocols/silc/silc.c:778 libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Videokonferenz"
 
-#: ../libpurple/protocols/silc/silc.c:783
-#: ../libpurple/protocols/silc10/silc.c:694
+#: libpurple/protocols/silc/silc.c:783 libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Ihr aktueller Status"
 
-#: ../libpurple/protocols/silc/silc.c:790
-#: ../libpurple/protocols/silc10/silc.c:701
+#: libpurple/protocols/silc/silc.c:790 libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Online-Dienste"
 
-#: ../libpurple/protocols/silc/silc.c:793
-#: ../libpurple/protocols/silc10/silc.c:704
+#: libpurple/protocols/silc/silc.c:793 libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Andere Benutzer k旦nnen sehen, welche Dienste Sie nutzen"
 
-#: ../libpurple/protocols/silc/silc.c:799
-#: ../libpurple/protocols/silc10/silc.c:710
+#: libpurple/protocols/silc/silc.c:799 libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Andere Benutzer k旦nnen sehen, welchen Computer Sie nutzen"
 
-#: ../libpurple/protocols/silc/silc.c:806
-#: ../libpurple/protocols/silc10/silc.c:717
+#: libpurple/protocols/silc/silc.c:806 libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Ihre VCard-Datei"
 
-#: ../libpurple/protocols/silc/silc.c:812
+#: libpurple/protocols/silc/silc.c:812
 msgid "Timezone (UTC)"
 msgstr "Zeitzone (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:816
-#: ../libpurple/protocols/silc/silc.c:817
-#: ../libpurple/protocols/silc10/silc.c:729
-#: ../libpurple/protocols/silc10/silc.c:730
+#: libpurple/protocols/silc/silc.c:816 libpurple/protocols/silc/silc.c:817
+#: libpurple/protocols/silc10/silc.c:729 libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Online-Statusattribute des Benutzers"
 
-#: ../libpurple/protocols/silc/silc.c:818
-#: ../libpurple/protocols/silc10/silc.c:731
+#: libpurple/protocols/silc/silc.c:818 libpurple/protocols/silc10/silc.c:731
 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 "
@@ -10195,216 +9888,175 @@
 "Informationen zug辰nglich machen. Bitte f端llen Sie die Informationen aus, die "
 "andere Benutzer von Ihnen sehen k旦nnen."
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc/silc.c:865
-#: ../libpurple/protocols/silc/silc.c:1486
-#: ../libpurple/protocols/silc10/silc.c:772
-#: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
+#: libpurple/protocols/silc/silc.c:859 libpurple/protocols/silc/silc.c:865
+#: libpurple/protocols/silc/silc.c:1486 libpurple/protocols/silc10/silc.c:772
+#: libpurple/protocols/silc10/silc.c:778
+#: libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "Nachricht des Tages"
 
-#: ../libpurple/protocols/silc/silc.c:859
-#: ../libpurple/protocols/silc10/silc.c:772
+#: libpurple/protocols/silc/silc.c:859 libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Keine Nachricht-des-Tages verf端gbar"
 
-#: ../libpurple/protocols/silc/silc.c:860
-#: ../libpurple/protocols/silc/silc.c:1481
-#: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
+#: libpurple/protocols/silc/silc.c:860 libpurple/protocols/silc/silc.c:1481
+#: libpurple/protocols/silc10/silc.c:773
+#: libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Es gibt keine Nachricht-des-Tages zu dieser Verbindung"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc/silc.c:1028
-#: ../libpurple/protocols/silc/silc.c:1029
-#: ../libpurple/protocols/silc10/silc.c:824
-#: ../libpurple/protocols/silc10/silc.c:868
-#: ../libpurple/protocols/silc10/silc.c:939
-#: ../libpurple/protocols/silc10/silc.c:940
+#: libpurple/protocols/silc/silc.c:911 libpurple/protocols/silc/silc.c:957
+#: libpurple/protocols/silc/silc.c:1028 libpurple/protocols/silc/silc.c:1029
+#: libpurple/protocols/silc10/silc.c:824 libpurple/protocols/silc10/silc.c:868
+#: libpurple/protocols/silc10/silc.c:939 libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "Erstelle ein neues SILC-Schl端sselpaar"
 
-#: ../libpurple/protocols/silc/silc.c:911
-#: ../libpurple/protocols/silc10/silc.c:824
+#: libpurple/protocols/silc/silc.c:911 libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "Passphrasen stimmen nicht 端berein"
 
-#: ../libpurple/protocols/silc/silc.c:957
-#: ../libpurple/protocols/silc10/silc.c:868
+#: libpurple/protocols/silc/silc.c:957 libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Schl端sselerzeugung ist fehlgeschlagen"
 
-#: ../libpurple/protocols/silc/silc.c:996
-#: ../libpurple/protocols/silc10/silc.c:907
+#: libpurple/protocols/silc/silc.c:996 libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Schl端ssell辰nge"
 
-#: ../libpurple/protocols/silc/silc.c:998
-#: ../libpurple/protocols/silc10/silc.c:909
+#: libpurple/protocols/silc/silc.c:998 libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "�ffentlicher Schl端ssel (Datei)"
 
-#: ../libpurple/protocols/silc/silc.c:1000
-#: ../libpurple/protocols/silc10/silc.c:911
+#: libpurple/protocols/silc/silc.c:1000 libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Privater Schl端ssel (Datei)"
 
-#: ../libpurple/protocols/silc/silc.c:1023
-#: ../libpurple/protocols/silc10/silc.c:934
+#: libpurple/protocols/silc/silc.c:1023 libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Passphrase (nochmal)"
 
-#: ../libpurple/protocols/silc/silc.c:1030
-#: ../libpurple/protocols/silc10/silc.c:941
+#: libpurple/protocols/silc/silc.c:1030 libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Schl端sselpaar erzeugen"
 
-#: ../libpurple/protocols/silc/silc.c:1073
-#: ../libpurple/protocols/silc10/silc.c:984
+#: libpurple/protocols/silc/silc.c:1073 libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Online-Status"
 
-#: ../libpurple/protocols/silc/silc.c:1081
-#: ../libpurple/protocols/silc10/silc.c:992
+#: libpurple/protocols/silc/silc.c:1081 libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "Nachricht des Tages anschauen"
 
-#: ../libpurple/protocols/silc/silc.c:1085
-#: ../libpurple/protocols/silc10/silc.c:996
+#: libpurple/protocols/silc/silc.c:1085 libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "SILC-Schl端sselpaar erstellen..."
 
-#: ../libpurple/protocols/silc/silc.c:1177
-#: ../libpurple/protocols/silc10/silc.c:1095
+#: libpurple/protocols/silc/silc.c:1177 libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Benutzer <I>%s</I> ist nicht im Netzwerk pr辰sent"
 
-#: ../libpurple/protocols/silc/silc.c:1357
-#: ../libpurple/protocols/silc10/silc.c:1286
+#: libpurple/protocols/silc/silc.c:1357 libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "Thema zu lang"
 
-#: ../libpurple/protocols/silc/silc.c:1438
-#: ../libpurple/protocols/silc10/silc.c:1367
+#: libpurple/protocols/silc/silc.c:1438 libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "Sie m端ssen einen Nick angeben"
 
-#: ../libpurple/protocols/silc/silc.c:1540
-#: ../libpurple/protocols/silc10/silc.c:1469
+#: libpurple/protocols/silc/silc.c:1540 libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "Kanal %s nicht gefunden"
 
-#: ../libpurple/protocols/silc/silc.c:1545
-#: ../libpurple/protocols/silc10/silc.c:1474
+#: libpurple/protocols/silc/silc.c:1545 libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "Kanal-Modi f端r %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1547
-#: ../libpurple/protocols/silc10/silc.c:1476
+#: libpurple/protocols/silc/silc.c:1547 libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "F端r den Kanal %s sind keine Kanal-Modi gesetzt"
 
-#: ../libpurple/protocols/silc/silc.c:1560
-#: ../libpurple/protocols/silc10/silc.c:1489
+#: libpurple/protocols/silc/silc.c:1560 libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Setzen der cmodes f端r %s gescheitert"
 
-#: ../libpurple/protocols/silc/silc.c:1590
-#: ../libpurple/protocols/silc10/silc.c:1519
+#: libpurple/protocols/silc/silc.c:1590 libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Unbekanntes Kommando: %s, (m旦glicherweise ein Bug)"
 
-#: ../libpurple/protocols/silc/silc.c:1653
-#: ../libpurple/protocols/silc10/silc.c:1582
+#: libpurple/protocols/silc/silc.c:1653 libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [Kanal]:  Verlasse den Chat"
 
-#: ../libpurple/protocols/silc/silc.c:1657
-#: ../libpurple/protocols/silc10/silc.c:1586
+#: libpurple/protocols/silc/silc.c:1657 libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [Kanal]:  Verlassen des Chats"
 
-#: ../libpurple/protocols/silc/silc.c:1661
-#: ../libpurple/protocols/silc10/silc.c:1590
+#: libpurple/protocols/silc/silc.c:1661 libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;neues Thema&gt;]:  Thema 辰ndern oder anzeigen"
 
-#: ../libpurple/protocols/silc/silc.c:1666
-#: ../libpurple/protocols/silc10/silc.c:1595
+#: libpurple/protocols/silc/silc.c:1666 libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join &lt;Kanal&gt; [&lt;Passwort&gt;]:  Betrete einen Chat in diesem Netzwerk"
-
-#: ../libpurple/protocols/silc/silc.c:1670
-#: ../libpurple/protocols/silc10/silc.c:1599
+msgstr ""
+"join &lt;Kanal&gt; [&lt;Passwort&gt;]:  Betrete einen Chat in diesem Netzwerk"
+
+#: libpurple/protocols/silc/silc.c:1670 libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list:  Liste Kan辰le in diesem Netzwerk auf"
 
-#: ../libpurple/protocols/silc/silc.c:1674
-#: ../libpurple/protocols/silc10/silc.c:1603
+#: libpurple/protocols/silc/silc.c:1674 libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;Nick&gt;:  Informationen zum Nick anzeigen"
 
-#: ../libpurple/protocols/silc/silc.c:1678
-#: ../libpurple/protocols/silc10/silc.c:1607
-#: ../libpurple/protocols/zephyr/zephyr.c:2685
+#: libpurple/protocols/silc/silc.c:1678 libpurple/protocols/silc10/silc.c:1607
+#: libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;Benutzer&gt; &lt;Nachricht&gt;:  Sendet eine private Nachricht an "
 "einen anderen Benutzer"
 
-#: ../libpurple/protocols/silc/silc.c:1682
-#: ../libpurple/protocols/silc10/silc.c:1611
+#: libpurple/protocols/silc/silc.c:1682 libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;Nick&gt; [&lt;Nachricht&gt;]:  Sende eine private Nachricht an "
 "einen Benutzer"
 
-#: ../libpurple/protocols/silc/silc.c:1686
-#: ../libpurple/protocols/silc10/silc.c:1615
+#: libpurple/protocols/silc/silc.c:1686 libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Nachricht des Tages vom Server anzeigen"
 
-#: ../libpurple/protocols/silc/silc.c:1690
-#: ../libpurple/protocols/silc10/silc.c:1619
+#: libpurple/protocols/silc/silc.c:1690 libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:  Sitzung beenden"
 
-#: ../libpurple/protocols/silc/silc.c:1694
-#: ../libpurple/protocols/silc10/silc.c:1623
+#: libpurple/protocols/silc/silc.c:1694 libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [Nachricht]:  Trennung vom Server mit einer optionalen Nachricht"
 
-#: ../libpurple/protocols/silc/silc.c:1698
-#: ../libpurple/protocols/silc10/silc.c:1627
+#: libpurple/protocols/silc/silc.c:1698 libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;Kommando&gt;:  Rufe ein Silc-Client-Kommando auf"
 
-#: ../libpurple/protocols/silc/silc.c:1704
-#: ../libpurple/protocols/silc10/silc.c:1633
+#: libpurple/protocols/silc/silc.c:1704 libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;Nick&gt; [-pubkey|&lt;Grund&gt;]:  Killt einen Nick"
 
-#: ../libpurple/protocols/silc/silc.c:1708
-#: ../libpurple/protocols/silc10/silc.c:1637
+#: libpurple/protocols/silc/silc.c:1708 libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;neue Nickname&gt;:  Ihren Nickname 辰ndern"
 
-#: ../libpurple/protocols/silc/silc.c:1712
-#: ../libpurple/protocols/silc10/silc.c:1641
+#: libpurple/protocols/silc/silc.c:1712 libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;Nick&gt;:  Informationen zu einem Benutzer abrufen"
 
-#: ../libpurple/protocols/silc/silc.c:1716
-#: ../libpurple/protocols/silc10/silc.c:1645
+#: libpurple/protocols/silc/silc.c:1716 libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -10412,8 +10064,7 @@
 "cmode &lt;Kanal&gt; [+|-&lt;Modi&gt;] [Argumente]:  Kanal-Modi 辰ndern oder "
 "anzeigen"
 
-#: ../libpurple/protocols/silc/silc.c:1720
-#: ../libpurple/protocols/silc10/silc.c:1649
+#: libpurple/protocols/silc/silc.c:1720 libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -10421,18 +10072,17 @@
 "cumode &lt;Kanal&gt; +|-&lt;Modi&gt; &lt;Nick&gt;:  Modi des Benutzers auf "
 "dem Kanal 辰ndern"
 
-#: ../libpurple/protocols/silc/silc.c:1724
-#: ../libpurple/protocols/silc10/silc.c:1653
+#: libpurple/protocols/silc/silc.c:1724 libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
-msgstr "umode &lt;Benutzeroptionen&gt;:  Setze Ihre Benutzeroptionen im Netzwerk"
-
-#: ../libpurple/protocols/silc/silc.c:1728
-#: ../libpurple/protocols/silc10/silc.c:1657
+msgstr ""
+"umode &lt;Benutzeroptionen&gt;:  Setze Ihre Benutzeroptionen im Netzwerk"
+
+#: libpurple/protocols/silc/silc.c:1728 libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
-msgstr "oper &lt;Nick&gt; [-pubkey]:  Privilegien des Server-Operators verlangen"
-
-#: ../libpurple/protocols/silc/silc.c:1732
-#: ../libpurple/protocols/silc10/silc.c:1661
+msgstr ""
+"oper &lt;Nick&gt; [-pubkey]:  Privilegien des Server-Operators verlangen"
+
+#: libpurple/protocols/silc/silc.c:1732 libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10440,47 +10090,39 @@
 "invite &lt;Kanal&gt; [-|+]&lt;Nick&gt;:  Benutzer einladen oder Benutzer zur "
 "Einladungsliste des Kanals hinzuf端gen oder von der Einladungsliste entfernen"
 
-#: ../libpurple/protocols/silc/silc.c:1736
-#: ../libpurple/protocols/silc10/silc.c:1665
+#: libpurple/protocols/silc/silc.c:1736 libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;Kanal&gt; &lt;Nick&gt; [Kommentar]:  Kickt einen Benutzer aus dem "
 "Kanal"
 
-#: ../libpurple/protocols/silc/silc.c:1740
-#: ../libpurple/protocols/silc10/silc.c:1669
+#: libpurple/protocols/silc/silc.c:1740 libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [Server]:  Administrative Details des Servers ansehen"
 
-#: ../libpurple/protocols/silc/silc.c:1744
-#: ../libpurple/protocols/silc10/silc.c:1673
+#: libpurple/protocols/silc/silc.c:1744 libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;Kanal&gt; +|-&lt;Nick&gt;]:  Verbanne Benutzer vom Kanal"
 
-#: ../libpurple/protocols/silc/silc.c:1748
-#: ../libpurple/protocols/silc10/silc.c:1677
+#: libpurple/protocols/silc/silc.c:1748 libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;Nick|Server&gt;:  �ffentlichen Schl端ssel der Servers oder des "
 "Benutzers abrufen"
 
-#: ../libpurple/protocols/silc/silc.c:1752
-#: ../libpurple/protocols/silc10/silc.c:1681
+#: libpurple/protocols/silc/silc.c:1752 libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Server- und Netzwerkstatistik ansehen"
 
-#: ../libpurple/protocols/silc/silc.c:1756
-#: ../libpurple/protocols/silc10/silc.c:1685
+#: libpurple/protocols/silc/silc.c:1756 libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Sendet PING an den verbundenen Server"
 
-#: ../libpurple/protocols/silc/silc.c:1761
-#: ../libpurple/protocols/silc10/silc.c:1690
+#: libpurple/protocols/silc/silc.c:1761 libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;Kanal&gt;:  Benutzer im Kanal auflisten"
 
-#: ../libpurple/protocols/silc/silc.c:1765
-#: ../libpurple/protocols/silc10/silc.c:1694
+#: libpurple/protocols/silc/silc.c:1765 libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10497,141 +10139,118 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1876
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: libpurple/protocols/silc/silc.c:1876 libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "SILC-Protokoll-Plugin"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1878
-#: ../libpurple/protocols/silc10/silc.c:1821
+#: libpurple/protocols/silc/silc.c:1878 libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Sichere Internet Live Konferenz (SILC) Protokoll"
 
-#: ../libpurple/protocols/silc/silc.c:1910
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2029
+#: libpurple/protocols/silc/silc.c:1910 libpurple/protocols/silc10/silc.c:1853
+#: pidgin/gtkprefs.c:2029
 msgid "Network"
 msgstr "Netzwerk"
 
-#: ../libpurple/protocols/silc/silc.c:1921
-#: ../libpurple/protocols/silc10/silc.c:1864
+#: libpurple/protocols/silc/silc.c:1921 libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "�ffentlicher Schl端ssel (Datei)"
 
-#: ../libpurple/protocols/silc/silc.c:1925
-#: ../libpurple/protocols/silc10/silc.c:1868
+#: libpurple/protocols/silc/silc.c:1925 libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "Privater Schl端ssel (Datei)"
 
-#: ../libpurple/protocols/silc/silc.c:1935
-#: ../libpurple/protocols/silc10/silc.c:1878
+#: libpurple/protocols/silc/silc.c:1935 libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "Verschl端sselung"
 
-#: ../libpurple/protocols/silc/silc.c:1945
-#: ../libpurple/protocols/silc10/silc.c:1888
+#: libpurple/protocols/silc/silc.c:1945 libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1948
+#: libpurple/protocols/silc/silc.c:1948
 msgid "Use Perfect Forward Secrecy"
 msgstr "Benutze perfekt fortgesetzte Geheimhaltung (PFS)"
 
-#: ../libpurple/protocols/silc/silc.c:1952
-#: ../libpurple/protocols/silc10/silc.c:1891
+#: libpurple/protocols/silc/silc.c:1952 libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "Authentifizierung mit 旦ffentlichem Schl端ssel"
 
-#: ../libpurple/protocols/silc/silc.c:1955
-#: ../libpurple/protocols/silc10/silc.c:1894
+#: libpurple/protocols/silc/silc.c:1955 libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Blockiere IMs ohne Schl端sselaustausch"
 
-#: ../libpurple/protocols/silc/silc.c:1958
-#: ../libpurple/protocols/silc10/silc.c:1897
+#: libpurple/protocols/silc/silc.c:1958 libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "Blockiere Nachrichten zum Whiteboard"
 
-#: ../libpurple/protocols/silc/silc.c:1961
-#: ../libpurple/protocols/silc10/silc.c:1900
+#: libpurple/protocols/silc/silc.c:1961 libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "Whiteboard automatisch 旦ffnen"
 
-#: ../libpurple/protocols/silc/silc.c:1964
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: libpurple/protocols/silc/silc.c:1964 libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "Alle IM-Nachrichten digital unterschreiben und 端berpr端fen"
 
-#: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:249
-#: ../libpurple/protocols/silc10/util.c:207
-#: ../libpurple/protocols/silc10/util.c:247
+#: libpurple/protocols/silc/util.c:207 libpurple/protocols/silc/util.c:249
+#: libpurple/protocols/silc10/util.c:207 libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Erstelle SILC-Schl端sselpaar..."
 
-#: ../libpurple/protocols/silc/util.c:215
-#: ../libpurple/protocols/silc/util.c:257
+#: libpurple/protocols/silc/util.c:215 libpurple/protocols/silc/util.c:257
 msgid "Cannot create SILC key pair\n"
-msgstr "Kan SILC-Schl端sselpaar nicht erstellen\n"
+msgstr "Kann SILC-Schl端sselpaar nicht erstellen\n"
 
 #. 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)
-#: ../libpurple/protocols/silc/util.c:358
-#: ../libpurple/protocols/silc10/util.c:355
+#: libpurple/protocols/silc/util.c:358 libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Echter Name: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:360
-#: ../libpurple/protocols/silc10/util.c:357
+#: libpurple/protocols/silc/util.c:360 libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Benutzername: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:362
-#: ../libpurple/protocols/silc10/util.c:359
+#: libpurple/protocols/silc/util.c:362 libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-Mail: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:364
-#: ../libpurple/protocols/silc10/util.c:361
+#: libpurple/protocols/silc/util.c:364 libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Rechnername: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
-#: ../libpurple/protocols/silc10/util.c:363
+#: libpurple/protocols/silc/util.c:366 libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisation: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
-#: ../libpurple/protocols/silc10/util.c:365
+#: libpurple/protocols/silc/util.c:368 libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Land: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:369
-#: ../libpurple/protocols/silc10/util.c:366
+#: libpurple/protocols/silc/util.c:369 libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algorithmus: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
-#: ../libpurple/protocols/silc10/util.c:367
+#: libpurple/protocols/silc/util.c:370 libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Schl端ssell辰nge: \t%d Bits\n"
 
-#: ../libpurple/protocols/silc/util.c:372
+#: libpurple/protocols/silc/util.c:372
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Version: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:369
+#: libpurple/protocols/silc/util.c:374 libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10642,8 +10261,7 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:375
-#: ../libpurple/protocols/silc10/util.c:370
+#: libpurple/protocols/silc/util.c:375 libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10652,46 +10270,39 @@
 "�ffentlicher Schl端ssel Babbleprint:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc/util.c:380
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
+#: libpurple/protocols/silc/util.c:379 libpurple/protocols/silc/util.c:380
+#: libpurple/protocols/silc10/util.c:374 libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Informationen zum 旦ffentlichen Schl端ssel"
 
-#: ../libpurple/protocols/silc/util.c:559
-#: ../libpurple/protocols/silc10/util.c:555
+#: libpurple/protocols/silc/util.c:559 libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Funkruf"
 
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/util.c:561
+#: libpurple/protocols/silc/util.c:565 libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videokonferenz"
 
-#: ../libpurple/protocols/silc/util.c:583
-#: ../libpurple/protocols/silc10/util.c:579
+#: libpurple/protocols/silc/util.c:583 libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Computer"
 
-#: ../libpurple/protocols/silc/util.c:587
-#: ../libpurple/protocols/silc10/util.c:583
+#: libpurple/protocols/silc/util.c:587 libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:585
+#: libpurple/protocols/silc/util.c:589 libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
+#: libpurple/protocols/silc/wb.c:284 libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 "%s hat eine Nachricht zum Whiteboard geschickt. M旦chten Sie das Whiteboard "
 "旦ffnen?"
 
-#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
+#: libpurple/protocols/silc/wb.c:288 libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -10700,97 +10311,111 @@
 "%s hat eine Nachricht zum Whiteboard im Kanal %s geschickt. M旦chten Sie das "
 "Whiteboard 旦ffnen?"
 
-#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
+#: libpurple/protocols/silc/wb.c:302 libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "Whiteboard"
 
-#: ../libpurple/protocols/silc10/ops.c:1559
+#: libpurple/protocols/silc10/ops.c:1559
 msgid "No server statistics available"
 msgstr "Keine Serverstatistik verf端gbar"
 
-#: ../libpurple/protocols/silc10/ops.c:1931
+#: libpurple/protocols/silc10/ops.c:1931
+#, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Fehler: Unterschiedliche Version, aktualisieren Sie Ihren Client"
 
-#: ../libpurple/protocols/silc10/ops.c:1934
+#: libpurple/protocols/silc10/ops.c:1934
+#, c-format
 msgid "Failure: Remote does not trust/support your public key"
-msgstr "Fehler: Die entfernte Seite vertraut Ihrem 旦ffentlichen Schl端ssel nicht"
-
-#: ../libpurple/protocols/silc10/ops.c:1937
+msgstr ""
+"Fehler: Die entfernte Seite vertraut Ihrem 旦ffentlichen Schl端ssel nicht"
+
+#: libpurple/protocols/silc10/ops.c:1937
+#, c-format
 msgid "Failure: Remote does not support proposed KE group"
-msgstr "Fehler: Entferntes Programm unterst端tzt nicht die vorgeschlagen KE-Gruppe"
-
-#: ../libpurple/protocols/silc10/ops.c:1940
+msgstr ""
+"Fehler: Entferntes Programm unterst端tzt nicht die vorgeschlagen KE-Gruppe"
+
+#: libpurple/protocols/silc10/ops.c:1940
+#, c-format
 msgid "Failure: Remote does not support proposed cipher"
-msgstr "Fehler: Entferntes Programm unterst端tzt die vorgeschlagene Cipher nicht"
-
-#: ../libpurple/protocols/silc10/ops.c:1943
+msgstr ""
+"Fehler: Entferntes Programm unterst端tzt die vorgeschlagene Cipher nicht"
+
+#: libpurple/protocols/silc10/ops.c:1943
+#, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Fehler: Entferntes Programm unterst端tzt die vorgeschlagene PKCS nicht"
 
-#: ../libpurple/protocols/silc10/ops.c:1946
+#: libpurple/protocols/silc10/ops.c:1946
+#, c-format
 msgid "Failure: Remote does not support proposed hash function"
-msgstr "Fehler: Entferntes Programm unterst端tzt die vorgeschlagen Hashfunktion nicht"
-
-#: ../libpurple/protocols/silc10/ops.c:1949
+msgstr ""
+"Fehler: Entferntes Programm unterst端tzt die vorgeschlagen Hashfunktion nicht"
+
+#: libpurple/protocols/silc10/ops.c:1949
+#, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Fehler: Entferntes Programm unterst端tzt das vorgeschlagene HMAC nicht"
 
-#: ../libpurple/protocols/silc10/ops.c:1951
+#: libpurple/protocols/silc10/ops.c:1951
+#, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Fehler: Falsche Signatur"
 
-#: ../libpurple/protocols/silc10/ops.c:1953
+#: libpurple/protocols/silc10/ops.c:1953
+#, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Fehler: Ung端ltiger Cookie"
 
-#: ../libpurple/protocols/silc10/ops.c:1964
+#: libpurple/protocols/silc10/ops.c:1964
+#, c-format
 msgid "Failure: Authentication failed"
 msgstr "Fehler: Authentifizierung fehlgeschlagen"
 
-#: ../libpurple/protocols/silc10/silc.c:182
+#: libpurple/protocols/silc10/silc.c:182
 msgid "Cannot initialize SILC Client connection"
 msgstr "Konnte die SILC-Client-Verbindung nicht herstellen"
 
-#: ../libpurple/protocols/silc10/silc.c:290
+#: libpurple/protocols/silc10/silc.c:290
 msgid "John Noname"
 msgstr "Max Mustermann"
 
-#: ../libpurple/protocols/silc10/silc.c:320
+#: libpurple/protocols/silc10/silc.c:320
 msgid "Cannot find/access ~/.silc directory"
 msgstr "Kann nicht auf das Verzeichnis ~/.silc zugreifen"
 
-#: ../libpurple/protocols/silc10/silc.c:334
+#: libpurple/protocols/silc10/silc.c:334
 #, c-format
 msgid "Could not load SILC key pair: %s"
 msgstr "Konnte SILC-Schl端sselpaar nicht laden: %s"
 
 #. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:416
+#: libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "Konnte nicht schreiben"
 
-#: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1484
+#: libpurple/protocols/simple/simple.c:438
+#: libpurple/protocols/simple/simple.c:1489
 msgid "Could not connect"
 msgstr "Verbinden nicht m旦glich"
 
-#: ../libpurple/protocols/simple/simple.c:1518
-#: ../libpurple/protocols/simple/simple.c:1560
-#: ../libpurple/protocols/simple/simple.c:1573
-#: ../libpurple/protocols/simple/simple.c:1624
+#: libpurple/protocols/simple/simple.c:1523
+#: libpurple/protocols/simple/simple.c:1565
+#: libpurple/protocols/simple/simple.c:1578
+#: libpurple/protocols/simple/simple.c:1629
 msgid "Could not create listen socket"
 msgstr "Kann Listen-Socket nicht erstellen"
 
-#: ../libpurple/protocols/simple/simple.c:1541
+#: libpurple/protocols/simple/simple.c:1546
 msgid "Couldn't resolve host"
 msgstr "Kann den Hostnamen nicht aufl旦sen"
 
-#: ../libpurple/protocols/simple/simple.c:1632
+#: libpurple/protocols/simple/simple.c:1637
 msgid "Could not resolve hostname"
 msgstr "Konnte den Hostnamen nicht aufl旦sen"
 
-#: ../libpurple/protocols/simple/simple.c:1649
+#: libpurple/protocols/simple/simple.c:1654
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP-Benutzernamen d端rfen keine Leerzeichen oder @-Symbole enthalten"
 
@@ -10802,161 +10427,175 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1824
+#: libpurple/protocols/simple/simple.c:1829
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE Protokoll-Plugin"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1825
+#: libpurple/protocols/simple/simple.c:1830
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Das SIP/SIMPLE-Protokoll-Plugin"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: libpurple/protocols/simple/simple.c:1858
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Status ver旦ffentlichen (Bemerkung: Jeder kann Sie sehen)"
 
-#: ../libpurple/protocols/simple/simple.c:1859
+#: libpurple/protocols/simple/simple.c:1864
 msgid "Use UDP"
 msgstr "Benutze UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1861
+#: libpurple/protocols/simple/simple.c:1866
 msgid "Use proxy"
 msgstr "Proxy benutzen"
 
-#: ../libpurple/protocols/simple/simple.c:1863
+#: libpurple/protocols/simple/simple.c:1868
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1865
+#: libpurple/protocols/simple/simple.c:1870
 msgid "Auth User"
 msgstr "Auth-Benutzer"
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: libpurple/protocols/simple/simple.c:1872
 msgid "Auth Domain"
 msgstr "Auth-Domain"
 
-#: ../libpurple/protocols/toc/toc.c:139
+#: libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Suche nach %s"
 
-#: ../libpurple/protocols/toc/toc.c:148
+#: libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Verbindung mit %s fehlgeschlagen"
 
-#: ../libpurple/protocols/toc/toc.c:201
+#: libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Anmeldung: %s"
 
-#: ../libpurple/protocols/toc/toc.c:488
+#: libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Datei %s konnte nicht geschrieben werden."
 
-#: ../libpurple/protocols/toc/toc.c:491
+#: libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Datei %s konnte nicht gelesen werden."
 
-#: ../libpurple/protocols/toc/toc.c:494
+#: libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Nachricht zu lange, letzten %s Bytes abgeschnitten."
 
-#: ../libpurple/protocols/toc/toc.c:497
+#: libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s ist zur Zeit nicht online."
 
-#: ../libpurple/protocols/toc/toc.c:500
+#: libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Verwarnung von %s nicht erlaubt."
 
-#: ../libpurple/protocols/toc/toc.c:503
+#: libpurple/protocols/toc/toc.c:503
+#, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr ""
 "Eine Nachricht ging verloren. Sie 端berschreiten die Geschwindigkeitsgrenze "
 "des Servers."
 
-#: ../libpurple/protocols/toc/toc.c:506
+#: libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chat in %s ist nicht verf端gbar."
 
-#: ../libpurple/protocols/toc/toc.c:509
+#: libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Sie verschicken die Nachrichten an %s zu schnell."
 
-#: ../libpurple/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 "Eine Nachricht von %s hat Sie nicht erreicht, da sie zu gro� war."
 
-#: ../libpurple/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 ""
 "Eine Nachricht von %s hat Sie nicht erreicht, da sie zu schnell gesendet "
 "wurde."
 
-#: ../libpurple/protocols/toc/toc.c:518
+#: libpurple/protocols/toc/toc.c:518
+#, c-format
 msgid "Failure."
 msgstr "Fehler."
 
-#: ../libpurple/protocols/toc/toc.c:521
+#: libpurple/protocols/toc/toc.c:521
+#, c-format
 msgid "Too many matches."
 msgstr "Zu viele �bereinstimmungen."
 
-#: ../libpurple/protocols/toc/toc.c:524
+#: libpurple/protocols/toc/toc.c:524
+#, c-format
 msgid "Need more qualifiers."
 msgstr "Ben旦tige mehr Angaben."
 
-#: ../libpurple/protocols/toc/toc.c:527
+#: libpurple/protocols/toc/toc.c:527
+#, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Verzeichnis-Dienst ist zur Zeit nicht verf端gbar."
 
-#: ../libpurple/protocols/toc/toc.c:530
+#: libpurple/protocols/toc/toc.c:530
+#, c-format
 msgid "E-mail lookup restricted."
 msgstr "E-Mail-Suche eingeschr辰nkt."
 
-#: ../libpurple/protocols/toc/toc.c:533
+#: libpurple/protocols/toc/toc.c:533
+#, c-format
 msgid "Keyword ignored."
 msgstr "Stichwort ignoriert."
 
-#: ../libpurple/protocols/toc/toc.c:536
+#: libpurple/protocols/toc/toc.c:536
+#, c-format
 msgid "No keywords."
 msgstr "Keine Stichw旦rter."
 
-#: ../libpurple/protocols/toc/toc.c:539
+#: libpurple/protocols/toc/toc.c:539
+#, c-format
 msgid "User has no directory information."
 msgstr "Der Benutzer hat kein Profil."
 
-#: ../libpurple/protocols/toc/toc.c:543
+#: libpurple/protocols/toc/toc.c:543
+#, c-format
 msgid "Country not supported."
 msgstr "Land nicht unterst端tzt."
 
-#: ../libpurple/protocols/toc/toc.c:546
+#: libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Unbekannter Fehler: %s."
 
-#: ../libpurple/protocols/toc/toc.c:549
+#: libpurple/protocols/toc/toc.c:549
+#, c-format
 msgid "Incorrect screen name or password."
 msgstr "Ung端ltiger Benutzername oder Passwort."
 
-#: ../libpurple/protocols/toc/toc.c:552
+#: libpurple/protocols/toc/toc.c:552
+#, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Der Dienst ist zur Zeit nicht verf端gbar."
 
-#: ../libpurple/protocols/toc/toc.c:555
+#: libpurple/protocols/toc/toc.c:555
+#, c-format
 msgid "Your warning level is currently too high to log in."
 msgstr "Ihre Warnstufe ist zur Zeit zu hoch, um sich anzumelden."
 
-#: ../libpurple/protocols/toc/toc.c:558
+#: libpurple/protocols/toc/toc.c:558
+#, c-format
 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."
@@ -10965,81 +10604,83 @@
 "versuchen Sie es erneut. Wenn Sie es weiter versuchen, werden sie noch "
 "l辰nger warten m端ssen."
 
-#: ../libpurple/protocols/toc/toc.c:560
+#: libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Unbekannter Anmeldungsfehler: %s."
 
-#: ../libpurple/protocols/toc/toc.c:563
+#: libpurple/protocols/toc/toc.c:563
 #, c-format
 msgid "An unknown error, %d, has occurred.  Info: %s"
 msgstr "Unbekannter Fehler '%d' aufgetreten. Info: %s"
 
-#: ../libpurple/protocols/toc/toc.c:590
+#: libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Ung端ltiger Gruppenname"
 
-#: ../libpurple/protocols/toc/toc.c:674
+#: libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Verbindung geschlossen"
 
-#: ../libpurple/protocols/toc/toc.c:714
+#: libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Warte auf Antwort..."
 
-#: ../libpurple/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 ist von seiner Pause zur端ckgekehrt. Sie k旦nnen wieder Nachrichten senden."
-
-#: ../libpurple/protocols/toc/toc.c:995
+msgstr ""
+"TOC ist von seiner Pause zur端ckgekehrt. Sie k旦nnen wieder Nachrichten senden."
+
+#: libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "Passwort辰nderung erfolgreich"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5519
-#: ../pidgin/gtkblist.c:5873
+#: libpurple/protocols/toc/toc.c:1366 pidgin/gtkblist.c:5531
+#: pidgin/gtkblist.c:5884
 msgid "_Group:"
 msgstr "_Gruppe:"
 
-#: ../libpurple/protocols/toc/toc.c:1535
+#: libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Verzeichnisinformation abrufen"
 
-#: ../libpurple/protocols/toc/toc.c:1675
+#: libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Verzeichnisinformation abrufen"
 
-#: ../libpurple/protocols/toc/toc.c:1797
+#: libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Kann %s nicht zum Schreiben 旦ffnen!"
 
-#: ../libpurple/protocols/toc/toc.c:1833
+#: libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr ""
 "Datei端bertragung gescheitert; die andere Seite hat die Datei端bertragung "
 "wahrscheinlich abgebrochen."
 
-#: ../libpurple/protocols/toc/toc.c:1878 ../libpurple/protocols/toc/toc.c:1918
-#: ../libpurple/protocols/toc/toc.c:2042 ../libpurple/protocols/toc/toc.c:2130
+#: 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 "�bertragungsverbindung konnte nicht hergestellt werden."
 
-#: ../libpurple/protocols/toc/toc.c:2075
+#: libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
-msgstr "Konnte keinen Datei-Header schreiben. Die Datei wurde nicht 端bermittelt."
-
-#: ../libpurple/protocols/toc/toc.c:2175
+msgstr ""
+"Konnte keinen Datei-Header schreiben. Die Datei wurde nicht 端bermittelt."
+
+#: libpurple/protocols/toc/toc.c:2175
 msgid "Save As..."
 msgstr "Speichern unter..."
 
-#: ../libpurple/protocols/toc/toc.c:2209
+#: 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] "%s bittet %s %d Datei zu akzeptieren: %s (%.2f %s)%s%s"
 msgstr[1] "%s bittet %s %d Dateien zu akzeptieren: %s (%.2f %s)%s%s"
 
-#: ../libpurple/protocols/toc/toc.c:2216
+#: libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s bittet Sie eine Datei zu senden"
@@ -11054,36 +10695,36 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306 ../libpurple/protocols/toc/toc.c:2308
+#: libpurple/protocols/toc/toc.c:2306 libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "TOC-Protokoll-Plugin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:810
+#: libpurple/protocols/yahoo/yahoo.c:810
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ihre Yahoo!-Nachricht wurde nicht verschickt."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:880
+#: libpurple/protocols/yahoo/yahoo.c:880
 #, c-format
 msgid "%s just sent you a Buzz!"
 msgstr "%s hat Ihnen gerade einen Kick gegeben!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:927
+#: libpurple/protocols/yahoo/yahoo.c:927
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-Systemnachricht f端r %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:986
+#: libpurple/protocols/yahoo/yahoo.c:986
 msgid "Authorization denied message:"
 msgstr "Nachricht f端r die Ablehnung der Autorisierung:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1067
+#: libpurple/protocols/yahoo/yahoo.c:1067
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
 "%s hat (r端ckwirkend) Ihre Anfrage abgelehnt, dass Sie ihn bzw. sie zu Ihrer "
 "Buddy-Liste hinzuf端gen."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#: libpurple/protocols/yahoo/yahoo.c:1070
 #, c-format
 msgid ""
 "%s has (retroactively) denied your request to add them to your list for the "
@@ -11092,11 +10733,11 @@
 "%s hat (r端ckwirkend) Ihre Anfrage abgelehnt, dass Sie ihn bzw. sie zu Ihrer "
 "Buddy-Liste hinzuf端gen und zwar aus folgendem Grund: %s."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1073
+#: libpurple/protocols/yahoo/yahoo.c:1073
 msgid "Add buddy rejected"
 msgstr "Hinzuf端gen des Buddys zur端ckgewiesen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#: libpurple/protocols/yahoo/yahoo.c:1824
 #, c-format
 msgid ""
 "The Yahoo server has requested the use of an unrecognized authentication "
@@ -11107,11 +10748,11 @@
 "Sie werden wahrscheinlich nicht in der Lage sein, Sich erfolgreich bei Yahoo "
 "anzumelden.  Pr端fen Sie %s auf Updates."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1827
+#: libpurple/protocols/yahoo/yahoo.c:1827
 msgid "Failed Yahoo! Authentication"
 msgstr "Yahoo-Authentifizierung fehlgeschlagen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#: libpurple/protocols/yahoo/yahoo.c:1893
 #, c-format
 msgid ""
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
@@ -11120,52 +10761,53 @@
 "Sie haben versucht %s zu ignorieren, aber der Benutzer ist in Ihrer Buddy-"
 "Liste.  Wenn Sie auf ��Ja�� klicken, wird der Buddy entfernt und ignoriert."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1896
+#: libpurple/protocols/yahoo/yahoo.c:1896
 msgid "Ignore buddy?"
 msgstr "Buddy ignorieren?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1955
+#: libpurple/protocols/yahoo/yahoo.c:1959
 msgid "Your account is locked, please log in to the Yahoo! website."
-msgstr "Ihr Konto ist gesperrt. Bitte melden Sie sich auf der Yahoo! Webseite an."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1958
+msgstr ""
+"Ihr Konto ist gesperrt. Bitte melden Sie sich auf der Yahoo! Webseite an."
+
+#: libpurple/protocols/yahoo/yahoo.c:1962
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Unbekannte Fehlernummer %d. Vielleicht kann dies repariert werden, wenn Sie "
 "sich auf der Yahoo! Webseite anmelden."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2012
+#: libpurple/protocols/yahoo/yahoo.c:2016
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
 "Konnte den Buddy %s der Gruppe %s nicht zur Serverliste des Kontos %s "
 "hinzuf端gen."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2015
+#: libpurple/protocols/yahoo/yahoo.c:2019
 msgid "Could not add buddy to server list"
 msgstr "Konnte den Buddy nicht zur Serverliste hinzuf端gen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
+#: libpurple/protocols/yahoo/yahoo.c:2138
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ H旦rbar %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2474
+#: libpurple/protocols/yahoo/yahoo.c:2478
 msgid "Received unexpected HTTP response from server."
 msgstr "Ung端ltige HTTP-Antwort vom Server empfangen."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2498
-#: ../libpurple/protocols/yahoo/yahoo.c:2684
-#: ../libpurple/protocols/yahoo/yahoo.c:2787
-#: ../libpurple/protocols/yahoo/yahoo.c:2797
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
-#: ../libpurple/protocols/yahoo/ycht.c:585
+#: libpurple/protocols/yahoo/yahoo.c:2502
+#: libpurple/protocols/yahoo/yahoo.c:2688
+#: libpurple/protocols/yahoo/yahoo.c:2791
+#: libpurple/protocols/yahoo/yahoo.c:2801
+#: libpurple/protocols/yahoo/yahoochat.c:1418
+#: libpurple/protocols/yahoo/yahoochat.c:1488
+#: libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Verbindungsfehler"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#: libpurple/protocols/yahoo/yahoo.c:2528
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -11174,7 +10816,7 @@
 "Verbindung zu %s verloren:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#: libpurple/protocols/yahoo/yahoo.c:2553
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -11183,108 +10825,108 @@
 "Die Verbindung mit %s konnte nicht hergestellt werden:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2899
-#: ../libpurple/protocols/yahoo/yahoo.c:3510
+#: libpurple/protocols/yahoo/yahoo.c:2903
+#: libpurple/protocols/yahoo/yahoo.c:3514
 msgid "Not at Home"
 msgstr "Nicht zu Hause"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2901
-#: ../libpurple/protocols/yahoo/yahoo.c:3513
+#: libpurple/protocols/yahoo/yahoo.c:2905
+#: libpurple/protocols/yahoo/yahoo.c:3517
 msgid "Not at Desk"
 msgstr "Nicht am Schreibtisch"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2903
-#: ../libpurple/protocols/yahoo/yahoo.c:3516
+#: libpurple/protocols/yahoo/yahoo.c:2907
+#: libpurple/protocols/yahoo/yahoo.c:3520
 msgid "Not in Office"
 msgstr "Nicht im B端ro"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2907
-#: ../libpurple/protocols/yahoo/yahoo.c:3522
+#: libpurple/protocols/yahoo/yahoo.c:2911
+#: libpurple/protocols/yahoo/yahoo.c:3526
 msgid "On Vacation"
 msgstr "Im Urlaub"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2911
-#: ../libpurple/protocols/yahoo/yahoo.c:3528
+#: libpurple/protocols/yahoo/yahoo.c:2915
+#: libpurple/protocols/yahoo/yahoo.c:3532
 msgid "Stepped Out"
 msgstr "Hinausgegangen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3004
-#: ../libpurple/protocols/yahoo/yahoo.c:3034
+#: libpurple/protocols/yahoo/yahoo.c:3008
+#: libpurple/protocols/yahoo/yahoo.c:3038
 msgid "Not on server list"
 msgstr "Nicht auf der Serverliste"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3051
-#: ../libpurple/protocols/yahoo/yahoo.c:3109
+#: libpurple/protocols/yahoo/yahoo.c:3055
+#: libpurple/protocols/yahoo/yahoo.c:3113
 msgid "Appear Online"
 msgstr "Online erscheinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3054
-#: ../libpurple/protocols/yahoo/yahoo.c:3130
+#: libpurple/protocols/yahoo/yahoo.c:3058
+#: libpurple/protocols/yahoo/yahoo.c:3134
 msgid "Appear Permanently Offline"
 msgstr "Permanent offline erscheinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3072
+#: libpurple/protocols/yahoo/yahoo.c:3076
 msgid "Presence"
 msgstr "Pr辰senz"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3115
+#: libpurple/protocols/yahoo/yahoo.c:3119
 msgid "Appear Offline"
 msgstr "Offline erscheinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3124
+#: libpurple/protocols/yahoo/yahoo.c:3128
 msgid "Don't Appear Permanently Offline"
 msgstr "Nicht permanent offline erscheinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3172
+#: libpurple/protocols/yahoo/yahoo.c:3176
 msgid "Join in Chat"
 msgstr "Chat betreten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3178
+#: libpurple/protocols/yahoo/yahoo.c:3182
 msgid "Initiate Conference"
 msgstr "Konferenz einleiten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3206
+#: libpurple/protocols/yahoo/yahoo.c:3210
 msgid "Presence Settings"
 msgstr "Anwesenheitseinstellungen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3212
+#: libpurple/protocols/yahoo/yahoo.c:3216
 msgid "Start Doodling"
 msgstr "Anfangen zu malen"
 
 #. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
-#: ../libpurple/protocols/yahoo/yahoo.c:3245
+#: libpurple/protocols/yahoo/yahoo.c:3249
 msgid "Active which ID?"
 msgstr "Welche ID aktivieren?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3256
+#: libpurple/protocols/yahoo/yahoo.c:3260
 msgid "Join who in chat?"
 msgstr "Wen wollen Sie zum Chat einladen?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3268
+#: libpurple/protocols/yahoo/yahoo.c:3272
 msgid "Activate ID..."
 msgstr "Aktiviere ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3272
+#: libpurple/protocols/yahoo/yahoo.c:3276
 msgid "Join User in Chat..."
 msgstr "Einen Benutzer zum Chat einladen..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3779
+#: libpurple/protocols/yahoo/yahoo.c:3783
 msgid "You have just sent a Buzz!"
 msgstr "Sie haben gerade einen Kick versandt!"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3838
+#: libpurple/protocols/yahoo/yahoo.c:3842
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;Raum&gt;:  Einen Chatraum im Yahoo-Netzwerk betreten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3843
+#: libpurple/protocols/yahoo/yahoo.c:3847
 msgid "list: List rooms on the Yahoo network"
 msgstr "list:  Liste R辰ume im Yahoo-Netzwerk auf"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3847
+#: libpurple/protocols/yahoo/yahoo.c:3851
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Einen Kontakt anrufen, um seine Aufmerksamkeit zu erhalten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3851
+#: libpurple/protocols/yahoo/yahoo.c:3855
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Einen Benutzer auffordern, eine Mal-Sitzung zu starten"
 
@@ -11298,86 +10940,86 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4059
-#: ../libpurple/protocols/yahoo/yahoo.c:4061
+#: libpurple/protocols/yahoo/yahoo.c:4063
+#: libpurple/protocols/yahoo/yahoo.c:4065
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-Protokoll-Plugin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4084
+#: libpurple/protocols/yahoo/yahoo.c:4088
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4087
+#: libpurple/protocols/yahoo/yahoo.c:4091
 msgid "Pager server"
 msgstr "Pager-Server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4090
+#: libpurple/protocols/yahoo/yahoo.c:4094
 msgid "Japan Pager server"
 msgstr "Pager-Server (Japan)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4093
+#: libpurple/protocols/yahoo/yahoo.c:4097
 msgid "Pager port"
 msgstr "Pager-Port"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4096
+#: libpurple/protocols/yahoo/yahoo.c:4100
 msgid "File transfer server"
 msgstr "Server f端r Datei端bertragungen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4099
+#: libpurple/protocols/yahoo/yahoo.c:4103
 msgid "Japan file transfer server"
 msgstr "Server f端r Datei端bertragungen (Japan)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4102
+#: libpurple/protocols/yahoo/yahoo.c:4106
 msgid "File transfer port"
 msgstr "Port f端r Datei端bertragungen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4105
+#: libpurple/protocols/yahoo/yahoo.c:4109
 msgid "Chat room locale"
 msgstr "Chatraum-Gebiet"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4108
+#: libpurple/protocols/yahoo/yahoo.c:4112
 msgid "Ignore conference and chatroom invitations"
 msgstr "Konferenz- und Chateinladungen ignorieren"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4116
+#: libpurple/protocols/yahoo/yahoo.c:4120
 msgid "Chat room list URL"
 msgstr "Chatraumliste (URL)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4119
+#: libpurple/protocols/yahoo/yahoo.c:4123
 msgid "Yahoo Chat server"
 msgstr "Yahoo-Chat-Server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4122
+#: libpurple/protocols/yahoo/yahoo.c:4126
 msgid "Yahoo Chat port"
 msgstr "Yahoo-Chat-Port"
 
 #. Write a local message to this conversation showing that a request for a
 #. * Doodle session has been made
 #.
-#: ../libpurple/protocols/yahoo/yahoo_doodle.c:98
+#: libpurple/protocols/yahoo/yahoo_doodle.c:98
 msgid "Sent Doodle request."
 msgstr "Doodle-Anfrage senden."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
+#: libpurple/protocols/yahoo/yahoo_filexfer.c:270
+#: libpurple/protocols/yahoo/yahoo_filexfer.c:279
+#: libpurple/protocols/yahoo/yahoo_filexfer.c:292
 msgid "Unable to establish file descriptor."
 msgstr "Konnte Dateibeschreibung nicht erstellen."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
+#: libpurple/protocols/yahoo/yahoo_packet.c:302
 msgid "Write Error"
 msgstr "Schreibfehler"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
+#: libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo!-Japan-Profil"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
+#: libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Yahoo!-Profil"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
+#: libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -11385,7 +11027,7 @@
 "Entschuldigung, Profile mit der Kennzeichnung ��Nur f端r Erwachsene�� werden "
 "zur Zeit nicht unterst端tzt."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
+#: libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
@@ -11393,47 +11035,47 @@
 "Wenn Sie diese Profil ansehen m旦chten, m端ssen Sie diesen Link in Ihrem Web-"
 "Browser betrachten:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
+#: libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "Yahoo!-ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
+#: libpurple/protocols/yahoo/yahoo_profile.c:1109
+#: libpurple/protocols/yahoo/yahoo_profile.c:1113
+#: libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "Hobbys"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
+#: libpurple/protocols/yahoo/yahoo_profile.c:1127
+#: libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "Letzte Neuigkeiten"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
+#: libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "Homepage"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
+#: libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "Cooler Link 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
+#: libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "Cooler Link 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "Cooler Link 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
+#: libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "Letzte Aktualisierung"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
+#: libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Benutzerinformation f端r %s nicht verf端gbar"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
+#: libpurple/protocols/yahoo/yahoo_profile.c:1205
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -11441,7 +11083,7 @@
 "Entschuldigung, das Profil enth辰lt eine Sprache, die zur Zeit nicht "
 "unterst端tzt wird."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
+#: libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -11449,7 +11091,7 @@
 "Konnte das Profil des Benutzers nicht abrufen. Das ist wahrscheinlich ein "
 "tempor辰res serverseitiges Problem. Bitte versuchen Sie es sp辰ter nochmal."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
+#: libpurple/protocols/yahoo/yahoo_profile.c:1224
 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 "
@@ -11460,39 +11102,39 @@
 "Profile eines Benutzers nicht finden. Wenn Sie wissen, dass der Benutzer "
 "existiert, versuchen Sie es sp辰ter nochmal."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
+#: libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "Das Profil des Benutzers ist leer."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:204
+#: libpurple/protocols/yahoo/yahoochat.c:204
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s lehnte Ihre Konferenzeinladung in den Raum ��%s�� ab, da ��%s��."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:206
+#: libpurple/protocols/yahoo/yahoochat.c:206
 msgid "Invitation Rejected"
 msgstr "Einladung zur端ckgewiesen"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:362
+#: libpurple/protocols/yahoo/yahoochat.c:362
 msgid "Failed to join chat"
 msgstr "Der Chat kann nicht betreten werden"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:365
+#: libpurple/protocols/yahoo/yahoochat.c:365
 msgid "Unknown room"
 msgstr "Unbekannter Raum"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:368
+#: libpurple/protocols/yahoo/yahoochat.c:368
 msgid "Maybe the room is full"
 msgstr "Vielleicht ist der Raum voll"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:371
+#: libpurple/protocols/yahoo/yahoochat.c:371
 msgid "Not available"
 msgstr "Nicht verf端gbar"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:375
+#: libpurple/protocols/yahoo/yahoochat.c:375
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -11500,46 +11142,46 @@
 "Unbekannter Fehler. Sie m端ssen sich eventuell abmelden und f端nf Minuten "
 "warten, bevor sie wieder einen Chatraum betreten k旦nnen"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:453
+#: libpurple/protocols/yahoo/yahoochat.c:453
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Sie chatten jetzt in %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: libpurple/protocols/yahoo/yahoochat.c:628
 msgid "Failed to join buddy in chat"
 msgstr "Es gelang nicht, den Buddy in dem Chat zu holen"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:629
+#: libpurple/protocols/yahoo/yahoochat.c:629
 msgid "Maybe they're not in a chat?"
 msgstr "Vielleicht sind sie nicht im Chat?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1320
-#: ../libpurple/protocols/yahoo/yahoochat.c:1346
+#: libpurple/protocols/yahoo/yahoochat.c:1320
+#: libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Fetching the room list failed."
 msgstr "Abrufen der Raumliste gescheitert."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1404
+#: libpurple/protocols/yahoo/yahoochat.c:1404
 msgid "Voices"
 msgstr "Stimmen"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1407
+#: libpurple/protocols/yahoo/yahoochat.c:1407
 msgid "Webcams"
 msgstr "Webcams"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1418
-#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: libpurple/protocols/yahoo/yahoochat.c:1418
+#: libpurple/protocols/yahoo/yahoochat.c:1488
 msgid "Unable to fetch room list."
 msgstr "Kamm die Raumliste nicht abrufen."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1481
+#: libpurple/protocols/yahoo/yahoochat.c:1481
 msgid "User Rooms"
 msgstr "Benutzerr辰ume"
 
-#: ../libpurple/protocols/yahoo/ycht.c:456
+#: libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Verbindungsproblem mit dem YCHT-Server."
 
-#: ../libpurple/protocols/yahoo/ycht.c:475
+#: libpurple/protocols/yahoo/ycht.c:475
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -11548,7 +11190,7 @@
 "Verbindung zum Server verloren\n"
 "%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:354
+#: libpurple/protocols/zephyr/zephyr.c:354
 msgid ""
 "(There was an error converting this message.\t Check the 'Encoding' option "
 "in the Account Editor)"
@@ -11556,84 +11198,87 @@
 "(Es gab einen Fehler beim Konvertieren dieser Nachricht.\tPr端fen Sie die "
 "Kodierungsoption 'Kodierung' im Konten-Editor)"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:752
+#: libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Kann nicht an den Chat %s,%s,%s senden"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
+#: libpurple/protocols/zephyr/zephyr.c:786
+#: libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "Benutzer"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1210
+#: libpurple/protocols/zephyr/zephyr.c:791
+#: libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "Versteckt oder nicht angemeldet"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:797
-#: ../libpurple/protocols/zephyr/zephyr.c:1212
+#: libpurple/protocols/zephyr/zephyr.c:797
+#: libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>Bei %s seit %s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1546
-#: ../libpurple/protocols/zephyr/zephyr.c:1547
+#: libpurple/protocols/zephyr/zephyr.c:1546
+#: libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "Jeder"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2354
+#: libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_Klasse:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2360
+#: libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_Instanz:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
+#: libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_Empf辰nger:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2377
+#: libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "Der Versuch, %s,%s,%s zu abonnieren ist gescheitert"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2690
+#: libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;Nick&gt;: Benutzer suchen"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2695
+#: libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;Nick&gt;: Benutzer suchen"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2700
+#: libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
 msgstr ""
 "instance &lt;Instanz&gt;: Setze die Instanz, die f端r diese Klasse benutzt "
 "wird"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
+#: libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "inst &lt;Instanz&gt;: Setze die Instanz, die f端r diese Klasse benutzt wird"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2710
+msgstr ""
+"inst &lt;Instanz&gt;: Setze die Instanz, die f端r diese Klasse benutzt wird"
+
+#: libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "topic &lt;Instanz&gt;: Setze die Instanz, die f端r diese Klasse benutzt wird"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2716
+msgstr ""
+"topic &lt;Instanz&gt;: Setze die Instanz, die f端r diese Klasse benutzt wird"
+
+#: libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
 msgstr ""
 "sub &lt;Klasse&gt; &lt;Instanz&gt; &lt;Empf辰nger&gt;: Einen neuen Chat "
 "betreten"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2721
-msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+#: libpurple/protocols/zephyr/zephyr.c:2721
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
 msgstr ""
 "zi &lt;Instanz&gt;: Sende eine Nachricht an &lt;Nachricht,<i>Instanz</i>,"
 "*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2727
+#: libpurple/protocols/zephyr/zephyr.c:2727
 msgid ""
 "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
 "<i>instance</i>,*&gt;"
@@ -11641,7 +11286,7 @@
 "zci &lt;Klasse&gt; &lt;Instanz&gt;: Sendet eine Nachricht an &lt;<i>Klasse</"
 "i>,<i>Instanz</i>,*&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2733
+#: libpurple/protocols/zephyr/zephyr.c:2733
 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;"
@@ -11649,7 +11294,7 @@
 "zcir &lt;Klasse&gt; &lt;Instanz&gt; &lt;Empf辰nger&gt;: Sendet eine Nachricht "
 "an &lt;<i>Klasse</i>,<i>Instanz</i>,<i>Empf辰nger</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2739
+#: libpurple/protocols/zephyr/zephyr.c:2739
 msgid ""
 "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
 "<i>instance</i>,<i>recipient</i>&gt;"
@@ -11657,15 +11302,16 @@
 "zir &lt;Instanz&gt; &lt;Empf辰nger&gt;: Sendet eine Nachricht an &lt;"
 "NACHRICHT,<i>Instanz</i>,<i>Empf辰nger</i>&gt;"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2744
+#: libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr "zc &lt;Klasse&gt;: Sendet eine Nachricht an &lt;<i>Klasse</i>,PERSONAL,*&gt;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2850
+msgstr ""
+"zc &lt;Klasse&gt;: Sendet eine Nachricht an &lt;<i>Klasse</i>,PERSONAL,*&gt;"
+
+#: libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "Neu Abonnieren"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2853
+#: libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "Abonnements vom Server abrufen"
 
@@ -11679,45 +11325,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
+#: libpurple/protocols/zephyr/zephyr.c:2946
+#: libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Zephyr-Protokoll-Plugin"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
+#: libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "Benutze tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
+#: libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "tzc-Kommando"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
+#: libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "Export an .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
+#: libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "Export an .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
+#: libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "Import von .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
+#: libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "Import von .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
+#: libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "Realm"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
+#: libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "Aussetzen"
 
-#: ../libpurple/proxy.c:458 ../libpurple/proxy.c:877 ../libpurple/proxy.c:1032
-#: ../libpurple/proxy.c:1600
+#: libpurple/proxy.c:458 libpurple/proxy.c:877 libpurple/proxy.c:1032
+#: libpurple/proxy.c:1600
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -11726,66 +11372,67 @@
 "Kann Socket nicht erstellen:\n"
 "%s"
 
-#: ../libpurple/proxy.c:658
+#: libpurple/proxy.c:658
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Kann Antwort vom HTTP-Proxy nicht verarbeiten: %s\n"
 
-#: ../libpurple/proxy.c:686 ../libpurple/proxy.c:732 ../libpurple/proxy.c:770
-#: ../libpurple/proxy.c:782
+#: 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-Proxy-Verbindungsfehler %d"
 
-#: ../libpurple/proxy.c:778
+#: libpurple/proxy.c:778
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
-msgstr "Zugriff verboten: Der HTTP-Proxy-Server verbietet das Tunneling 端ber Port %d."
-
-#: ../libpurple/proxy.c:995
+msgstr ""
+"Zugriff verboten: Der HTTP-Proxy-Server verbietet das Tunneling 端ber Port %d."
+
+#: libpurple/proxy.c:995
 #, c-format
 msgid "Error resolving %s"
 msgstr "Fehler beim Aufl旦sen von %s"
 
-#: ../libpurple/proxy.c:1697
+#: libpurple/proxy.c:1697
 msgid "Could not resolve host name"
 msgstr "Kann den Hostnamen nicht aufl旦sen"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libpurple/request.h:1377
+#: libpurple/request.h:1377
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../libpurple/request.h:1377
+#: libpurple/request.h:1377
 msgid "_No"
 msgstr "_Nein"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
 #.
-#: ../libpurple/request.h:1397
+#: libpurple/request.h:1397
 msgid "_Accept"
 msgstr "_Akzeptieren"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:47
+#: libpurple/savedstatuses.c:47
 msgid "I'm not here right now"
 msgstr "Ich bin gerade nicht hier"
 
-#: ../libpurple/savedstatuses.c:534
+#: libpurple/savedstatuses.c:534
 msgid "saved statuses"
 msgstr "gespeicherter Status"
 
-#: ../libpurple/server.c:233
+#: libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s hei�t jetzt %s.\n"
 
-#: ../libpurple/server.c:680
+#: libpurple/server.c:680
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11794,77 +11441,77 @@
 "%s hat %s in den Chatraum %s eingeladen:\n"
 "%s"
 
-#: ../libpurple/server.c:685
+#: libpurple/server.c:685
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s hat %s in den Chatraum %s eingeladen\n"
 
-#: ../libpurple/server.c:689
+#: libpurple/server.c:689
 msgid "Accept chat invitation?"
 msgstr "Akzeptieren Sie die Chat-Einladung?"
 
-#: ../libpurple/status.c:152
+#: libpurple/status.c:152
 msgid "Unset"
 msgstr "Nicht gesetzt"
 
-#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+#: libpurple/status.c:155 pidgin/gtkstatusbox.c:1057
 msgid "Do not disturb"
 msgstr "Nicht st旦ren"
 
-#: ../libpurple/status.c:158
+#: libpurple/status.c:158
 msgid "Extended away"
 msgstr "Abwesend (erweitert)"
 
-#: ../libpurple/status.c:159
+#: libpurple/status.c:159
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libpurple/status.c:608
+#: libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s hat den Status von %s zu %s ge辰ndert"
 
-#: ../libpurple/status.c:618
+#: libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s ist jetzt %s"
 
-#: ../libpurple/status.c:623
+#: libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s ist nicht mehr %s"
 
-#: ../libpurple/status.c:1233
+#: libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s wurde unt辰tig"
 
-#: ../libpurple/status.c:1250
+#: libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr "%s wurde t辰tig"
 
-#: ../libpurple/status.c:1313
+#: libpurple/status.c:1313
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s wurde unt辰tig"
 
-#: ../libpurple/status.c:1315
+#: libpurple/status.c:1315
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s wurde t辰tig"
 
-#: ../libpurple/util.c:717
+#: libpurple/util.c:717
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2646
+#: libpurple/util.c:2692
 #, c-format
 msgid "Error Reading %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: ../libpurple/util.c:2647
+#: libpurple/util.c:2693
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11873,67 +11520,67 @@
 "Beim Einlesen Ihrer %s trat ein Fehler auf.  Die Liste wurde nicht geladen "
 "und die alte Datei wurde in %s~ umbenannt."
 
-#: ../libpurple/util.c:3147
+#: libpurple/util.c:3193
 msgid "Calculating..."
 msgstr "Berechne..."
 
-#: ../libpurple/util.c:3150
+#: libpurple/util.c:3196
 msgid "Unknown."
 msgstr "Unbekannt."
 
-#: ../libpurple/util.c:3176
+#: libpurple/util.c:3222
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
-#: ../libpurple/util.c:3188
+#: libpurple/util.c:3234
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d Tag"
 msgstr[1] "%d Tage"
 
-#: ../libpurple/util.c:3196
+#: libpurple/util.c:3242
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d Stunde"
 msgstr[1] "%s, %d Stunden"
 
-#: ../libpurple/util.c:3202
+#: libpurple/util.c:3248
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d Stunde"
 msgstr[1] "%d Stunden"
 
-#: ../libpurple/util.c:3210
+#: libpurple/util.c:3256
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d Minute"
 msgstr[1] "%s, %d Minuten"
 
-#: ../libpurple/util.c:3216
+#: libpurple/util.c:3262
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d Minute"
 msgstr[1] "%d Minuten"
 
-#: ../libpurple/util.c:3476
+#: libpurple/util.c:3522
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Konnte %s nicht 旦ffnen: Zu oft weitergeleitet"
 
-#: ../libpurple/util.c:3513 ../libpurple/util.c:3808
+#: libpurple/util.c:3559 libpurple/util.c:3854
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Verbindung zu %s nicht m旦glich"
 
-#: ../libpurple/util.c:3636
+#: libpurple/util.c:3682
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11942,107 +11589,107 @@
 "Nicht genug Speicher f端r die Inhalte von %s verf端gbar.  Eventuell versucht "
 "der Web-Server etwas b旦ses zu tun."
 
-#: ../libpurple/util.c:3671
+#: libpurple/util.c:3717
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Fehler beim Lesen von %s: %s"
 
-#: ../libpurple/util.c:3702
+#: libpurple/util.c:3748
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Fehler beim Schreiben von %s: %s"
 
-#: ../libpurple/util.c:3727
+#: libpurple/util.c:3773
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Verbindung zu %s nicht m旦glich: %s"
 
-#: ../pidgin.desktop.in.h:1
+#: pidgin.desktop.in.h:1
 msgid "Internet Messenger"
 msgstr "Internet-Sofortnachrichtendienst"
 
-#: ../pidgin.desktop.in.h:2
+#: pidgin.desktop.in.h:2
 msgid "Pidgin Internet Messenger"
 msgstr "Pidgin Internet-Sofortnachrichtendienst"
 
-#: ../pidgin.desktop.in.h:3
+#: pidgin.desktop.in.h:3
 msgid "Send instant messages over multiple protocols"
 msgstr "Sendet Sofortnachrichten 端ber mehrere Protokolle"
 
-#: ../pidgin/eggtrayicon.c:129
+#: pidgin/eggtrayicon.c:129
 msgid "Orientation"
 msgstr "Ausrichtung"
 
-#: ../pidgin/eggtrayicon.c:130
+#: pidgin/eggtrayicon.c:130
 msgid "The orientation of the tray."
 msgstr "Die Ausrichtung der Kontrollleiste."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:409
+#: pidgin/gtkaccount.c:409
 msgid "Login Options"
 msgstr "Anmeldeoptionen"
 
-#: ../pidgin/gtkaccount.c:430
+#: pidgin/gtkaccount.c:430
 msgid "Pro_tocol:"
 msgstr "Pro_tokoll:"
 
-#: ../pidgin/gtkaccount.c:441
+#: pidgin/gtkaccount.c:441
 msgid "Screen _name:"
 msgstr "Benutzer_name:"
 
-#: ../pidgin/gtkaccount.c:531
+#: pidgin/gtkaccount.c:531
 msgid "_Local alias:"
 msgstr "Lokaler _Alias:"
 
-#: ../pidgin/gtkaccount.c:535
+#: pidgin/gtkaccount.c:535
 msgid "Remember pass_word"
 msgstr "Pass_wort speichern"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:593
+#: pidgin/gtkaccount.c:593
 msgid "User Options"
 msgstr "Benutzereinstellungen"
 
-#: ../pidgin/gtkaccount.c:606
+#: pidgin/gtkaccount.c:606
 msgid "New _mail notifications"
 msgstr "Benachrichtigung 端ber neue _Mails"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:611
+#: pidgin/gtkaccount.c:611
 msgid "Use this buddy _icon for this account:"
 msgstr "Dieses Buddy-_Icon f端r dieses Konto benutzen:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:731
+#: pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "%s Einstellungen"
 
-#: ../pidgin/gtkaccount.c:936
+#: pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
 msgstr "Benutze GNOME-Proxy-Einstellungen"
 
-#: ../pidgin/gtkaccount.c:937
+#: pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "Benutze globale Proxy-Einstellungen"
 
-#: ../pidgin/gtkaccount.c:943
+#: pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "Kein Proxy"
 
-#: ../pidgin/gtkaccount.c:949
+#: pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:955
+#: pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:961
+#: pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1206
+#: pidgin/gtkaccount.c:967 pidgin/gtkprefs.c:1206
 msgid "Use Environmental Settings"
 msgstr "Benutze Umgebungsvariablen"
 
@@ -12051,61 +11698,61 @@
 #. 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:1006
+#: pidgin/gtkaccount.c:1006
 msgid "If you look real closely"
 msgstr "Wenn Sie genau hinschauen"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1009
+#: pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "Sie k旦nnen den Schmetterlingen beim Paaren zusehen"
 
-#: ../pidgin/gtkaccount.c:1030
+#: pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "Proxy-Optionen"
 
-#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1200
+#: pidgin/gtkaccount.c:1044 pidgin/gtkprefs.c:1200
 msgid "Proxy _type:"
 msgstr "Proxy-_Typ:"
 
-#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1221
+#: pidgin/gtkaccount.c:1053 pidgin/gtkprefs.c:1221
 msgid "_Host:"
 msgstr "_Host:"
 
-#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1239
+#: pidgin/gtkaccount.c:1057 pidgin/gtkprefs.c:1239
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../pidgin/gtkaccount.c:1065
+#: pidgin/gtkaccount.c:1065
 msgid "_Username:"
 msgstr "_Benutzer:"
 
-#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1276
+#: pidgin/gtkaccount.c:1072 pidgin/gtkprefs.c:1276
 msgid "Pa_ssword:"
 msgstr "P_asswort:"
 
-#: ../pidgin/gtkaccount.c:1473
+#: pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Konto hinzuf端gen"
 
-#: ../pidgin/gtkaccount.c:1492
+#: pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_Einfach"
 
-#: ../pidgin/gtkaccount.c:1503
+#: pidgin/gtkaccount.c:1503
 msgid "_Advanced"
 msgstr "_Erweitert"
 
 # Aktiv
-#: ../pidgin/gtkaccount.c:1975 ../pidgin/gtkplugin.c:568
+#: pidgin/gtkaccount.c:1977 pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Aktiv"
 
-#: ../pidgin/gtkaccount.c:2003
+#: pidgin/gtkaccount.c:2005
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../pidgin/gtkaccount.c:2204
+#: pidgin/gtkaccount.c:2205
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -12129,11 +11776,11 @@
 "Kontaktlistenfenster zu diesem Dialog zur端ckkehren und Konten hinzuf端gen, "
 "bearbeiten oder l旦schen"
 
-#: ../pidgin/gtkblist.c:763
+#: pidgin/gtkblist.c:760
 msgid "Join a Chat"
 msgstr "Chat betreten"
 
-#: ../pidgin/gtkblist.c:784
+#: pidgin/gtkblist.c:781
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -12142,219 +11789,217 @@
 "wollen.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:795 ../pidgin/gtkblist.c:5467
-#: ../pidgin/gtkblist.c:5834 ../pidgin/gtkpounce.c:540
-#: ../pidgin/gtkroomlist.c:395
+#: pidgin/gtkblist.c:792 pidgin/gtkblist.c:5479 pidgin/gtkblist.c:5845
+#: pidgin/gtkpounce.c:540 pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../pidgin/gtkblist.c:1084 ../pidgin/gtkprivacy.c:602
-#: ../pidgin/gtkprivacy.c:616
+#: pidgin/gtkblist.c:1081 pidgin/gtkprivacy.c:602 pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Sperren"
 
-#: ../pidgin/gtkblist.c:1084
+#: pidgin/gtkblist.c:1081
 msgid "Un_block"
 msgstr "_Sperrung aufheben"
 
-#: ../pidgin/gtkblist.c:1135
+#: pidgin/gtkblist.c:1132
 msgid "Get _Info"
 msgstr "_Info abrufen"
 
-#: ../pidgin/gtkblist.c:1138 ../pidgin/pidginstock.c:84
+#: pidgin/gtkblist.c:1135 pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "I_M"
 
-#: ../pidgin/gtkblist.c:1144
+#: pidgin/gtkblist.c:1141
 msgid "_Send File"
 msgstr "Datei ver_senden"
 
-#: ../pidgin/gtkblist.c:1151
+#: pidgin/gtkblist.c:1148
 msgid "Add Buddy _Pounce"
 msgstr "B_uddy-Alarm hinzuf端gen"
 
-#: ../pidgin/gtkblist.c:1155 ../pidgin/gtkblist.c:1159
-#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
+#: pidgin/gtkblist.c:1153 pidgin/gtkblist.c:1157 pidgin/gtkblist.c:1262
+#: pidgin/gtkblist.c:1285
 msgid "View _Log"
 msgstr "Mi_tschnitt anzeigen"
 
-#: ../pidgin/gtkblist.c:1171 ../pidgin/gtkblist.c:1180
-#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
+#: pidgin/gtkblist.c:1170 pidgin/gtkblist.c:1179 pidgin/gtkblist.c:1270
+#: pidgin/gtkblist.c:1291
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1174 ../pidgin/gtkblist.c:1182
-#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
+#: pidgin/gtkblist.c:1173 pidgin/gtkblist.c:1181 pidgin/gtkblist.c:1272
+#: pidgin/gtkblist.c:1293
 msgid "_Remove"
 msgstr "_Entfernen"
 
-#: ../pidgin/gtkblist.c:1232
+#: pidgin/gtkblist.c:1231
 msgid "Add a _Buddy"
 msgstr "Buddy _hinzuf端gen"
 
-#: ../pidgin/gtkblist.c:1235
+#: pidgin/gtkblist.c:1234
 msgid "Add a C_hat"
 msgstr "C_hat hinzuf端gen"
 
-#: ../pidgin/gtkblist.c:1238
+#: pidgin/gtkblist.c:1237
 msgid "_Delete Group"
 msgstr "Gruppe _l旦schen"
 
-#: ../pidgin/gtkblist.c:1240
+#: pidgin/gtkblist.c:1239
 msgid "_Rename"
 msgstr "_Umbenennen"
 
 #. join button
-#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
+#: pidgin/gtkblist.c:1258 pidgin/gtkroomlist.c:306 pidgin/gtkroomlist.c:459
+#: pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Betreten"
 
-#: ../pidgin/gtkblist.c:1260
+#: pidgin/gtkblist.c:1260
 msgid "Auto-Join"
 msgstr "Automatisch beitreten"
 
-#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1321
+#: pidgin/gtkblist.c:1298 pidgin/gtkblist.c:1322
 msgid "_Collapse"
 msgstr "_Zusammenklappen"
 
-#: ../pidgin/gtkblist.c:1326
+#: pidgin/gtkblist.c:1327
 msgid "_Expand"
 msgstr "A_usklappen"
 
-#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkblist.c:1583
-#: ../pidgin/gtkblist.c:4561 ../pidgin/gtkblist.c:4571
+#: pidgin/gtkblist.c:1572 pidgin/gtkblist.c:1584 pidgin/gtkblist.c:4573
+#: pidgin/gtkblist.c:4583
 msgid "/Tools/Mute Sounds"
 msgstr "/Werkzeuge/Stummschalten"
 
-#: ../pidgin/gtkblist.c:2043 ../pidgin/gtkconv.c:4605
-#: ../pidgin/gtkpounce.c:429
-msgid "You are not currently signed on with an account that can add that buddy."
+#: pidgin/gtkblist.c:2044 pidgin/gtkconv.c:4686 pidgin/gtkpounce.c:429
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "Sie sind im Moment nicht mit einem Konto angemeldet, welches benutzt werden "
 "kann, um diesen Buddy hinzuzuf端gen."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2838
+#: pidgin/gtkblist.c:2847
 msgid "/_Buddies"
 msgstr "/_Buddys"
 
-#: ../pidgin/gtkblist.c:2839
+#: pidgin/gtkblist.c:2848
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Buddys/_Neue Sofortnachricht..."
 
-#: ../pidgin/gtkblist.c:2840
+#: pidgin/gtkblist.c:2849
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Buddys/Einen _Chat betreten..."
 
-#: ../pidgin/gtkblist.c:2841
+#: pidgin/gtkblist.c:2850
 msgid "/Buddies/Get User _Info..."
 msgstr "/Buddys/B_enutzer-Info abrufen..."
 
-#: ../pidgin/gtkblist.c:2842
+#: pidgin/gtkblist.c:2851
 msgid "/Buddies/View User _Log..."
 msgstr "/Buddys/Benutzer-_Mitschnitt ansehen..."
 
-#: ../pidgin/gtkblist.c:2844
+#: pidgin/gtkblist.c:2853
 msgid "/Buddies/Show _Offline Buddies"
 msgstr "/Buddys/Zeige _Offline-Buddys"
 
-#: ../pidgin/gtkblist.c:2845
+#: pidgin/gtkblist.c:2854
 msgid "/Buddies/Show _Empty Groups"
 msgstr "/Buddys/Zeige _leere Gruppen"
 
-#: ../pidgin/gtkblist.c:2846
+#: pidgin/gtkblist.c:2855 pidgin/gtkprefs.c:997
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/Buddys/Zeige Buddy-_Details"
 
-#: ../pidgin/gtkblist.c:2847
+#: pidgin/gtkblist.c:2856
 msgid "/Buddies/Show Idle _Times"
 msgstr "/Buddys/Zeige Unt辰tigkeitszei_ten"
 
-#: ../pidgin/gtkblist.c:2848
+#: pidgin/gtkblist.c:2857
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Buddys/Buddys _sortieren"
 
-#: ../pidgin/gtkblist.c:2850
+#: pidgin/gtkblist.c:2859
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Buddys/B_uddy hinzuf端gen..."
 
-#: ../pidgin/gtkblist.c:2851
+#: pidgin/gtkblist.c:2860
 msgid "/Buddies/Add C_hat..."
 msgstr "/Buddys/C_hat hinzuf端gen..."
 
-#: ../pidgin/gtkblist.c:2852
+#: pidgin/gtkblist.c:2861
 msgid "/Buddies/Add _Group..."
 msgstr "/Buddys/_Gruppe hinzuf端gen..."
 
-#: ../pidgin/gtkblist.c:2854
+#: pidgin/gtkblist.c:2863
 msgid "/Buddies/_Quit"
 msgstr "/Buddys/_Beenden"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2857
+#: pidgin/gtkblist.c:2866
 msgid "/_Accounts"
 msgstr "/_Konten"
 
-#: ../pidgin/gtkblist.c:2858 ../pidgin/gtkblist.c:6532
+#: pidgin/gtkblist.c:2867 pidgin/gtkblist.c:6543
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Konten/Hinzuf端gen\\/�ndern"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2861
+#: pidgin/gtkblist.c:2870
 msgid "/_Tools"
 msgstr "/_Werkzeuge"
 
-#: ../pidgin/gtkblist.c:2862
+#: pidgin/gtkblist.c:2871
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Werkzeuge/Buddy-_Alarm"
 
-#: ../pidgin/gtkblist.c:2863
+#: pidgin/gtkblist.c:2872
 msgid "/Tools/Plu_gins"
 msgstr "/Werkzeuge/Plu_gins"
 
-#: ../pidgin/gtkblist.c:2864
+#: pidgin/gtkblist.c:2873
 msgid "/Tools/Pr_eferences"
 msgstr "/Werkzeuge/_Einstellungen"
 
-#: ../pidgin/gtkblist.c:2865
+#: pidgin/gtkblist.c:2874
 msgid "/Tools/Pr_ivacy"
 msgstr "/Werkzeuge/Pri_vatsph辰re"
 
-#: ../pidgin/gtkblist.c:2867
+#: pidgin/gtkblist.c:2876
 msgid "/Tools/_File Transfers"
 msgstr "/Werkzeuge/_Datei端bertragungen"
 
-#: ../pidgin/gtkblist.c:2868
+#: pidgin/gtkblist.c:2877
 msgid "/Tools/R_oom List"
 msgstr "/Werkzeuge/Chat_r辰ume"
 
-#: ../pidgin/gtkblist.c:2869
+#: pidgin/gtkblist.c:2878
 msgid "/Tools/System _Log"
 msgstr "/Werkzeuge/_System-Mitschnitt"
 
-#: ../pidgin/gtkblist.c:2871
+#: pidgin/gtkblist.c:2880
 msgid "/Tools/Mute _Sounds"
 msgstr "/Werkzeuge/_Stummschalten"
 
 #. Help
-#: ../pidgin/gtkblist.c:2873
+#: pidgin/gtkblist.c:2882
 msgid "/_Help"
 msgstr "/_Hilfe"
 
-#: ../pidgin/gtkblist.c:2874
+#: pidgin/gtkblist.c:2883
 msgid "/Help/Online _Help"
 msgstr "/Hilfe/Online-_Hilfe"
 
-#: ../pidgin/gtkblist.c:2875
+#: pidgin/gtkblist.c:2884
 msgid "/Help/_Debug Window"
 msgstr "/Hilfe/_Debug-Fenster"
 
-#: ../pidgin/gtkblist.c:2877 ../pidgin/gtkblist.c:2879
+#: pidgin/gtkblist.c:2886 pidgin/gtkblist.c:2888
 msgid "/Help/_About"
 msgstr "/Hilfe/�_ber"
 
-#: ../pidgin/gtkblist.c:2908
+#: pidgin/gtkblist.c:2917
 #, c-format
 msgid ""
 "\n"
@@ -12363,132 +12008,132 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../pidgin/gtkblist.c:2986
+#: pidgin/gtkblist.c:2995
 msgid "Buddy Alias"
 msgstr "Buddy-Alias"
 
-#: ../pidgin/gtkblist.c:3015
+#: pidgin/gtkblist.c:3024
 msgid "Logged In"
 msgstr "Angemeldet"
 
-#: ../pidgin/gtkblist.c:3061
+#: pidgin/gtkblist.c:3070
 msgid "Last Seen"
 msgstr "Zuletzt gesehen"
 
-#: ../pidgin/gtkblist.c:3081
+#: pidgin/gtkblist.c:3090
 msgid "Spooky"
 msgstr "Gruselig"
 
-#: ../pidgin/gtkblist.c:3083
+#: pidgin/gtkblist.c:3092
 msgid "Awesome"
 msgstr "Gro�artig"
 
-#: ../pidgin/gtkblist.c:3085
+#: pidgin/gtkblist.c:3094
 msgid "Rockin'"
 msgstr "Abgefahren"
 
-#: ../pidgin/gtkblist.c:3428
+#: pidgin/gtkblist.c:3437
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Unt辰tig %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3430
+#: pidgin/gtkblist.c:3439
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Unt辰tig %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3432
+#: pidgin/gtkblist.c:3441
 #, c-format
 msgid "Idle %dm"
 msgstr "Unt辰tig %dm"
 
-#: ../pidgin/gtkblist.c:3577
+#: pidgin/gtkblist.c:3586
 msgid "/Buddies/New Instant Message..."
 msgstr "/Buddys/Neue Sofortnachricht..."
 
-#: ../pidgin/gtkblist.c:3578 ../pidgin/gtkblist.c:3611
+#: pidgin/gtkblist.c:3587 pidgin/gtkblist.c:3620
 msgid "/Buddies/Join a Chat..."
 msgstr "/Buddys/Chat betreten..."
 
-#: ../pidgin/gtkblist.c:3579
+#: pidgin/gtkblist.c:3588
 msgid "/Buddies/Get User Info..."
 msgstr "/Buddys/Benutzer-Info abrufen..."
 
-#: ../pidgin/gtkblist.c:3580
+#: pidgin/gtkblist.c:3589
 msgid "/Buddies/Add Buddy..."
 msgstr "/Buddys/Buddy hinzuf端gen..."
 
-#: ../pidgin/gtkblist.c:3581 ../pidgin/gtkblist.c:3614
+#: pidgin/gtkblist.c:3590 pidgin/gtkblist.c:3623
 msgid "/Buddies/Add Chat..."
 msgstr "/Buddys/Chat hinzuf端gen..."
 
-#: ../pidgin/gtkblist.c:3582
+#: pidgin/gtkblist.c:3591
 msgid "/Buddies/Add Group..."
 msgstr "/Buddys/Gruppe hinzuf端gen..."
 
-#: ../pidgin/gtkblist.c:3617
+#: pidgin/gtkblist.c:3626
 msgid "/Tools/Privacy"
 msgstr "/Werkzeuge/Privatsph辰re"
 
-#: ../pidgin/gtkblist.c:3620
+#: pidgin/gtkblist.c:3629
 msgid "/Tools/Room List"
 msgstr "/Werkzeuge/Chatr辰ume"
 
-#: ../pidgin/gtkblist.c:3717 ../pidgin/gtkdocklet.c:153
+#: pidgin/gtkblist.c:3726 pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
 msgstr[0] "%d ungelesene Nachricht von %s\n"
 msgstr[1] "%d ungelesene Nachrichten von %s\n"
 
-#: ../pidgin/gtkblist.c:3797
+#: pidgin/gtkblist.c:3806
 msgid "Manually"
 msgstr "Manuell"
 
-#: ../pidgin/gtkblist.c:3799
+#: pidgin/gtkblist.c:3808
 msgid "Alphabetically"
 msgstr "Alphabetisch"
 
-#: ../pidgin/gtkblist.c:3800
+#: pidgin/gtkblist.c:3809
 msgid "By status"
 msgstr "Nach Status"
 
-#: ../pidgin/gtkblist.c:3801
+#: pidgin/gtkblist.c:3810
 msgid "By log size"
 msgstr "Nach Gr旦�e der Logs"
 
-#: ../pidgin/gtkblist.c:4005 ../pidgin/gtkconn.c:178
+#: pidgin/gtkblist.c:4015 pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s abgemeldet"
 
-#: ../pidgin/gtkblist.c:4015
+#: pidgin/gtkblist.c:4025
 msgid "Re-enable Account"
 msgstr "Konten reaktivieren"
 
-#: ../pidgin/gtkblist.c:4039
+#: pidgin/gtkblist.c:4051
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s abgemeldet: %s</span>"
 
-#: ../pidgin/gtkblist.c:4191
+#: pidgin/gtkblist.c:4203
 msgid "<b>Username:</b>"
 msgstr "<b>Benutzername:</b>"
 
-#: ../pidgin/gtkblist.c:4198
+#: pidgin/gtkblist.c:4210
 msgid "<b>Password:</b>"
 msgstr "<b>Passwort:</b>"
 
-#: ../pidgin/gtkblist.c:4209
+#: pidgin/gtkblist.c:4221
 msgid "_Login"
 msgstr "_Anmelden"
 
-#: ../pidgin/gtkblist.c:4292
+#: pidgin/gtkblist.c:4304
 msgid "/Accounts"
 msgstr "/Konten"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4306
+#: pidgin/gtkblist.c:4318
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12507,23 +12152,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4555
+#: pidgin/gtkblist.c:4567
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Buddys/Zeige Offline-Buddys"
 
-#: ../pidgin/gtkblist.c:4558
+#: pidgin/gtkblist.c:4570
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Buddys/Zeige leere Gruppen"
 
-#: ../pidgin/gtkblist.c:4564
+#: pidgin/gtkblist.c:4576
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Buddys/Zeige Buddy-Details"
 
-#: ../pidgin/gtkblist.c:4567
+#: pidgin/gtkblist.c:4579
 msgid "/Buddies/Show Idle Times"
 msgstr "/Buddys/Zeige Unt辰tigkeitszeiten"
 
-#: ../pidgin/gtkblist.c:5444
+#: pidgin/gtkblist.c:5456
 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. "
@@ -12535,25 +12180,25 @@
 "immer es m旦glich ist.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5479
+#: pidgin/gtkblist.c:5491
 msgid "_Screen name:"
 msgstr "_Benutzername:"
 
-#: ../pidgin/gtkblist.c:5501 ../pidgin/gtkblist.c:5855
+#: pidgin/gtkblist.c:5513 pidgin/gtkblist.c:5866
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:5767
+#: pidgin/gtkblist.c:5778
 msgid "This protocol does not support chat rooms."
 msgstr "Dieses Protokoll unterst端tzt keine Chatr辰ume."
 
-#: ../pidgin/gtkblist.c:5783
+#: pidgin/gtkblist.c:5794
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "Sie sind derzeit mit keinem Chat-f辰higen Protokoll angemeldet."
 
-#: ../pidgin/gtkblist.c:5824
+#: pidgin/gtkblist.c:5835
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12561,43 +12206,43 @@
 "Bitte geben Sie einen Alias und geeignete Informationen 端ber den Chat ein, "
 "den Sie in Ihre Buddy-Liste aufnehmen wollen.\n"
 
-#: ../pidgin/gtkblist.c:5912
+#: pidgin/gtkblist.c:5923
 msgid "Please enter the name of the group to be added."
 msgstr "Bitte geben Sie den Namen der Gruppe ein, die hinzugef端gt werden soll."
 
-#: ../pidgin/gtkblist.c:6552
+#: pidgin/gtkblist.c:6563
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Konten"
 
-#: ../pidgin/gtkblist.c:6576
+#: pidgin/gtkblist.c:6587
 msgid "_Edit Account"
 msgstr "Konto _bearbeiten"
 
-#: ../pidgin/gtkblist.c:6589 ../pidgin/gtkconv.c:2983
+#: pidgin/gtkblist.c:6600 pidgin/gtkconv.c:3011
 msgid "No actions available"
 msgstr "Keine Aktionen verf端gbar"
 
-#: ../pidgin/gtkblist.c:6597
+#: pidgin/gtkblist.c:6608
 msgid "_Disable"
 msgstr "_Deaktivieren"
 
-#: ../pidgin/gtkblist.c:6609
+#: pidgin/gtkblist.c:6620
 msgid "Enable Account"
 msgstr "Konten aktivieren"
 
-#: ../pidgin/gtkblist.c:6615
+#: pidgin/gtkblist.c:6626
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Konten/Konto aktivieren"
 
-#: ../pidgin/gtkblist.c:6664
+#: pidgin/gtkblist.c:6675
 msgid "/Tools"
 msgstr "/Werkzeuge"
 
-#: ../pidgin/gtkblist.c:6734
+#: pidgin/gtkblist.c:6745
 msgid "/Buddies/Sort Buddies"
 msgstr "/Buddys/Buddys sortieren"
 
-#: ../pidgin/gtkconn.c:179
+#: pidgin/gtkconn.c:179
 #, c-format
 msgid ""
 "%s\n"
@@ -12610,26 +12255,27 @@
 "%s wird nicht versuchen, das Konto wieder zu verbinden bis Sie den Fehler "
 "behoben und das Konto wieder aktiviert haben."
 
-#: ../pidgin/gtkconv.c:486
+#: pidgin/gtkconv.c:484
 msgid "Unknown command."
 msgstr "Unbekanntes Kommando."
 
-#: ../pidgin/gtkconv.c:758 ../pidgin/gtkconv.c:784
+#: pidgin/gtkconv.c:756 pidgin/gtkconv.c:782
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Der Buddy hat nicht das gleiche Protokoll wie dieser Chat."
 
-#: ../pidgin/gtkconv.c:778
-msgid "You are not currently signed on with an account that can invite that buddy."
+#: pidgin/gtkconv.c:776
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Sie sind im Moment nicht mit einem Konto angemeldet, welches benutzt werden "
 "kann, um diesen Buddy einzuladen."
 
-#: ../pidgin/gtkconv.c:831
+#: pidgin/gtkconv.c:829
 msgid "Invite Buddy Into Chat Room"
 msgstr "Buddy in einen Chatraum einladen"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:861
+#: pidgin/gtkconv.c:859
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12637,200 +12283,201 @@
 "Bitte geben Sie den Benutzernamen der Person ein, die Sie einladen m旦chten "
 "zusammen mit einer optionalen Einladungsnachricht."
 
-#: ../pidgin/gtkconv.c:882
+#: pidgin/gtkconv.c:880
 msgid "_Buddy:"
 msgstr "_Buddy:"
 
-#: ../pidgin/gtkconv.c:902 ../pidgin/gtksavedstatuses.c:1193
-#: ../pidgin/gtksavedstatuses.c:1525
+#: pidgin/gtkconv.c:900 pidgin/gtksavedstatuses.c:1193
+#: pidgin/gtksavedstatuses.c:1525
 msgid "_Message:"
 msgstr "_Nachricht:"
 
-#: ../pidgin/gtkconv.c:959 ../pidgin/gtkconv.c:2507 ../pidgin/gtkdebug.c:218
-#: ../pidgin/gtkft.c:542
+#: pidgin/gtkconv.c:957 pidgin/gtkconv.c:2518 pidgin/gtkdebug.c:218
+#: pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Konnte die Datei nicht 旦ffnen."
 
-#: ../pidgin/gtkconv.c:965
+#: pidgin/gtkconv.c:963
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Unterhaltung mit %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1001
+#: pidgin/gtkconv.c:999
 msgid "Save Conversation"
 msgstr "Unterhaltung speichern"
 
-#: ../pidgin/gtkconv.c:1150 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: pidgin/gtkconv.c:1148 pidgin/gtkdebug.c:166 pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Suchen"
 
-#: ../pidgin/gtkconv.c:1176 ../pidgin/gtkdebug.c:194
+#: pidgin/gtkconv.c:1174 pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_Suche nach:"
 
-#: ../pidgin/gtkconv.c:1359
+#: pidgin/gtkconv.c:1357
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Mitschnitt gestartet. Zuk端nftige Nachrichten dieser Unterhaltung werden "
 "mitgeschnitten."
 
-#: ../pidgin/gtkconv.c:1367
-msgid "Logging stopped. Future messages in this conversation will not be logged."
+#: pidgin/gtkconv.c:1365
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Mitschnitt angehalten. Zuk端nftige Nachrichten dieser Unterhaltung werden "
 "nicht mitgeschnitten."
 
-#: ../pidgin/gtkconv.c:1615
+#: pidgin/gtkconv.c:1613
 msgid "Un-Ignore"
 msgstr "Nicht Ignorieren"
 
-#: ../pidgin/gtkconv.c:1618
+#: pidgin/gtkconv.c:1616
 msgid "Ignore"
 msgstr "Ignorieren"
 
-#: ../pidgin/gtkconv.c:1638
+#: pidgin/gtkconv.c:1636
 msgid "Get Away Message"
 msgstr "Neue Abwesenheitsnachricht abholen"
 
-#: ../pidgin/gtkconv.c:1661
+#: pidgin/gtkconv.c:1659
 msgid "Last said"
 msgstr "Zuletzt gesagt"
 
-#: ../pidgin/gtkconv.c:2515
+#: pidgin/gtkconv.c:2526
 msgid "Unable to save icon file to disk."
 msgstr "Kann Icon-Datei nicht auf die Festplatte speichern."
 
-#: ../pidgin/gtkconv.c:2566
+#: pidgin/gtkconv.c:2577
 msgid "Save Icon"
 msgstr "Icon speichern"
 
-#: ../pidgin/gtkconv.c:2618
+#: pidgin/gtkconv.c:2629
 msgid "Animate"
 msgstr "Animieren"
 
-#: ../pidgin/gtkconv.c:2623
+#: pidgin/gtkconv.c:2634
 msgid "Hide Icon"
 msgstr "Icon verbergen"
 
-#: ../pidgin/gtkconv.c:2626
+#: pidgin/gtkconv.c:2637
 msgid "Save Icon As..."
 msgstr "Icon speichern unter..."
 
-#: ../pidgin/gtkconv.c:2630
+#: pidgin/gtkconv.c:2641
 msgid "Set Custom Icon..."
 msgstr "Setze benutzerdefiniertes Icon..."
 
-#: ../pidgin/gtkconv.c:2643
+#: pidgin/gtkconv.c:2654
 msgid "Remove Custom Icon"
 msgstr "Benutzerdefiniertes Icon entfernen"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2785
+#: pidgin/gtkconv.c:2796
 msgid "/_Conversation"
 msgstr "/_Unterhaltung"
 
-#: ../pidgin/gtkconv.c:2787
+#: pidgin/gtkconv.c:2798
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Unterhaltung/_Neue Sofortnachricht..."
 
-#: ../pidgin/gtkconv.c:2792
+#: pidgin/gtkconv.c:2803
 msgid "/Conversation/_Find..."
 msgstr "/Unterhaltung/_Finden..."
 
-#: ../pidgin/gtkconv.c:2794
+#: pidgin/gtkconv.c:2805
 msgid "/Conversation/View _Log"
 msgstr "/Unterhaltung/Betrachte _Mitschnitt"
 
-#: ../pidgin/gtkconv.c:2795
+#: pidgin/gtkconv.c:2806
 msgid "/Conversation/_Save As..."
 msgstr "/Unterhaltung/_Speichern als..."
 
-#: ../pidgin/gtkconv.c:2797
+#: pidgin/gtkconv.c:2808
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Unterhaltung/_Leeren"
 
-#: ../pidgin/gtkconv.c:2801
+#: pidgin/gtkconv.c:2812
 msgid "/Conversation/Se_nd File..."
 msgstr "/Unterhaltung/Datei _senden..."
 
-#: ../pidgin/gtkconv.c:2802
+#: pidgin/gtkconv.c:2813
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Unterhaltung/Buddy-Alar_m hinzuf端gen..."
 
-#: ../pidgin/gtkconv.c:2804
+#: pidgin/gtkconv.c:2815
 msgid "/Conversation/_Get Info"
 msgstr "/Unterhaltung/B_enutzer-Info abrufen"
 
-#: ../pidgin/gtkconv.c:2806
+#: pidgin/gtkconv.c:2817
 msgid "/Conversation/In_vite..."
 msgstr "/Unterhaltung/_Einladen..."
 
-#: ../pidgin/gtkconv.c:2808
+#: pidgin/gtkconv.c:2819
 msgid "/Conversation/M_ore"
 msgstr "/Unterhaltung/M_ehr"
 
-#: ../pidgin/gtkconv.c:2812
+#: pidgin/gtkconv.c:2823
 msgid "/Conversation/Al_ias..."
 msgstr "/Unterhaltung/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2814
+#: pidgin/gtkconv.c:2825
 msgid "/Conversation/_Block..."
 msgstr "/Unterhaltung/_Blockieren..."
 
-#: ../pidgin/gtkconv.c:2816
+#: pidgin/gtkconv.c:2827
 msgid "/Conversation/_Unblock..."
 msgstr "/Unterhaltung/_Entsperren..."
 
-#: ../pidgin/gtkconv.c:2818
+#: pidgin/gtkconv.c:2829
 msgid "/Conversation/_Add..."
 msgstr "/Unterhaltung/_Hinzuf端gen..."
 
-#: ../pidgin/gtkconv.c:2820
+#: pidgin/gtkconv.c:2831
 msgid "/Conversation/_Remove..."
 msgstr "/Unterhaltung/_Entfernen..."
 
-#: ../pidgin/gtkconv.c:2825
+#: pidgin/gtkconv.c:2836
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Unterhaltung/Lin_k einf端gen..."
 
-#: ../pidgin/gtkconv.c:2827
+#: pidgin/gtkconv.c:2838
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Unterhaltung/Bil_d einf端gen..."
 
-#: ../pidgin/gtkconv.c:2833
+#: pidgin/gtkconv.c:2844
 msgid "/Conversation/_Close"
 msgstr "/Unterhaltung/S_chlie�en"
 
 #. Options
-#: ../pidgin/gtkconv.c:2837
+#: pidgin/gtkconv.c:2848
 msgid "/_Options"
 msgstr "/_Optionen"
 
-#: ../pidgin/gtkconv.c:2838
+#: pidgin/gtkconv.c:2849
 msgid "/Options/Enable _Logging"
 msgstr "/Optionen/Schalte _Mitschnitt ein"
 
-#: ../pidgin/gtkconv.c:2839
+#: pidgin/gtkconv.c:2850
 msgid "/Options/Enable _Sounds"
 msgstr "/Optionen/Schalte _Kl辰nge ein"
 
-#: ../pidgin/gtkconv.c:2840
+#: pidgin/gtkconv.c:2851
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Optionen/Buddy-_Icon anzeigen"
 
-#: ../pidgin/gtkconv.c:2842
+#: pidgin/gtkconv.c:2853
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Optionen/Zeige _Werkzeugleisten f端r Formatierung"
 
-#: ../pidgin/gtkconv.c:2843
+#: pidgin/gtkconv.c:2854
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Optionen/Zeige Zeitste_mpel"
 
-#: ../pidgin/gtkconv.c:2919
+#: pidgin/gtkconv.c:2999
 msgid "/Conversation/More"
 msgstr "/Unterhaltung/Mehr"
 
-#: ../pidgin/gtkconv.c:3027
+#: pidgin/gtkconv.c:3055
 msgid "/Options"
 msgstr "/Optionen"
 
@@ -12839,571 +12486,558 @@
 #. 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:3062 ../pidgin/gtkconv.c:3094
+#: pidgin/gtkconv.c:3090 pidgin/gtkconv.c:3122
 msgid "/Conversation"
 msgstr "/Unterhaltung"
 
-#: ../pidgin/gtkconv.c:3102
+#: pidgin/gtkconv.c:3130
 msgid "/Conversation/View Log"
 msgstr "/Unterhaltung/Betrachte Mitschnitt"
 
-#: ../pidgin/gtkconv.c:3108
+#: pidgin/gtkconv.c:3136
 msgid "/Conversation/Send File..."
 msgstr "/Unterhaltung/Datei senden ..."
 
-#: ../pidgin/gtkconv.c:3112
+#: pidgin/gtkconv.c:3140
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Unterhaltung/Buddy-Alarm hinzuf端gen..."
 
-#: ../pidgin/gtkconv.c:3118
+#: pidgin/gtkconv.c:3146
 msgid "/Conversation/Get Info"
 msgstr "/Unterhaltung/Info abrufen"
 
-#: ../pidgin/gtkconv.c:3122
+#: pidgin/gtkconv.c:3150
 msgid "/Conversation/Invite..."
 msgstr "/Unterhaltung/Einladen ..."
 
-#: ../pidgin/gtkconv.c:3128
+#: pidgin/gtkconv.c:3156
 msgid "/Conversation/Alias..."
 msgstr "/Unterhaltung/Alias..."
 
-#: ../pidgin/gtkconv.c:3132
+#: pidgin/gtkconv.c:3160
 msgid "/Conversation/Block..."
 msgstr "/Unterhaltung/Blockieren..."
 
-#: ../pidgin/gtkconv.c:3136
+#: pidgin/gtkconv.c:3164
 msgid "/Conversation/Unblock..."
 msgstr "/Unterhaltung/Entsperren..."
 
-#: ../pidgin/gtkconv.c:3140
+#: pidgin/gtkconv.c:3168
 msgid "/Conversation/Add..."
 msgstr "/Unterhaltung/Hinzuf端gen..."
 
-#: ../pidgin/gtkconv.c:3144
+#: pidgin/gtkconv.c:3172
 msgid "/Conversation/Remove..."
 msgstr "/Unterhaltung/Entfernen..."
 
-#: ../pidgin/gtkconv.c:3150
+#: pidgin/gtkconv.c:3178
 msgid "/Conversation/Insert Link..."
 msgstr "/Unterhaltung/Link einf端gen..."
 
-#: ../pidgin/gtkconv.c:3154
+#: pidgin/gtkconv.c:3182
 msgid "/Conversation/Insert Image..."
 msgstr "/Unterhaltung/Bild einf端gen..."
 
-#: ../pidgin/gtkconv.c:3160
+#: pidgin/gtkconv.c:3188
 msgid "/Options/Enable Logging"
 msgstr "/Optionen/Schalte Mitschnitt ein"
 
-#: ../pidgin/gtkconv.c:3163
+#: pidgin/gtkconv.c:3191
 msgid "/Options/Enable Sounds"
 msgstr "/Optionen/Schalte Kl辰nge ein"
 
-#: ../pidgin/gtkconv.c:3176
+#: pidgin/gtkconv.c:3204
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Optionen/Zeige Werkzeugleisten f端r Formatierung"
 
-#: ../pidgin/gtkconv.c:3179
+#: pidgin/gtkconv.c:3207
 msgid "/Options/Show Timestamps"
 msgstr "/Optionen/Zeige Zeitstempel"
 
-#: ../pidgin/gtkconv.c:3182
+#: pidgin/gtkconv.c:3210
 msgid "/Options/Show Buddy Icon"
 msgstr "/Optionen/Zeige Buddy-Icon"
 
-#: ../pidgin/gtkconv.c:3266 ../pidgin/gtkconv.c:3308
+#: pidgin/gtkconv.c:3294 pidgin/gtkconv.c:3336
 msgid "User is typing..."
 msgstr "Benutzer tippt gerade..."
 
-#: ../pidgin/gtkconv.c:3311
+#: pidgin/gtkconv.c:3339
 msgid "User has typed something and stopped"
 msgstr "Benutzer hat etwas getippt und wartet nun"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3493
+#: pidgin/gtkconv.c:3520 pidgin/gtkconv.c:7732
 msgid "_Send To"
 msgstr "_Senden an"
 
-#: ../pidgin/gtkconv.c:4207
+#: pidgin/gtkconv.c:4234
 msgid "_Send"
 msgstr "Ab_schicken"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4311
+#: pidgin/gtkconv.c:4338
 msgid "0 people in room"
 msgstr "0 Personen im Raum"
 
-#: ../pidgin/gtkconv.c:5499 ../pidgin/gtkconv.c:5620
+#: pidgin/gtkconv.c:5585 pidgin/gtkconv.c:5706
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d Person im Raum"
 msgstr[1] "%d Personen im Raum"
 
-#: ../pidgin/gtkconv.c:6219 ../pidgin/gtkstatusbox.c:659
+#: pidgin/gtkconv.c:6305 pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Tippt gerade"
 
-#: ../pidgin/gtkconv.c:6225
+#: pidgin/gtkconv.c:6311
 msgid "Stopped Typing"
 msgstr "Tippen gestoppt"
 
-#: ../pidgin/gtkconv.c:6230
+#: pidgin/gtkconv.c:6316
 msgid "Nick Said"
 msgstr "Spitzname gesagt"
 
-#: ../pidgin/gtkconv.c:6235 ../pidgin/gtkdocklet.c:492
+#: pidgin/gtkconv.c:6321 pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Ungelesene Nachrichten"
 
-#: ../pidgin/gtkconv.c:6240
+#: pidgin/gtkconv.c:6326
 msgid "New Event"
 msgstr "Neue Ereignisse"
 
-#: ../pidgin/gtkconv.c:7213
+#: pidgin/gtkconv.c:7303
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Leert alle Gespr辰chsfenster."
 
-#: ../pidgin/gtkconv.c:7377
+#: pidgin/gtkconv.c:7467
 msgid "Confirm close"
 msgstr "Schlie�en best辰tigen"
 
-#: ../pidgin/gtkconv.c:7409
+#: pidgin/gtkconv.c:7499
 msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Sie haben ungelesene Nachrichten. Wollen Sie das Fenster wirklich schlie�en?"
-
-#: ../pidgin/gtkconv.c:7976
+msgstr ""
+"Sie haben ungelesene Nachrichten. Wollen Sie das Fenster wirklich schlie�en?"
+
+#: pidgin/gtkconv.c:8059
 msgid "Close other tabs"
 msgstr "Andere Reiter schlie�en"
 
-#: ../pidgin/gtkconv.c:7982
+#: pidgin/gtkconv.c:8065
 msgid "Close all tabs"
 msgstr "Alle Reiter schlie�en"
 
-#: ../pidgin/gtkconv.c:7990
+#: pidgin/gtkconv.c:8073
 msgid "Detach this tab"
 msgstr "Diesen Reiter abl旦sen"
 
-#: ../pidgin/gtkconv.c:7996
+#: pidgin/gtkconv.c:8079
 msgid "Close this tab"
 msgstr "Diesen Reiter schlie�en"
 
-#: ../pidgin/gtkconv.c:8442
+#: pidgin/gtkconv.c:8560
 msgid "Close conversation"
 msgstr "Unterhaltung schlie�en"
 
-#: ../pidgin/gtkconv.c:8966
+#: pidgin/gtkconv.c:9092
 msgid "Last created window"
 msgstr "Letztes erstelltes Fenster"
 
-#: ../pidgin/gtkconv.c:8968
+#: pidgin/gtkconv.c:9094
 msgid "Separate IM and Chat windows"
 msgstr "Getrennte IM- und Chat-Fenster"
 
-#: ../pidgin/gtkconv.c:8970 ../pidgin/gtkprefs.c:1410
+#: pidgin/gtkconv.c:9096 pidgin/gtkprefs.c:1410
 msgid "New window"
 msgstr "Neues Fenster"
 
-#: ../pidgin/gtkconv.c:8972
+#: pidgin/gtkconv.c:9098
 msgid "By group"
 msgstr "Nach Gruppe"
 
-#: ../pidgin/gtkconv.c:8974
+#: pidgin/gtkconv.c:9100
 msgid "By account"
 msgstr "Nach Konto"
 
-#: ../pidgin/gtkdebug.c:233
+#: pidgin/gtkdebug.c:233
 msgid "Save Debug Log"
 msgstr "Debug-Mitschnitt speichern"
 
-#: ../pidgin/gtkdebug.c:581
+#: pidgin/gtkdebug.c:581
 msgid "Invert"
 msgstr "Invertieren"
 
-#: ../pidgin/gtkdebug.c:584
+#: pidgin/gtkdebug.c:584
 msgid "Highlight matches"
 msgstr "Treffer hervorheben"
 
-#: ../pidgin/gtkdebug.c:651
+#: pidgin/gtkdebug.c:651
 msgid "_Icon Only"
 msgstr "Nur _Icon"
 
-#: ../pidgin/gtkdebug.c:652
+#: pidgin/gtkdebug.c:652
 msgid "_Text Only"
 msgstr "Nur _Text"
 
-#: ../pidgin/gtkdebug.c:653
+#: pidgin/gtkdebug.c:653
 msgid "_Both Icon & Text"
 msgstr "Icon _und Text"
 
-#: ../pidgin/gtkdebug.c:774
+#: pidgin/gtkdebug.c:774
 msgid "Filter"
 msgstr "Filter"
 
-#: ../pidgin/gtkdebug.c:793
+#: pidgin/gtkdebug.c:793
 msgid "Right click for more options."
 msgstr "Rechtsklicken f端r weitere Optionen."
 
-#: ../pidgin/gtkdebug.c:823
+#: pidgin/gtkdebug.c:823
 msgid "Level "
 msgstr "Stufe "
 
-#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
+#: pidgin/gtkdebug.c:824 pidgin/gtkdebug.c:830
 msgid "Select the debug filter level."
 msgstr "Debug-Filterstufe ausw辰hlen."
 
-#: ../pidgin/gtkdebug.c:832
+#: pidgin/gtkdebug.c:832
 msgid "All"
 msgstr "Alle"
 
-#: ../pidgin/gtkdebug.c:833
+#: pidgin/gtkdebug.c:833
 msgid "Misc"
 msgstr "Sonstiges"
 
-#: ../pidgin/gtkdebug.c:835
+#: pidgin/gtkdebug.c:835
 msgid "Warning"
 msgstr "Warnung"
 
-#: ../pidgin/gtkdebug.c:836
+#: pidgin/gtkdebug.c:836
 msgid "Error "
 msgstr "Fehler "
 
-#: ../pidgin/gtkdebug.c:837
+#: pidgin/gtkdebug.c:837
 msgid "Fatal Error"
 msgstr "Schwerer Fehler"
 
-#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
+#: pidgin/gtkdialogs.c:71 pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "Hauptentwickler"
 
-#: ../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:84
-#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
-#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
+#: pidgin/gtkdialogs.c:72 pidgin/gtkdialogs.c:73 pidgin/gtkdialogs.c:74
+#: pidgin/gtkdialogs.c:75 pidgin/gtkdialogs.c:76 pidgin/gtkdialogs.c:77
+#: pidgin/gtkdialogs.c:79 pidgin/gtkdialogs.c:80 pidgin/gtkdialogs.c:81
+#: pidgin/gtkdialogs.c:82 pidgin/gtkdialogs.c:83 pidgin/gtkdialogs.c:84
+#: pidgin/gtkdialogs.c:85 pidgin/gtkdialogs.c:86 pidgin/gtkdialogs.c:89
+#: pidgin/gtkdialogs.c:90 pidgin/gtkdialogs.c:91
 msgid "developer"
 msgstr "Entwickler"
 
-#: ../pidgin/gtkdialogs.c:77
+#: pidgin/gtkdialogs.c:78
 msgid "developer & webmaster"
 msgstr "Entwickler & Webmaster"
 
-#: ../pidgin/gtkdialogs.c:86
+#: pidgin/gtkdialogs.c:87
 msgid "support"
 msgstr "Support"
 
-#: ../pidgin/gtkdialogs.c:87
+#: pidgin/gtkdialogs.c:88
 msgid "support/QA"
 msgstr "Support/Qualit辰tssicherung"
 
-#: ../pidgin/gtkdialogs.c:109
+#: pidgin/gtkdialogs.c:109
 msgid "win32 port"
 msgstr "Win32 Portierung"
 
-#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
+#: pidgin/gtkdialogs.c:110 pidgin/gtkdialogs.c:111
 msgid "maintainer"
 msgstr "Maintainer"
 
-#: ../pidgin/gtkdialogs.c:112
+#: pidgin/gtkdialogs.c:112
 msgid "libfaim maintainer"
 msgstr "libfaim-Maintainer"
 
 #. If "lazy bum" translates literally into a serious insult, use something else or omit it.
-#: ../pidgin/gtkdialogs.c:114
+#: pidgin/gtkdialogs.c:114
 msgid "hacker and designated driver [lazy bum]"
 msgstr "Grafische Benutzeroberfl辰che"
 
-#: ../pidgin/gtkdialogs.c:115
+#: pidgin/gtkdialogs.c:115
 msgid "XMPP developer"
 msgstr "XMPP-Entwickler"
 
-#: ../pidgin/gtkdialogs.c:116
+#: pidgin/gtkdialogs.c:116
 msgid "original author"
 msgstr "Originalautor"
 
-#: ../pidgin/gtkdialogs.c:123
+#: pidgin/gtkdialogs.c:123
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:124
+#: pidgin/gtkdialogs.c:124
 msgid "Arabic"
 msgstr "Arabisch"
 
-#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:211
+#: pidgin/gtkdialogs.c:125 pidgin/gtkdialogs.c:126 pidgin/gtkdialogs.c:213
 msgid "Bulgarian"
 msgstr "Bulgarisch"
 
-#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
-#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
+#: pidgin/gtkdialogs.c:127 pidgin/gtkdialogs.c:128 pidgin/gtkdialogs.c:129
+#: pidgin/gtkdialogs.c:130
 msgid "Bengali"
 msgstr "Bengalisch"
 
-#: ../pidgin/gtkdialogs.c:131
+#: pidgin/gtkdialogs.c:131
 msgid "Bosnian"
 msgstr "Bosnisch"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: pidgin/gtkdialogs.c:132 pidgin/gtkdialogs.c:214 pidgin/gtkdialogs.c:215
 msgid "Catalan"
 msgstr "Katalanisch"
 
-#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
+#: pidgin/gtkdialogs.c:133 pidgin/gtkdialogs.c:134
 msgid "Valencian-Catalan"
 msgstr "Valencianisch-Katalanisch"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:214
+#: pidgin/gtkdialogs.c:135 pidgin/gtkdialogs.c:216
 msgid "Czech"
 msgstr "Tschechisch"
 
-#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+#: pidgin/gtkdialogs.c:136 pidgin/gtkdialogs.c:137
 msgid "Danish"
 msgstr "D辰nisch"
 
-#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:215
+#: pidgin/gtkdialogs.c:138 pidgin/gtkdialogs.c:139 pidgin/gtkdialogs.c:217
 msgid "German"
 msgstr "Deutsch"
 
-#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
-#: ../pidgin/gtkdialogs.c:142
+#: pidgin/gtkdialogs.c:140 pidgin/gtkdialogs.c:141 pidgin/gtkdialogs.c:142
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+#: pidgin/gtkdialogs.c:143 pidgin/gtkdialogs.c:144
 msgid "Greek"
 msgstr "Griechisch"
 
-#: ../pidgin/gtkdialogs.c:145
+#: pidgin/gtkdialogs.c:145
 msgid "Australian English"
 msgstr "Australisches Englisch"
 
-#: ../pidgin/gtkdialogs.c:146
+#: pidgin/gtkdialogs.c:146
 msgid "Canadian English"
 msgstr "Kanadisches Englisch"
 
-#: ../pidgin/gtkdialogs.c:147
+#: pidgin/gtkdialogs.c:147
 msgid "British English"
 msgstr "Britisches Englisch"
 
-#: ../pidgin/gtkdialogs.c:148
+#: pidgin/gtkdialogs.c:148
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: pidgin/gtkdialogs.c:149 pidgin/gtkdialogs.c:218 pidgin/gtkdialogs.c:219
+#: pidgin/gtkdialogs.c:220 pidgin/gtkdialogs.c:221
 msgid "Spanish"
 msgstr "Spanisch"
 
-#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+#: pidgin/gtkdialogs.c:150 pidgin/gtkdialogs.c:151
 msgid "Euskera(Basque)"
 msgstr "Euskera (Baskisch)"
 
-#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
-#: ../pidgin/gtkdialogs.c:154
+#: pidgin/gtkdialogs.c:152 pidgin/gtkdialogs.c:153 pidgin/gtkdialogs.c:154
 msgid "Persian"
 msgstr "Persisch"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
+#: pidgin/gtkdialogs.c:155 pidgin/gtkdialogs.c:222 pidgin/gtkdialogs.c:223
 msgid "Finnish"
 msgstr "Finnisch"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225
+#: pidgin/gtkdialogs.c:156 pidgin/gtkdialogs.c:224 pidgin/gtkdialogs.c:225
+#: pidgin/gtkdialogs.c:226 pidgin/gtkdialogs.c:227
 msgid "French"
 msgstr "Franz旦sisch"
 
-#: ../pidgin/gtkdialogs.c:157
+#: pidgin/gtkdialogs.c:157 pidgin/gtkdialogs.c:158
 msgid "Galician"
 msgstr "Galizisch"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
+#: pidgin/gtkdialogs.c:159 pidgin/gtkdialogs.c:160
 msgid "Gujarati"
 msgstr "Gujaratisch"
 
-#: ../pidgin/gtkdialogs.c:159
+#: pidgin/gtkdialogs.c:160
 msgid "Gujarati Language Team"
 msgstr "Gujaratisch-Team"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226
+#: pidgin/gtkdialogs.c:161 pidgin/gtkdialogs.c:228
 msgid "Hebrew"
 msgstr "Hebr辰isch"
 
-#: ../pidgin/gtkdialogs.c:161
+#: pidgin/gtkdialogs.c:162
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:162
+#: pidgin/gtkdialogs.c:163
 msgid "Hungarian"
 msgstr "Ungarisch"
 
-#: ../pidgin/gtkdialogs.c:163
+#: pidgin/gtkdialogs.c:164
 msgid "Indonesian"
 msgstr "Indonesisch"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:227
+#: pidgin/gtkdialogs.c:165 pidgin/gtkdialogs.c:229
 msgid "Italian"
 msgstr "Italienisch"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
+#: pidgin/gtkdialogs.c:166 pidgin/gtkdialogs.c:230 pidgin/gtkdialogs.c:231
+#: pidgin/gtkdialogs.c:232
 msgid "Japanese"
 msgstr "Japanisch"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:231
+#: pidgin/gtkdialogs.c:167 pidgin/gtkdialogs.c:233
 msgid "Georgian"
 msgstr "Georgisch"
 
-#: ../pidgin/gtkdialogs.c:166
+#: pidgin/gtkdialogs.c:167
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu-Georgisch-�bersetzer"
 
-#: ../pidgin/gtkdialogs.c:167
+#: pidgin/gtkdialogs.c:168
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:167
+#: pidgin/gtkdialogs.c:168
 msgid "Kannada Translation team"
 msgstr "Kannada-�bersetzungsteam"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233
+#: pidgin/gtkdialogs.c:169 pidgin/gtkdialogs.c:234 pidgin/gtkdialogs.c:235
 msgid "Korean"
 msgstr "Koreanisch"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:171
+#: pidgin/gtkdialogs.c:170 pidgin/gtkdialogs.c:171 pidgin/gtkdialogs.c:172
 msgid "Kurdish"
 msgstr "Kurdisch"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: pidgin/gtkdialogs.c:173 pidgin/gtkdialogs.c:236 pidgin/gtkdialogs.c:237
 msgid "Lithuanian"
 msgstr "Litauisch"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
-#: ../pidgin/gtkdialogs.c:236
+#: pidgin/gtkdialogs.c:174 pidgin/gtkdialogs.c:175 pidgin/gtkdialogs.c:238
 msgid "Macedonian"
 msgstr "Makedonisch"
 
-#: ../pidgin/gtkdialogs.c:175
+#: pidgin/gtkdialogs.c:176
 msgid "Bokm奪l Norwegian"
 msgstr "Bokm奪l Norwegisch"
 
-#: ../pidgin/gtkdialogs.c:176
+#: pidgin/gtkdialogs.c:177
 msgid "Nepali"
 msgstr "Nepali"
 
-#: ../pidgin/gtkdialogs.c:177
+#: pidgin/gtkdialogs.c:178
 msgid "Dutch, Flemish"
 msgstr "Niederl辰ndisch, Fl辰misch"
 
-#: ../pidgin/gtkdialogs.c:178
+#: pidgin/gtkdialogs.c:179
 msgid "Norwegian"
 msgstr "Norwegisch"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:237
+#: pidgin/gtkdialogs.c:180
+msgid "Norwegian Nynorsk"
+msgstr "Norwegisch (Nynorsk)"
+
+#: pidgin/gtkdialogs.c:181 pidgin/gtkdialogs.c:182 pidgin/gtkdialogs.c:183
+#: pidgin/gtkdialogs.c:239
 msgid "Polish"
 msgstr "Polnisch"
 
-#: ../pidgin/gtkdialogs.c:182
+#: pidgin/gtkdialogs.c:184
 msgid "Portuguese"
 msgstr "Portugiesisch"
 
-#: ../pidgin/gtkdialogs.c:183
+#: pidgin/gtkdialogs.c:185
 msgid "Portuguese-Brazil"
 msgstr "Portugiesisch (Brasilien)"
 
-#: ../pidgin/gtkdialogs.c:184
+#: pidgin/gtkdialogs.c:186
 msgid "Pashto"
 msgstr "Paschtunisch"
 
-#: ../pidgin/gtkdialogs.c:185
+#: pidgin/gtkdialogs.c:187
 msgid "Romanian"
 msgstr "Rum辰nisch"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239
+#: pidgin/gtkdialogs.c:188 pidgin/gtkdialogs.c:240 pidgin/gtkdialogs.c:241
 msgid "Russian"
 msgstr "Russisch"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:240 ../pidgin/gtkdialogs.c:241
-#: ../pidgin/gtkdialogs.c:242
+#: pidgin/gtkdialogs.c:189 pidgin/gtkdialogs.c:190 pidgin/gtkdialogs.c:242
+#: pidgin/gtkdialogs.c:243 pidgin/gtkdialogs.c:244
 msgid "Slovak"
 msgstr "Slowakisch"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:243
+#: pidgin/gtkdialogs.c:191 pidgin/gtkdialogs.c:245
 msgid "Slovenian"
 msgstr "Slowenisch"
 
-#: ../pidgin/gtkdialogs.c:190
+#: pidgin/gtkdialogs.c:192
 msgid "Albanian"
 msgstr "Albanisch"
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
+#: pidgin/gtkdialogs.c:193 pidgin/gtkdialogs.c:194
 msgid "Serbian"
 msgstr "Serbisch"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:244
+#: pidgin/gtkdialogs.c:195 pidgin/gtkdialogs.c:246
 msgid "Swedish"
 msgstr "Schwedisch"
 
-#: ../pidgin/gtkdialogs.c:194
+#: pidgin/gtkdialogs.c:196
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:195
+#: pidgin/gtkdialogs.c:197
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:196
+#: pidgin/gtkdialogs.c:198
 msgid "Thai"
 msgstr "Thail辰ndisch"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:245
+#: pidgin/gtkdialogs.c:199 pidgin/gtkdialogs.c:247
 msgid "Turkish"
 msgstr "T端rkisch"
 
-#: ../pidgin/gtkdialogs.c:198
+#: pidgin/gtkdialogs.c:200
 msgid "Vietnamese"
 msgstr "Vietnamesisch"
 
-#: ../pidgin/gtkdialogs.c:198
+#: pidgin/gtkdialogs.c:200
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh und das Gnome-Vi Team"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:246
+#: pidgin/gtkdialogs.c:201 pidgin/gtkdialogs.c:248
 msgid "Simplified Chinese"
 msgstr "Vereinfachtes Chinesisch"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
-#: ../pidgin/gtkdialogs.c:202
+#: pidgin/gtkdialogs.c:202 pidgin/gtkdialogs.c:203 pidgin/gtkdialogs.c:204
 msgid "Hong Kong Chinese"
 msgstr "Hong Kong Chinesisch"
 
-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:247
+#: pidgin/gtkdialogs.c:205 pidgin/gtkdialogs.c:206 pidgin/gtkdialogs.c:249
 msgid "Traditional Chinese"
 msgstr "Traditionelles Chinesisch"
 
-#: ../pidgin/gtkdialogs.c:210
+#: pidgin/gtkdialogs.c:212
 msgid "Amharic"
 msgstr "Amharisch"
 
-#: ../pidgin/gtkdialogs.c:332
+#: pidgin/gtkdialogs.c:334
 #, c-format
 msgid "About %s"
 msgstr "�ber %s"
 
-#: ../pidgin/gtkdialogs.c:370
+#: pidgin/gtkdialogs.c:372
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -13425,43 +13059,44 @@
 "gesch端tzt.  Die Datei 'COPYRIGHT' enth辰lt die komplette Liste der "
 "Mitwirkenden.  Wir 端bernehmen keine Haftung f端r dieses Programm.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:385
+#: pidgin/gtkdialogs.c:387
+#, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin auf irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:390
+#: pidgin/gtkdialogs.c:392
 msgid "Current Developers"
 msgstr "Aktuelle Entwickler"
 
-#: ../pidgin/gtkdialogs.c:405
+#: pidgin/gtkdialogs.c:407
 msgid "Crazy Patch Writers"
 msgstr "Verr端ckte Patchschreiber"
 
-#: ../pidgin/gtkdialogs.c:420
+#: pidgin/gtkdialogs.c:422
 msgid "Retired Developers"
 msgstr "Zur端ckgetretene Entwickler"
 
-#: ../pidgin/gtkdialogs.c:435
+#: pidgin/gtkdialogs.c:437
 msgid "Artists"
 msgstr "K端nstler"
 
-#: ../pidgin/gtkdialogs.c:450
+#: pidgin/gtkdialogs.c:452
 msgid "Current Translators"
 msgstr "Aktuelle �bersetzer"
 
-#: ../pidgin/gtkdialogs.c:470
+#: pidgin/gtkdialogs.c:472
 msgid "Past Translators"
 msgstr "Fr端here �bersetzer"
 
-#: ../pidgin/gtkdialogs.c:488
+#: pidgin/gtkdialogs.c:490
 msgid "Debugging Information"
 msgstr "Debugging-Information"
 
-#: ../pidgin/gtkdialogs.c:857
+#: pidgin/gtkdialogs.c:859
 msgid "Get User Info"
 msgstr "Benutzer-Info abrufen"
 
-#: ../pidgin/gtkdialogs.c:859
+#: pidgin/gtkdialogs.c:861
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -13469,11 +13104,11 @@
 "Bitte geben Sie den Benutzernamen oder den Alias der Person ein, deren Info "
 "Sie sehen m旦chten."
 
-#: ../pidgin/gtkdialogs.c:949
+#: pidgin/gtkdialogs.c:951
 msgid "View User Log"
 msgstr "Benutzer-Mitschnitt anzeigen"
 
-#: ../pidgin/gtkdialogs.c:951
+#: pidgin/gtkdialogs.c:953
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -13481,32 +13116,32 @@
 "Bitte geben Sie den Benutzernamen der Person ein, deren Mitschnitt Sie sehen "
 "m旦chten."
 
-#: ../pidgin/gtkdialogs.c:971
+#: pidgin/gtkdialogs.c:973
 msgid "Alias Contact"
 msgstr "Kontakt-Alias"
 
-#: ../pidgin/gtkdialogs.c:972
+#: pidgin/gtkdialogs.c:974
 msgid "Enter an alias for this contact."
 msgstr "Geben Sie einen Alias f端r diesen Kontakt ein."
 
-#: ../pidgin/gtkdialogs.c:994
+#: pidgin/gtkdialogs.c:996
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Geben Sie einen Alias %s ein."
 
-#: ../pidgin/gtkdialogs.c:996
+#: pidgin/gtkdialogs.c:998
 msgid "Alias Buddy"
 msgstr "Alias f端r Buddy"
 
-#: ../pidgin/gtkdialogs.c:1017
+#: pidgin/gtkdialogs.c:1019
 msgid "Alias Chat"
 msgstr "Chat-Alias"
 
-#: ../pidgin/gtkdialogs.c:1018
+#: pidgin/gtkdialogs.c:1020
 msgid "Enter an alias for this chat."
 msgstr "Geben Sie einen Alias f端r diesen Chat ein."
 
-#: ../pidgin/gtkdialogs.c:1057
+#: pidgin/gtkdialogs.c:1059
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13521,15 +13156,15 @@
 "Sie sind dabei, den Kontakt, der %s und %d andere Buddys enth辰lt, aus Ihrer "
 "Buddy-Liste zu entfernen.  M旦chten Sie fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1065
+#: pidgin/gtkdialogs.c:1067
 msgid "Remove Contact"
 msgstr "Kontakt entfernen"
 
-#: ../pidgin/gtkdialogs.c:1068
+#: pidgin/gtkdialogs.c:1070
 msgid "_Remove Contact"
 msgstr "_Kontakt entfernen"
 
-#: ../pidgin/gtkdialogs.c:1099
+#: pidgin/gtkdialogs.c:1101
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -13538,15 +13173,15 @@
 "Sie sind dabei, die Gruppe %s in die Gruppe %s einzuf端gen. M旦chten Sie "
 "fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1106
+#: pidgin/gtkdialogs.c:1108
 msgid "Merge Groups"
 msgstr "Gruppe zusammenf端hren"
 
-#: ../pidgin/gtkdialogs.c:1109
+#: pidgin/gtkdialogs.c:1111
 msgid "_Merge Groups"
 msgstr "_Gruppen zusammenf端hren"
 
-#: ../pidgin/gtkdialogs.c:1159
+#: pidgin/gtkdialogs.c:1161
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13555,30 +13190,31 @@
 "Sie sind dabei, die Gruppe %s und alle darin enthaltenen Mitglieder aus "
 "Ihrer Buddy-Liste zu entfernen. M旦chten Sie fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1162
+#: pidgin/gtkdialogs.c:1164
 msgid "Remove Group"
 msgstr "Gruppe entfernen"
 
-#: ../pidgin/gtkdialogs.c:1165
+#: pidgin/gtkdialogs.c:1167
 msgid "_Remove Group"
 msgstr "_Gruppe entfernen"
 
-#: ../pidgin/gtkdialogs.c:1198
-#, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+#: pidgin/gtkdialogs.c:1200
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr ""
 "Sie sind dabei, %s aus Ihrer Buddy-Liste zu entfernen. M旦chten Sie "
 "fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1201
+#: pidgin/gtkdialogs.c:1203
 msgid "Remove Buddy"
 msgstr "Buddy entfernen"
 
-#: ../pidgin/gtkdialogs.c:1204
+#: pidgin/gtkdialogs.c:1206
 msgid "_Remove Buddy"
 msgstr "Buddy _entfernen"
 
-#: ../pidgin/gtkdialogs.c:1225
+#: pidgin/gtkdialogs.c:1227
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -13587,165 +13223,166 @@
 "Sie sind dabei, den Chat %s aus Ihrer Buddy-Liste zu entfernen. M旦chten Sie "
 "fortfahren?"
 
-#: ../pidgin/gtkdialogs.c:1228
+#: pidgin/gtkdialogs.c:1230
 msgid "Remove Chat"
 msgstr "Chat Entfernen"
 
-#: ../pidgin/gtkdialogs.c:1231
+#: pidgin/gtkdialogs.c:1233
 msgid "_Remove Chat"
 msgstr "Chat _entfernen"
 
-#: ../pidgin/gtkdocklet.c:150
+#: pidgin/gtkdocklet.c:150
 msgid "Right-click for more unread messages...\n"
 msgstr "Rechtsklicken f端r weitere ungelesene Nachrichten...\n"
 
-#: ../pidgin/gtkdocklet.c:435
+#: pidgin/gtkdocklet.c:435
 msgid "Change Status"
 msgstr "�ndere Status"
 
-#: ../pidgin/gtkdocklet.c:487
+#: pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
 msgstr "Buddy-Liste anzeigen"
 
-#: ../pidgin/gtkdocklet.c:513
+#: pidgin/gtkdocklet.c:513
 msgid "New Message..."
 msgstr "Neue Nachricht..."
 
-#: ../pidgin/gtkdocklet.c:528
+#: pidgin/gtkdocklet.c:528
 msgid "Mute Sounds"
 msgstr "Stummschalten"
 
-#: ../pidgin/gtkdocklet.c:535
+#: pidgin/gtkdocklet.c:535
 msgid "Blink on new message"
 msgstr "Bei neuen Nachrichten blinken"
 
-#: ../pidgin/gtkdocklet.c:542
+#: pidgin/gtkdocklet.c:542
 msgid "Quit"
 msgstr "Beenden"
 
-#: ../pidgin/gtkft.c:153
+#: pidgin/gtkft.c:153
 msgid "Not started"
 msgstr "Nicht gestartet"
 
-#: ../pidgin/gtkft.c:273
+#: pidgin/gtkft.c:273
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Empfange als:</b>"
 
-#: ../pidgin/gtkft.c:275
+#: pidgin/gtkft.c:275
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Empfange von:</b>"
 
-#: ../pidgin/gtkft.c:279
+#: pidgin/gtkft.c:279
 msgid "<b>Sending To:</b>"
 msgstr "<b>Sende an:</b>"
 
-#: ../pidgin/gtkft.c:281
+#: pidgin/gtkft.c:281
 msgid "<b>Sending As:</b>"
 msgstr "<b>Sende als:</b>"
 
-#: ../pidgin/gtkft.c:497
+#: pidgin/gtkft.c:497
 msgid "There is no application configured to open this type of file."
 msgstr "Es wurde kein Programm zum �ffnen dieses Dateityps konfiguriert."
 
-#: ../pidgin/gtkft.c:502
+#: pidgin/gtkft.c:502
 msgid "An error occurred while opening the file."
 msgstr "Beim �ffnen der Datei trat ein Fehler auf."
 
-#: ../pidgin/gtkft.c:539
+#: pidgin/gtkft.c:539
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Fehler beim Aufruf von %s: %s"
 
-#: ../pidgin/gtkft.c:548
+#: pidgin/gtkft.c:548
 #, c-format
 msgid "Error running %s"
 msgstr "Fehler beim Ausf端hren von %s"
 
-#: ../pidgin/gtkft.c:549
+#: pidgin/gtkft.c:549
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Der Prozess gab den Fehlercode %d zur端ck"
 
-#: ../pidgin/gtkft.c:696
+#: pidgin/gtkft.c:696
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: ../pidgin/gtkft.c:697
+#: pidgin/gtkft.c:697
 msgid "Local File:"
 msgstr "Lokale Datei:"
 
-#: ../pidgin/gtkft.c:699
+#: pidgin/gtkft.c:699
 msgid "Speed:"
 msgstr "Geschwindigkeit:"
 
-#: ../pidgin/gtkft.c:700
+#: pidgin/gtkft.c:700
 msgid "Time Elapsed:"
 msgstr "Verstrichene Zeit:"
 
-#: ../pidgin/gtkft.c:701
+#: pidgin/gtkft.c:701
 msgid "Time Remaining:"
 msgstr "Verbleibende Zeit:"
 
-#: ../pidgin/gtkft.c:783
+#: pidgin/gtkft.c:783
 msgid "Close this window when all transfers _finish"
 msgstr "S_chlie�e dieses Fenster, wenn alle �bertragungen abgeschlossen sind"
 
-#: ../pidgin/gtkft.c:793
+#: pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
 msgstr "_Entferne komplette �bertragungen"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:802
+#: pidgin/gtkft.c:802
 msgid "File transfer _details"
 msgstr "Datei端bertragungs-_Details"
 
 #. Pause button
-#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
+#: pidgin/gtkft.c:832 pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "_Pause"
 
 #. Resume button
-#: ../pidgin/gtkft.c:842
+#: pidgin/gtkft.c:842
 msgid "_Resume"
 msgstr "Fo_rtsetzen"
 
-#: ../pidgin/gtkimhtml.c:795
+#: pidgin/gtkimhtml.c:811
 msgid "Paste as Plain _Text"
 msgstr "Einf端gen als normaler _Text"
 
-#: ../pidgin/gtkimhtml.c:812
+#: pidgin/gtkimhtml.c:828
 msgid "_Reset formatting"
 msgstr "Formatierung _zur端cksetzen"
 
-#: ../pidgin/gtkimhtml.c:1349
+#: pidgin/gtkimhtml.c:1368
 msgid "Hyperlink color"
 msgstr "Hyperlink-Farbe"
 
-#: ../pidgin/gtkimhtml.c:1350
+#: pidgin/gtkimhtml.c:1369
 msgid "Color to draw hyperlinks."
 msgstr "Farbe zum Darstellen von Hyperlinks."
 
-#: ../pidgin/gtkimhtml.c:1353
+#: pidgin/gtkimhtml.c:1372
 msgid "Hyperlink prelight color"
 msgstr "Hyperlink-Farbe"
 
-#: ../pidgin/gtkimhtml.c:1354
+#: pidgin/gtkimhtml.c:1373
 msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "Farbe zum Darstellen von Hyperlinks, wenn sich die Maus dar端ber befindet."
-
-#: ../pidgin/gtkimhtml.c:1575
+msgstr ""
+"Farbe zum Darstellen von Hyperlinks, wenn sich die Maus dar端ber befindet."
+
+#: pidgin/gtkimhtml.c:1593
 msgid "_Copy E-Mail Address"
 msgstr "Kopiere _E-Mail-Adresse"
 
-#: ../pidgin/gtkimhtml.c:1587
+#: pidgin/gtkimhtml.c:1605
 msgid "_Open Link in Browser"
 msgstr "�_ffne Link im Browser"
 
-#: ../pidgin/gtkimhtml.c:1597
+#: pidgin/gtkimhtml.c:1615
 msgid "_Copy Link Location"
 msgstr "_Kopiere den Link"
 
-#: ../pidgin/gtkimhtml.c:3341
+#: pidgin/gtkimhtml.c:3359
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13755,7 +13392,7 @@
 "\n"
 "Verwende Standard (PNG)."
 
-#: ../pidgin/gtkimhtml.c:3344
+#: pidgin/gtkimhtml.c:3362
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13765,7 +13402,7 @@
 "\n"
 "Verwende Standard (PNG)."
 
-#: ../pidgin/gtkimhtml.c:3373
+#: pidgin/gtkimhtml.c:3391
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13776,7 +13413,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3376
+#: pidgin/gtkimhtml.c:3394
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13787,35 +13424,36 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3454 ../pidgin/gtkimhtml.c:3466
+#: pidgin/gtkimhtml.c:3472 pidgin/gtkimhtml.c:3484
 msgid "Save Image"
 msgstr "Bild speichern"
 
-#: ../pidgin/gtkimhtml.c:3494
+#: pidgin/gtkimhtml.c:3512
+#, c-format
 msgid "_Save Image..."
 msgstr "Bild _speichern..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:153
+#: pidgin/gtkimhtmltoolbar.c:153
 msgid "Select Font"
 msgstr "Schriftart w辰hlen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:232
+#: pidgin/gtkimhtmltoolbar.c:232
 msgid "Select Text Color"
 msgstr "Textfarbe ausw辰hlen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:311
+#: pidgin/gtkimhtmltoolbar.c:311
 msgid "Select Background Color"
 msgstr "Hintergrundfarbe ausw辰hlen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:400
+#: pidgin/gtkimhtmltoolbar.c:400
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:408
+#: pidgin/gtkimhtmltoolbar.c:408
 msgid "_Description"
 msgstr "_Beschreibung"
 
-#: ../pidgin/gtkimhtmltoolbar.c:411
+#: pidgin/gtkimhtmltoolbar.c:411
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13823,93 +13461,93 @@
 "Bitte geben Sie die URL und die Beschreibung des Links an, den Sie einf端gen "
 "m旦chten. Die Beschreibung ist optional."
 
-#: ../pidgin/gtkimhtmltoolbar.c:415
+#: pidgin/gtkimhtmltoolbar.c:415
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Bitte geben Sie die URL des Links an, den Sie einf端gen m旦chten."
 
-#: ../pidgin/gtkimhtmltoolbar.c:420
+#: pidgin/gtkimhtmltoolbar.c:420
 msgid "Insert Link"
 msgstr "Link einf端gen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1155
+#: pidgin/gtkimhtmltoolbar.c:424 pidgin/gtkimhtmltoolbar.c:1155
 msgid "_Insert"
 msgstr "_Einf端gen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:493
+#: pidgin/gtkimhtmltoolbar.c:493
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Speichern des Bildes fehlgeschlagen: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
+#: pidgin/gtkimhtmltoolbar.c:519 pidgin/gtkimhtmltoolbar.c:529
 msgid "Insert Image"
 msgstr "Bild einf端gen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:740
+#: pidgin/gtkimhtmltoolbar.c:740
 msgid "This theme has no available smileys."
 msgstr "Dieses Thema verf端gt 端ber keine Smileys."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:757
+#: pidgin/gtkimhtmltoolbar.c:757
 msgid "Smile!"
 msgstr "L辰cheln!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1064
+#: pidgin/gtkimhtmltoolbar.c:1064
 msgid "_Bold"
 msgstr "_Fett"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1065
+#: pidgin/gtkimhtmltoolbar.c:1065
 msgid "_Italic"
 msgstr "_Kursiv"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1066
+#: pidgin/gtkimhtmltoolbar.c:1066
 msgid "_Underline"
 msgstr "_Unterstrichen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1067
+#: pidgin/gtkimhtmltoolbar.c:1067
 msgid "_Larger"
 msgstr "_Gr旦�er"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1069
+#: pidgin/gtkimhtmltoolbar.c:1069
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1071
+#: pidgin/gtkimhtmltoolbar.c:1071
 msgid "_Smaller"
 msgstr "K_leiner"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1072
+#: pidgin/gtkimhtmltoolbar.c:1072
 msgid "_Font face"
 msgstr "_Schriftart"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1073
+#: pidgin/gtkimhtmltoolbar.c:1073
 msgid "_Foreground color"
 msgstr "_Vordergrundfarbe"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1074
+#: pidgin/gtkimhtmltoolbar.c:1074
 msgid "_Background color"
 msgstr "_Hintergrundfarbe"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
+#: pidgin/gtkimhtmltoolbar.c:1100
 msgid "_Font"
 msgstr "_Schrift"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1135
+#: pidgin/gtkimhtmltoolbar.c:1135
 msgid "_Reset font"
 msgstr "Schrift _zur端cksetzen"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1162
+#: pidgin/gtkimhtmltoolbar.c:1162
 msgid "_Smiley"
 msgstr "_Smiley"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1168
+#: pidgin/gtkimhtmltoolbar.c:1168
 msgid "_Image"
 msgstr "_Bild"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1174
+#: pidgin/gtkimhtmltoolbar.c:1174
 msgid "_Link"
 msgstr "_Link"
 
-#: ../pidgin/gtklog.c:267
+#: pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -13918,7 +13556,7 @@
 "Wollen Sie wirklich den Mitschnitt der Unterhaltung mit %s, gestartet am %s, "
 "permanent l旦schen?"
 
-#: ../pidgin/gtklog.c:278
+#: pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -13927,7 +13565,7 @@
 "Wollen Sie wirklich den Mitschnitt der Unterhaltung in %s, gestartet am %s, "
 "permanent l旦schen?"
 
-#: ../pidgin/gtklog.c:283
+#: pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -13936,21 +13574,21 @@
 "Wollen Sie wirklich den System-Mitschnitt, gestartet am %s, permanent "
 "l旦schen?"
 
-#: ../pidgin/gtklog.c:427
+#: pidgin/gtklog.c:452
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Unterhaltung mit %s am %s</span>"
 
-#: ../pidgin/gtklog.c:430
+#: pidgin/gtklog.c:455
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Unterhaltung mit %s am %s</span>"
 
-#: ../pidgin/gtklog.c:477
+#: pidgin/gtklog.c:502
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:524
+#: pidgin/gtklog.c:549
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -13958,7 +13596,7 @@
 "Systemereignisse werden nur mitgeschnitten, wenn die Option ��Schneide alle "
 "Statusver辰nderungen im System-Mitschnitt mit�� aktiviert ist."
 
-#: ../pidgin/gtklog.c:528
+#: pidgin/gtklog.c:553
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -13966,45 +13604,46 @@
 "Sofortnachrichten werden nur mitgeschnitten, wenn die Option ��Alle "
 "Sofortnachrichten mitschneiden�� aktiviert ist."
 
-#: ../pidgin/gtklog.c:531
-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
+#: pidgin/gtklog.c:556
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Chats werden nur mitgeschnitten, wenn die Option ��Alle Chats mitschneiden�� "
 "aktiviert ist."
 
-#: ../pidgin/gtklog.c:535
+#: pidgin/gtklog.c:560
 msgid "No logs were found"
 msgstr "Keine Mitschnitte gefunden"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:550
+#: pidgin/gtklog.c:575
 msgid "_Browse logs folder"
 msgstr "_Mitschnitt-Ordner anschauen"
 
-#: ../pidgin/gtklog.c:614
+#: pidgin/gtklog.c:639
 msgid "Total log size:"
 msgstr "Gesamte Mitschnittgr旦�e:"
 
-#: ../pidgin/gtklog.c:683
+#: pidgin/gtklog.c:708
 #, c-format
 msgid "Conversations in %s"
 msgstr "Unterhaltung in %s"
 
-#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
+#: pidgin/gtklog.c:716 pidgin/gtklog.c:778
 #, c-format
 msgid "Conversations with %s"
 msgstr "Unterhaltung mit %s"
 
-#: ../pidgin/gtklog.c:778
+#: pidgin/gtklog.c:803
 msgid "System Log"
 msgstr "System-Mitschnitt"
 
-#: ../pidgin/gtkmain.c:385
+#: pidgin/gtkmain.c:385
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Versuchen Sie `%s -h' f端r weitere Informationen.\n"
 
-#: ../pidgin/gtkmain.c:387
+#: pidgin/gtkmain.c:387
 #, c-format
 msgid ""
 "%s %s\n"
@@ -14032,7 +13671,7 @@
 "                      sollen, getrennt durch Kommata)\n"
 "  -v, --version       zeigt aktuelle Version und beendet das Programm\n"
 
-#: ../pidgin/gtkmain.c:511
+#: pidgin/gtkmain.c:511
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -14074,64 +13713,66 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:697 ../pidgin/pidgin.h:50
+#: pidgin/gtkmain.c:697 pidgin/pidgin.h:50
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:343
+#: pidgin/gtknotify.c:343
 msgid "Open All Messages"
 msgstr "Alle Nachrichten 旦ffnen"
 
-#: ../pidgin/gtknotify.c:395
+#: pidgin/gtknotify.c:395
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sie haben Post!</span>"
 
-#: ../pidgin/gtknotify.c:515
+#: pidgin/gtknotify.c:515
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s hat %d neue Nachricht."
 msgstr[1] "%s hat %d neue Nachrichten."
 
-#: ../pidgin/gtknotify.c:526
+#: pidgin/gtknotify.c:526
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
 msgstr[0] "<b>Sie haben %d neue E-Mail.</b>"
 msgstr[1] "<b>Sie haben %d neue E-Mails.</b>"
 
-#: ../pidgin/gtknotify.c:965
+#: pidgin/gtknotify.c:964
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Das Browser-Kommando ��%s�� ist falsch."
 
-#: ../pidgin/gtknotify.c:967 ../pidgin/gtknotify.c:979
-#: ../pidgin/gtknotify.c:992 ../pidgin/gtknotify.c:1120
+#: pidgin/gtknotify.c:966 pidgin/gtknotify.c:978 pidgin/gtknotify.c:991
+#: pidgin/gtknotify.c:1119
 msgid "Unable to open URL"
 msgstr "Kann die URL nicht 旦ffnen"
 
-#: ../pidgin/gtknotify.c:977 ../pidgin/gtknotify.c:990
+#: pidgin/gtknotify.c:976 pidgin/gtknotify.c:989
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Fehler beim Aufruf von ��%s��: %s"
 
-#: ../pidgin/gtknotify.c:1121
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "Das benutzerdefinierte Browserkommando wurde ausgew辰hlt, aber nicht gesetzt."
-
-#: ../pidgin/gtkplugin.c:264
+#: pidgin/gtknotify.c:1120
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr ""
+"Das benutzerdefinierte Browserkommando wurde ausgew辰hlt, aber nicht gesetzt."
+
+#: pidgin/gtkplugin.c:264
 msgid "The following plugins will be unloaded."
 msgstr "Die folgenden Plugins werden entladen."
 
-#: ../pidgin/gtkplugin.c:283
+#: pidgin/gtkplugin.c:283
 msgid "Multiple plugins will be unloaded."
 msgstr "Mehrere Plugins werden entladen."
 
-#: ../pidgin/gtkplugin.c:287
+#: pidgin/gtkplugin.c:287
 msgid "Unload Plugins"
 msgstr "Plugins entladen"
 
-#: ../pidgin/gtkplugin.c:399
+#: pidgin/gtkplugin.c:399
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -14142,7 +13783,7 @@
 "<span weight=\"bold\">Webseite: </span>\t\t%s\n"
 "<span weight=\"bold\">Dateiname:</span>\t\t%s"
 
-#: ../pidgin/gtkplugin.c:409
+#: pidgin/gtkplugin.c:409
 #, c-format
 msgid ""
 "%s\n"
@@ -14153,125 +13794,124 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Fehler: %s\n"
 "�berpr端fen Sie die Website des Plugins auf eine neue Version.</span>"
 
-#: ../pidgin/gtkplugin.c:535
+#: pidgin/gtkplugin.c:535
 msgid "Configure Pl_ugin"
 msgstr "Pl_ugin konfigurieren"
 
-#: ../pidgin/gtkplugin.c:598
+#: pidgin/gtkplugin.c:598
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Plugin-Details</b>"
 
-#: ../pidgin/gtkpounce.c:156
+#: pidgin/gtkpounce.c:156
 msgid "Select a file"
 msgstr "W辰hlen Sie eine Datei"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:533
+#: pidgin/gtkpounce.c:533
 msgid "Pounce on Whom"
 msgstr "Bei wem alarmieren"
 
-#: ../pidgin/gtkpounce.c:560
+#: pidgin/gtkpounce.c:560
 msgid "_Buddy name:"
 msgstr "_Buddy-Name:"
 
-#: ../pidgin/gtkpounce.c:594
+#: pidgin/gtkpounce.c:594
 msgid "Si_gns on"
 msgstr "_sich anmeldet"
 
-#: ../pidgin/gtkpounce.c:596
+#: pidgin/gtkpounce.c:596
 msgid "Signs o_ff"
 msgstr "sich abmel_det"
 
-#: ../pidgin/gtkpounce.c:598
+#: pidgin/gtkpounce.c:598
 msgid "Goes a_way"
 msgstr "_hinausgeht"
 
-#: ../pidgin/gtkpounce.c:600
+#: pidgin/gtkpounce.c:600
 msgid "Ret_urns from away"
 msgstr "wi_eder anwesend ist"
 
-#: ../pidgin/gtkpounce.c:602
+#: pidgin/gtkpounce.c:602
 msgid "Becomes _idle"
 msgstr "_unt辰tig wird"
 
-#: ../pidgin/gtkpounce.c:604
+#: pidgin/gtkpounce.c:604
 msgid "Is no longer i_dle"
 msgstr "nicht meh_r unt辰tig ist"
 
-#: ../pidgin/gtkpounce.c:606
+#: pidgin/gtkpounce.c:606
 msgid "Starts _typing"
 msgstr "zu _tippen beginnt"
 
-#: ../pidgin/gtkpounce.c:608
+#: pidgin/gtkpounce.c:608
 msgid "P_auses while typing"
 msgstr "beim Tippen an_h辰lt"
 
-#: ../pidgin/gtkpounce.c:610
+#: pidgin/gtkpounce.c:610
 msgid "Stops t_yping"
 msgstr "aufh旦rt _zu tippen"
 
-#: ../pidgin/gtkpounce.c:612
+#: pidgin/gtkpounce.c:612
 msgid "Sends a _message"
 msgstr "eine _Nachricht sendet"
 
-#: ../pidgin/gtkpounce.c:655
+#: pidgin/gtkpounce.c:655
 msgid "Ope_n an IM window"
 msgstr "Gespr辰chsfenster 旦_ffnen"
 
-#: ../pidgin/gtkpounce.c:657
+#: pidgin/gtkpounce.c:657
 msgid "_Pop up a notification"
 msgstr "_Popup-Benachrichtigung"
 
-#: ../pidgin/gtkpounce.c:659
+#: pidgin/gtkpounce.c:659
 msgid "Send a _message"
 msgstr "_Nachricht senden"
 
-#: ../pidgin/gtkpounce.c:661
+#: pidgin/gtkpounce.c:661
 msgid "E_xecute a command"
 msgstr "Befeh_l ausf端hren"
 
-#: ../pidgin/gtkpounce.c:663
+#: pidgin/gtkpounce.c:663
 msgid "P_lay a sound"
 msgstr "einen _Klang abspielen"
 
-#: ../pidgin/gtkpounce.c:669
+#: pidgin/gtkpounce.c:669
 msgid "Brows_e..."
 msgstr "Aus_w辰hlen..."
 
-#: ../pidgin/gtkpounce.c:671
+#: pidgin/gtkpounce.c:671
 msgid "Br_owse..."
 msgstr "Aus_w辰hlen..."
 
-#: ../pidgin/gtkpounce.c:672
+#: pidgin/gtkpounce.c:672
 msgid "Pre_view"
 msgstr "_Vorschau"
 
-#: ../pidgin/gtkpounce.c:799
+#: pidgin/gtkpounce.c:799
 msgid "P_ounce only when my status is not Available"
 msgstr "Nur _alarmieren, wenn ich nicht verf端gbar bin"
 
-#: ../pidgin/gtkpounce.c:804
+#: pidgin/gtkpounce.c:804
 msgid "_Recurring"
 msgstr "_Wiederkehrend"
 
-#: ../pidgin/gtkpounce.c:1260
+#: pidgin/gtkpounce.c:1260
 msgid "Pounce Target"
 msgstr "Alarm-Ziel"
 
-#: ../pidgin/gtkprefs.c:385
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+#: pidgin/gtkprefs.c:385 pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
 msgid "Default"
 msgstr "Standard"
 
-#: ../pidgin/gtkprefs.c:516
+#: pidgin/gtkprefs.c:516
 msgid "Smiley theme failed to unpack."
 msgstr "Smiley-Thema konnte nicht entpackt werden."
 
-#: ../pidgin/gtkprefs.c:643
+#: pidgin/gtkprefs.c:643
 msgid "Install Theme"
 msgstr "Thema installieren"
 
-#: ../pidgin/gtkprefs.c:696
+#: pidgin/gtkprefs.c:696
 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."
@@ -14279,139 +13919,134 @@
 "W辰hlen Sie das zu benutzende Smilie-Thema aus der untenstehenden Liste. Neue "
 "Themen k旦nnen durch Ziehen in die Themenliste installiert werden."
 
-#: ../pidgin/gtkprefs.c:731
+#: pidgin/gtkprefs.c:731
 msgid "Icon"
 msgstr "Icon"
 
-#: ../pidgin/gtkprefs.c:893
+#: pidgin/gtkprefs.c:893
 msgid "System Tray Icon"
 msgstr "Kontrollleisten-Icon"
 
-#: ../pidgin/gtkprefs.c:894
+#: pidgin/gtkprefs.c:894
 msgid "_Show system tray icon:"
 msgstr "Kontrollleisten-Icon _anzeigen:"
 
-#: ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1756
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
+#: pidgin/gtkprefs.c:896 pidgin/gtkprefs.c:908 pidgin/gtkprefs.c:1756
+#: pidgin/plugins/timestamp_format.c:42 pidgin/plugins/timestamp_format.c:51
+#: pidgin/plugins/win32/winprefs/winprefs.c:338
 msgid "Always"
 msgstr "Immer"
 
-#: ../pidgin/gtkprefs.c:898
+#: pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "Bei ungelesenen Nachrichten"
 
-#: ../pidgin/gtkprefs.c:903
+#: pidgin/gtkprefs.c:903
 msgid "Conversation Window Hiding"
 msgstr "Gespr辰chsfenster verstecken"
 
-#: ../pidgin/gtkprefs.c:904
+#: pidgin/gtkprefs.c:904
 msgid "_Hide new IM conversations:"
 msgstr "_Neue IM-Gespr辰che verstecken:"
 
-#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1937
+#: pidgin/gtkprefs.c:907 pidgin/gtkprefs.c:1937
 msgid "When away"
 msgstr "Bei Abwesenheit"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:915
+#: pidgin/gtkprefs.c:915
 msgid "Tabs"
 msgstr "Reiter"
 
-#: ../pidgin/gtkprefs.c:917
+#: pidgin/gtkprefs.c:917
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "IMs und Chats in _Reiter-Fenstern anzeigen"
 
-#: ../pidgin/gtkprefs.c:931
+#: pidgin/gtkprefs.c:931
 msgid "Show close b_utton on tabs"
 msgstr "_Beenden-Button in Reitern zeigen"
 
-#: ../pidgin/gtkprefs.c:934
+#: pidgin/gtkprefs.c:934
 msgid "_Placement:"
 msgstr "_Platzierung:"
 
-#: ../pidgin/gtkprefs.c:936
+#: pidgin/gtkprefs.c:936
 msgid "Top"
 msgstr "Oben"
 
-#: ../pidgin/gtkprefs.c:937
+#: pidgin/gtkprefs.c:937
 msgid "Bottom"
 msgstr "Unten"
 
-#: ../pidgin/gtkprefs.c:938
+#: pidgin/gtkprefs.c:938
 msgid "Left"
 msgstr "Links"
 
-#: ../pidgin/gtkprefs.c:939
+#: pidgin/gtkprefs.c:939
 msgid "Right"
 msgstr "Rechts"
 
-#: ../pidgin/gtkprefs.c:941
+#: pidgin/gtkprefs.c:941
 msgid "Left Vertical"
 msgstr "Links vertikal"
 
-#: ../pidgin/gtkprefs.c:942
+#: pidgin/gtkprefs.c:942
 msgid "Right Vertical"
 msgstr "Rechts vertikal"
 
-#: ../pidgin/gtkprefs.c:949
+#: pidgin/gtkprefs.c:949
 msgid "N_ew conversations:"
 msgstr "N_eue Unterhaltungen:"
 
-#: ../pidgin/gtkprefs.c:994
+#: pidgin/gtkprefs.c:994
 msgid "Show _formatting on incoming messages"
 msgstr "Zeige _Formatierung bei ankommenden Nachrichten"
 
-#: ../pidgin/gtkprefs.c:997
-msgid "Show buddy _icons"
-msgstr "Buddy-_Icons anzeigen"
-
-#: ../pidgin/gtkprefs.c:999
+#: pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
 msgstr "Buddy-Icon-_Animation aktivieren"
 
-#: ../pidgin/gtkprefs.c:1006
+#: pidgin/gtkprefs.c:1006
 msgid "_Notify buddies that you are typing to them"
 msgstr "Buddys be_nachrichtigen, dass Sie ihnen schreiben"
 
-#: ../pidgin/gtkprefs.c:1009
+#: pidgin/gtkprefs.c:1009
 msgid "Highlight _misspelled words"
 msgstr "_Falsch geschriebene W旦rter hervorheben"
 
-#: ../pidgin/gtkprefs.c:1013
+#: pidgin/gtkprefs.c:1013
 msgid "Use smooth-scrolling"
 msgstr "Weiches Scrollen aktivieren"
 
-#: ../pidgin/gtkprefs.c:1016
+#: pidgin/gtkprefs.c:1016
 msgid "F_lash window when IMs are received"
 msgstr "_Fenster blinkt, wenn Nachrichten empfangen werden"
 
-#: ../pidgin/gtkprefs.c:1018
+#: pidgin/gtkprefs.c:1018
 msgid "Minimi_ze new conversation windows"
 msgstr "Neue Gespr辰chsfenster mi_nimieren"
 
-#: ../pidgin/gtkprefs.c:1022
+#: pidgin/gtkprefs.c:1022
 msgid "Font"
 msgstr "Schriftart"
 
-#: ../pidgin/gtkprefs.c:1024
+#: pidgin/gtkprefs.c:1024
 msgid "Use document font from _theme"
 msgstr "Benutze Dokumentenschriftart des _Themas"
 
-#: ../pidgin/gtkprefs.c:1026
+#: pidgin/gtkprefs.c:1026
 msgid "Use font from _theme"
 msgstr "Benutze Schriftart des _Themas"
 
-#: ../pidgin/gtkprefs.c:1028
+#: pidgin/gtkprefs.c:1028
 msgid "Conversation _font:"
 msgstr "Gespr辰chsschri_ftart:"
 
-#: ../pidgin/gtkprefs.c:1041
+#: pidgin/gtkprefs.c:1041
 msgid "Default Formatting"
 msgstr "Standard-Formatierung"
 
-#: ../pidgin/gtkprefs.c:1057
+#: pidgin/gtkprefs.c:1057
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -14419,119 +14054,119 @@
 "So wird der ausgehende Nachrichtentext aussehen, wenn Sie "
 "Protokollebenutzen, die Formatierung unterst端tzen."
 
-#: ../pidgin/gtkprefs.c:1123
+#: pidgin/gtkprefs.c:1123
 msgid "ST_UN server:"
 msgstr "ST_UN Server:"
 
-#: ../pidgin/gtkprefs.c:1135
+#: pidgin/gtkprefs.c:1135
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Beispiel: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1139
+#: pidgin/gtkprefs.c:1139
 msgid "_Autodetect IP address"
 msgstr "IP-Adresse _automatisch erkennen"
 
-#: ../pidgin/gtkprefs.c:1148
+#: pidgin/gtkprefs.c:1148
 msgid "Public _IP:"
 msgstr "�ffentliche _IP:"
 
-#: ../pidgin/gtkprefs.c:1177
+#: pidgin/gtkprefs.c:1177
 msgid "Ports"
 msgstr "Ports"
 
-#: ../pidgin/gtkprefs.c:1180
+#: pidgin/gtkprefs.c:1180
 msgid "_Manually specify range of ports to listen on"
 msgstr "Port-Bereich, auf dem geh旦rt werden soll, _manuell bestimmen"
 
-#: ../pidgin/gtkprefs.c:1183
+#: pidgin/gtkprefs.c:1183
 msgid "_Start port:"
 msgstr "_Start-Port:"
 
-#: ../pidgin/gtkprefs.c:1190
+#: pidgin/gtkprefs.c:1190
 msgid "_End port:"
 msgstr "_End-Port:"
 
-#: ../pidgin/gtkprefs.c:1198
+#: pidgin/gtkprefs.c:1198
 msgid "Proxy Server"
 msgstr "Proxy-Server"
 
-#: ../pidgin/gtkprefs.c:1202
+#: pidgin/gtkprefs.c:1202
 msgid "No proxy"
 msgstr "Kein Proxy"
 
-#: ../pidgin/gtkprefs.c:1258
+#: pidgin/gtkprefs.c:1258
 msgid "_User:"
 msgstr "_Benutzer:"
 
-#: ../pidgin/gtkprefs.c:1323
+#: pidgin/gtkprefs.c:1323
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1324
+#: pidgin/gtkprefs.c:1324
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1325
+#: pidgin/gtkprefs.c:1325
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1326
+#: pidgin/gtkprefs.c:1326
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1327
+#: pidgin/gtkprefs.c:1327
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1328
+#: pidgin/gtkprefs.c:1328
 msgid "GNOME Default"
 msgstr "GNOME-Standard"
 
-#: ../pidgin/gtkprefs.c:1329
+#: pidgin/gtkprefs.c:1329
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1330
+#: pidgin/gtkprefs.c:1330
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1331
+#: pidgin/gtkprefs.c:1331
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1332
+#: pidgin/gtkprefs.c:1332
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1341
+#: pidgin/gtkprefs.c:1341
 msgid "Manual"
 msgstr "Manuell"
 
-#: ../pidgin/gtkprefs.c:1394
+#: pidgin/gtkprefs.c:1394
 msgid "Browser Selection"
 msgstr "Browserauswahl"
 
-#: ../pidgin/gtkprefs.c:1398
+#: pidgin/gtkprefs.c:1398
 msgid "_Browser:"
 msgstr "_Browser:"
 
-#: ../pidgin/gtkprefs.c:1406
+#: pidgin/gtkprefs.c:1406
 msgid "_Open link in:"
 msgstr "�_ffne Link in:"
 
-#: ../pidgin/gtkprefs.c:1408
+#: pidgin/gtkprefs.c:1408
 msgid "Browser default"
 msgstr "Standard-Browser"
 
-#: ../pidgin/gtkprefs.c:1409
+#: pidgin/gtkprefs.c:1409
 msgid "Existing window"
 msgstr "Existierendes Fenster"
 
-#: ../pidgin/gtkprefs.c:1411
+#: pidgin/gtkprefs.c:1411
 msgid "New tab"
 msgstr "Neuer Reiter"
 
-#: ../pidgin/gtkprefs.c:1425
+#: pidgin/gtkprefs.c:1425
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14540,80 +14175,85 @@
 "_Manuell:\n"
 "(%s f端r die URL)"
 
-#: ../pidgin/gtkprefs.c:1465
+#: pidgin/gtkprefs.c:1465
 msgid "Log _format:"
 msgstr "Mitschnitt-_Format:"
 
-#: ../pidgin/gtkprefs.c:1470
+#: pidgin/gtkprefs.c:1470
 msgid "Log all _instant messages"
 msgstr "_Schneide alle Sofortnachrichten mit"
 
-#: ../pidgin/gtkprefs.c:1472
+#: pidgin/gtkprefs.c:1472
 msgid "Log all c_hats"
 msgstr "Alle C_hats mitschneiden"
 
-#: ../pidgin/gtkprefs.c:1474
+#: pidgin/gtkprefs.c:1474
 msgid "Log all _status changes to system log"
 msgstr "Schneide alle _Statusver辰nderungen im System-Mitschnitt mit"
 
-#: ../pidgin/gtkprefs.c:1582 ../pidgin/gtkprefs.c:1671
-#: ../pidgin/gtkprefs.c:1865
+#: pidgin/gtkprefs.c:1582 pidgin/gtkprefs.c:1671 pidgin/gtkprefs.c:1865
 msgid "(default)"
 msgstr "(Standard)"
 
-#: ../pidgin/gtkprefs.c:1620
+#: pidgin/gtkprefs.c:1620
 msgid "Sound Selection"
 msgstr "Sound-Auswahl"
 
-#: ../pidgin/gtkprefs.c:1630
+#: pidgin/gtkprefs.c:1630
+#, c-format
 msgid "Quietest"
 msgstr "Am leisesten"
 
-#: ../pidgin/gtkprefs.c:1632
+#: pidgin/gtkprefs.c:1632
+#, c-format
 msgid "Quieter"
 msgstr "Leiser"
 
-#: ../pidgin/gtkprefs.c:1634
+#: pidgin/gtkprefs.c:1634
+#, c-format
 msgid "Quiet"
 msgstr "Leise"
 
-#: ../pidgin/gtkprefs.c:1638
+#: pidgin/gtkprefs.c:1638
+#, c-format
 msgid "Loud"
 msgstr "Laut"
 
-#: ../pidgin/gtkprefs.c:1640
+#: pidgin/gtkprefs.c:1640
+#, c-format
 msgid "Louder"
 msgstr "Lauter"
 
-#: ../pidgin/gtkprefs.c:1642
+#: pidgin/gtkprefs.c:1642
+#, c-format
 msgid "Loudest"
 msgstr "Am lautesten"
 
-#: ../pidgin/gtkprefs.c:1705
+#: pidgin/gtkprefs.c:1705
 msgid "Sound Method"
 msgstr "Sound-Ausgabesystem"
 
-#: ../pidgin/gtkprefs.c:1706
+#: pidgin/gtkprefs.c:1706
 msgid "_Method:"
 msgstr "_Methode:"
 
-#: ../pidgin/gtkprefs.c:1708
+#: pidgin/gtkprefs.c:1708
 msgid "Console beep"
 msgstr "Konsolen-Lautsprecher"
 
-#: ../pidgin/gtkprefs.c:1710
+#: pidgin/gtkprefs.c:1710
 msgid "Automatic"
 msgstr "Automatisch"
 
-#: ../pidgin/gtkprefs.c:1714
+#: pidgin/gtkprefs.c:1714
 msgid "Command"
 msgstr "Kommando"
 
-#: ../pidgin/gtkprefs.c:1715
+#: pidgin/gtkprefs.c:1715
 msgid "No sounds"
 msgstr "Keine Kl辰nge"
 
-#: ../pidgin/gtkprefs.c:1723
+#: pidgin/gtkprefs.c:1723
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14622,369 +14262,372 @@
 "Sound-_Abspielbefehl:\n"
 "(%s f端r den Dateinamen)"
 
-#: ../pidgin/gtkprefs.c:1749
+#: pidgin/gtkprefs.c:1749
 msgid "Sound Options"
 msgstr "Sound-Einstellungen"
 
-#: ../pidgin/gtkprefs.c:1750
+#: pidgin/gtkprefs.c:1750
 msgid "Sounds when conversation has _focus"
 msgstr "Klang, wenn das Gespr辰ch den _Fokus hat"
 
-#: ../pidgin/gtkprefs.c:1752
+#: pidgin/gtkprefs.c:1752
 msgid "Enable sounds:"
 msgstr "Kl辰nge aktivieren:"
 
-#: ../pidgin/gtkprefs.c:1754
+#: pidgin/gtkprefs.c:1754
 msgid "Only when available"
 msgstr "Nur wenn anwesend"
 
-#: ../pidgin/gtkprefs.c:1755
+#: pidgin/gtkprefs.c:1755
 msgid "Only when not available"
 msgstr "Nur wenn nicht verf端gbar"
 
-#: ../pidgin/gtkprefs.c:1763
+#: pidgin/gtkprefs.c:1763
 msgid "Volume:"
 msgstr "Lautst辰rke:"
 
-#: ../pidgin/gtkprefs.c:1791
+#: pidgin/gtkprefs.c:1791
 msgid "Sound Events"
 msgstr "Sound-Ereignisse"
 
-#: ../pidgin/gtkprefs.c:1843
+#: pidgin/gtkprefs.c:1843
 msgid "Play"
 msgstr "Abspielen"
 
-#: ../pidgin/gtkprefs.c:1850
+#: pidgin/gtkprefs.c:1850
 msgid "Event"
 msgstr "Ereignis"
 
-#: ../pidgin/gtkprefs.c:1869
+#: pidgin/gtkprefs.c:1869
 msgid "Test"
 msgstr "Testen"
 
-#: ../pidgin/gtkprefs.c:1873
+#: pidgin/gtkprefs.c:1873
 msgid "Reset"
 msgstr "Zur端cksetzen"
 
-#: ../pidgin/gtkprefs.c:1877
+#: pidgin/gtkprefs.c:1877
 msgid "Choose..."
 msgstr "Ausw辰hlen..."
 
-#: ../pidgin/gtkprefs.c:1920
+#: pidgin/gtkprefs.c:1920
 msgid "_Report idle time:"
 msgstr "Inaktivit辰tszei_ten anzeigen:"
 
-#: ../pidgin/gtkprefs.c:1925
+#: pidgin/gtkprefs.c:1925
 msgid "Based on keyboard or mouse use"
 msgstr "Abh辰ngig von Tastatur- oder Mausbenutzung"
 
-#: ../pidgin/gtkprefs.c:1934
+#: pidgin/gtkprefs.c:1934
 msgid "_Auto-reply:"
 msgstr "A_utomatische Antwort:"
 
-#: ../pidgin/gtkprefs.c:1938
+#: pidgin/gtkprefs.c:1938
 msgid "When both away and idle"
 msgstr "Wenn abwesend und unt辰tig"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1944
+#: pidgin/gtkprefs.c:1944
 msgid "Auto-away"
 msgstr "Automatisch abwesend"
 
-#: ../pidgin/gtkprefs.c:1946
+#: pidgin/gtkprefs.c:1946
 msgid "Change status when _idle"
 msgstr "�ndere Status, wenn _inaktiv"
 
-#: ../pidgin/gtkprefs.c:1950
+#: pidgin/gtkprefs.c:1950
 msgid "_Minutes before changing status:"
 msgstr "_Minuten, bevor auf abwesend gesetzt wird:"
 
-#: ../pidgin/gtkprefs.c:1958
+#: pidgin/gtkprefs.c:1958
 msgid "Change _status to:"
 msgstr "�ndere _Status zu:"
 
 #
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1979
+#: pidgin/gtkprefs.c:1979
 msgid "Status at Startup"
 msgstr "Status beim Start"
 
-#: ../pidgin/gtkprefs.c:1981
+#: pidgin/gtkprefs.c:1981
 msgid "Use status from last _exit at startup"
 msgstr "Status beim Neu_start wiederherstellen"
 
-#: ../pidgin/gtkprefs.c:1987
+#: pidgin/gtkprefs.c:1987
 msgid "Status to a_pply at startup:"
 msgstr "Beim Starten folgenden Status _benutzen:"
 
-#: ../pidgin/gtkprefs.c:2025
+#: pidgin/gtkprefs.c:2025
 msgid "Interface"
 msgstr "Schnittstelle"
 
-#: ../pidgin/gtkprefs.c:2027
+#: pidgin/gtkprefs.c:2027
 msgid "Smiley Themes"
 msgstr "Smiley-Themen"
 
-#: ../pidgin/gtkprefs.c:2028
+#: pidgin/gtkprefs.c:2028
 msgid "Sounds"
 msgstr "Kl辰nge"
 
-#: ../pidgin/gtkprefs.c:2034
+#: pidgin/gtkprefs.c:2034
 msgid "Browser"
 msgstr "Browser"
 
-#: ../pidgin/gtkprefs.c:2038
+#: pidgin/gtkprefs.c:2038
 msgid "Status / Idle"
 msgstr "Status / Unt辰tig"
 
-#: ../pidgin/gtkprivacy.c:79
+#: pidgin/gtkprivacy.c:79
 msgid "Allow all users to contact me"
 msgstr "Allen Benutzern erlauben, mich zu kontaktieren"
 
-#: ../pidgin/gtkprivacy.c:80
+#: pidgin/gtkprivacy.c:80
 msgid "Allow only the users on my buddy list"
-msgstr "Nur den Benutzern in meiner Buddy-Liste erlauben mir Nachrichten zu senden"
-
-#: ../pidgin/gtkprivacy.c:81
+msgstr ""
+"Nur den Benutzern in meiner Buddy-Liste erlauben mir Nachrichten zu senden"
+
+#: pidgin/gtkprivacy.c:81
 msgid "Allow only the users below"
 msgstr "Erlaube nur den untenstehenden Benutzern mir Nachrichten zu senden"
 
-#: ../pidgin/gtkprivacy.c:82
+#: pidgin/gtkprivacy.c:82
 msgid "Block all users"
 msgstr "Blockiere alle Benutzer"
 
-#: ../pidgin/gtkprivacy.c:83
+#: pidgin/gtkprivacy.c:83
 msgid "Block only the users below"
 msgstr "Blockiere nur die untenstehenden Benutzer"
 
-#: ../pidgin/gtkprivacy.c:369
+#: pidgin/gtkprivacy.c:369
 msgid "Privacy"
 msgstr "Privatsph辰re"
 
-#: ../pidgin/gtkprivacy.c:381
+#: pidgin/gtkprivacy.c:381
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Einstellungen bzgl. der Privatsph辰re werden sofort wirksam."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:393
+#: pidgin/gtkprivacy.c:393
 msgid "Set privacy for:"
 msgstr "Setze Privatsph辰re f端r:"
 
-#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
+#: pidgin/gtkprivacy.c:556 pidgin/gtkprivacy.c:573
 msgid "Permit User"
 msgstr "Benutzer erlauben"
 
-#: ../pidgin/gtkprivacy.c:557
+#: pidgin/gtkprivacy.c:557
 msgid "Type a user you permit to contact you."
 msgstr ""
 "Geben Sie einen Benutzer ein, dem Sie erlauben, Ihnen Nachrichten zu "
 "schicken."
 
-#: ../pidgin/gtkprivacy.c:558
+#: pidgin/gtkprivacy.c:558
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "Bitte geben Sie den Namen des Benutzers ein, dem Sie erlauben m旦chten, Ihnen "
 "Nachrichten zu schicken."
 
-#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
+#: pidgin/gtkprivacy.c:561 pidgin/gtkprivacy.c:577
 msgid "_Permit"
 msgstr "_Zulassen"
 
-#: ../pidgin/gtkprivacy.c:567
+#: pidgin/gtkprivacy.c:567
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Erlaube %s, Ihnen Nachrichten zu schreiben?"
 
-#: ../pidgin/gtkprivacy.c:569
+#: pidgin/gtkprivacy.c:569
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sind Sie sicher, dass Sie %s erlauben wollen, Sie zu kontaktieren?"
 
-#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
+#: pidgin/gtkprivacy.c:598 pidgin/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Benutzer blockieren"
 
-#: ../pidgin/gtkprivacy.c:599
+#: pidgin/gtkprivacy.c:599
 msgid "Type a user to block."
 msgstr "Geben Sie einen Benutzer ein, den Sie blockieren wollen."
 
-#: ../pidgin/gtkprivacy.c:600
+#: pidgin/gtkprivacy.c:600
 msgid "Please enter the name of the user you wish to block."
-msgstr "Bitte geben Sie den Namen des Benutzers ein, den Sie blockieren wollen."
-
-#: ../pidgin/gtkprivacy.c:608
+msgstr ""
+"Bitte geben Sie den Namen des Benutzers ein, den Sie blockieren wollen."
+
+#: pidgin/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "%s sperren?"
 
-#: ../pidgin/gtkprivacy.c:610
+#: pidgin/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Sie Sie sicher, dass Sie %s blockieren wollen?"
 
-#: ../pidgin/gtkrequest.c:271
+#: pidgin/gtkrequest.c:271
 msgid "Apply"
 msgstr "Anwenden"
 
-#: ../pidgin/gtkrequest.c:1478
+#: pidgin/gtkrequest.c:1483
 msgid "That file already exists"
 msgstr "Diese Datei existiert bereits"
 
-#: ../pidgin/gtkrequest.c:1479
+#: pidgin/gtkrequest.c:1484
 msgid "Would you like to overwrite it?"
 msgstr "M旦chten Sie sie 端berschreiben?"
 
-#: ../pidgin/gtkrequest.c:1482
+#: pidgin/gtkrequest.c:1487
 msgid "Overwrite"
 msgstr "�berschreiben"
 
-#: ../pidgin/gtkrequest.c:1483
+#: pidgin/gtkrequest.c:1488
 msgid "Choose New Name"
 msgstr "Einen neuen Namen w辰hlen"
 
-#: ../pidgin/gtkrequest.c:1621 ../pidgin/gtkrequest.c:1635
+#: pidgin/gtkrequest.c:1626 pidgin/gtkrequest.c:1640
 msgid "Select Folder..."
 msgstr "Ordner ausw辰hlen..."
 
 #. Create the window.
-#: ../pidgin/gtkroomlist.c:374
+#: pidgin/gtkroomlist.c:374
 msgid "Room List"
 msgstr "Raumliste"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:442
+#: pidgin/gtkroomlist.c:442
 msgid "_Get List"
 msgstr "_Liste abrufen"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:450
+#: pidgin/gtkroomlist.c:450
 msgid "_Add Chat"
 msgstr "Chat _hinzuf端gen"
 
-#: ../pidgin/gtksavedstatuses.c:336
+#: pidgin/gtksavedstatuses.c:336
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "Sind Sie sicher, dass Sie die gew辰hlten Statusmeldungen l旦schen wollen?"
+msgstr ""
+"Sind Sie sicher, dass Sie die gew辰hlten Statusmeldungen l旦schen wollen?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
+#: pidgin/gtksavedstatuses.c:619 pidgin/gtksavedstatuses.c:1265
 msgid "_Use"
 msgstr "�ber_nehmen"
 
-#: ../pidgin/gtksavedstatuses.c:779
+#: pidgin/gtksavedstatuses.c:779
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Bezeichnung wird bereits benutzt. Bitte w辰hlen Sie eine andere."
 
-#: ../pidgin/gtksavedstatuses.c:969
+#: pidgin/gtksavedstatuses.c:969
 msgid "Different"
 msgstr "Anders"
 
-#: ../pidgin/gtksavedstatuses.c:1158
+#: pidgin/gtksavedstatuses.c:1158
 msgid "_Title:"
 msgstr "_Bezeichnung:"
 
-#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
+#: pidgin/gtksavedstatuses.c:1177 pidgin/gtksavedstatuses.c:1494
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1209
+#: pidgin/gtksavedstatuses.c:1209
 msgid "Use a _different status for some accounts"
 msgstr "Benutze einen _anderen Status f端r einige Konten"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1273
+#: pidgin/gtksavedstatuses.c:1273
 msgid "Sa_ve & Use"
 msgstr "S_peichern & �bernehmen"
 
 #
-#: ../pidgin/gtksavedstatuses.c:1477
+#: pidgin/gtksavedstatuses.c:1477
 #, c-format
 msgid "Status for %s"
 msgstr "Status f端r %s"
 
-#: ../pidgin/gtksound.c:63
+#: pidgin/gtksound.c:63
 msgid "Buddy logs in"
 msgstr "Buddy meldet sich an"
 
-#: ../pidgin/gtksound.c:64
+#: pidgin/gtksound.c:64
 msgid "Buddy logs out"
 msgstr "Buddy meldet sich ab"
 
-#: ../pidgin/gtksound.c:65
+#: pidgin/gtksound.c:65
 msgid "Message received"
 msgstr "Nachricht empfangen"
 
-#: ../pidgin/gtksound.c:66
+#: pidgin/gtksound.c:66
 msgid "Message received begins conversation"
 msgstr "Nachricht beginnt neue Unterhaltung"
 
-#: ../pidgin/gtksound.c:67
+#: pidgin/gtksound.c:67
 msgid "Message sent"
 msgstr "Nachricht gesendet"
 
-#: ../pidgin/gtksound.c:68
+#: pidgin/gtksound.c:68
 msgid "Person enters chat"
 msgstr "Person betritt den Chat"
 
-#: ../pidgin/gtksound.c:69
+#: pidgin/gtksound.c:69
 msgid "Person leaves chat"
 msgstr "Person verl辰sst den Chat"
 
-#: ../pidgin/gtksound.c:70
+#: pidgin/gtksound.c:70
 msgid "You talk in chat"
 msgstr "Sie sprechen im Chat"
 
-#: ../pidgin/gtksound.c:71
+#: pidgin/gtksound.c:71
 msgid "Others talk in chat"
 msgstr "Andere sprechen im Chat"
 
-#: ../pidgin/gtksound.c:74
+#: pidgin/gtksound.c:74
 msgid "Someone says your screen name in chat"
 msgstr "Jemand nennt Ihren Benutzernamen im Chat"
 
-#: ../pidgin/gtksound.c:310
+#: pidgin/gtksound.c:310
 msgid "GStreamer Failure"
 msgstr "GStreamer-Fehler"
 
-#: ../pidgin/gtksound.c:311
+#: pidgin/gtksound.c:311
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer konnte nicht initialisiert werden."
 
-#: ../pidgin/gtkstatusbox.c:663
+#: pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "Warte auf Netzwerkverbindung"
 
-#: ../pidgin/gtkutils.c:627
+#: pidgin/gtkutils.c:631
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1378 ../pidgin/gtkutils.c:1401
+#: pidgin/gtkutils.c:1388 pidgin/gtkutils.c:1411
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Beim Laden von %s ist folgender Fehler aufgetreten: %s"
 
-#: ../pidgin/gtkutils.c:1381 ../pidgin/gtkutils.c:1403
+#: pidgin/gtkutils.c:1391 pidgin/gtkutils.c:1413
 msgid "Failed to load image"
 msgstr "Laden des Bildes fehlgeschlagen"
 
-#: ../pidgin/gtkutils.c:1477
+#: pidgin/gtkutils.c:1487
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Kann Verzeichnis %s nicht senden."
 
-#: ../pidgin/gtkutils.c:1478
+#: pidgin/gtkutils.c:1488
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
-msgstr "%s kann keine Verzeichnisse 端bertragen. Bitte senden sie die Dateien einzeln."
-
-#: ../pidgin/gtkutils.c:1510 ../pidgin/gtkutils.c:1522
-#: ../pidgin/gtkutils.c:1529
+msgstr ""
+"%s kann keine Verzeichnisse 端bertragen. Bitte senden sie die Dateien einzeln."
+
+#: pidgin/gtkutils.c:1520 pidgin/gtkutils.c:1532 pidgin/gtkutils.c:1539
 msgid "You have dragged an image"
 msgstr "Sie haben ein Bild gew辰hlt"
 
-#: ../pidgin/gtkutils.c:1511
+#: pidgin/gtkutils.c:1521
 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."
@@ -14992,23 +14635,23 @@
 "Sie k旦nnen dieses Bild senden, es in diese Nachricht einf端gen oder es als "
 "Buddy-Icon f端r diesen Benutzer verwenden."
 
-#: ../pidgin/gtkutils.c:1517 ../pidgin/gtkutils.c:1537
+#: pidgin/gtkutils.c:1527 pidgin/gtkutils.c:1547
 msgid "Set as buddy icon"
 msgstr "Als Buddy-Icons verwenden"
 
-#: ../pidgin/gtkutils.c:1518 ../pidgin/gtkutils.c:1538
+#: pidgin/gtkutils.c:1528 pidgin/gtkutils.c:1548
 msgid "Send image file"
 msgstr "Bilddatei senden"
 
-#: ../pidgin/gtkutils.c:1519 ../pidgin/gtkutils.c:1538
+#: pidgin/gtkutils.c:1529 pidgin/gtkutils.c:1548
 msgid "Insert in message"
 msgstr "In Nachricht einf端gen"
 
-#: ../pidgin/gtkutils.c:1523
+#: pidgin/gtkutils.c:1533
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "M旦chten Sie es als Buddy-Icon f端r diesen Benutzer verwenden?"
 
-#: ../pidgin/gtkutils.c:1530
+#: pidgin/gtkutils.c:1540
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -15016,7 +14659,7 @@
 "Sie k旦nnen dieses Bild als Datei端bertragung senden oder es als Buddy-Icon "
 "f端r diesen Benutzer verwenden."
 
-#: ../pidgin/gtkutils.c:1531
+#: pidgin/gtkutils.c:1541
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -15029,11 +14672,11 @@
 #. * 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:1589
+#: pidgin/gtkutils.c:1599
 msgid "Cannot send launcher"
 msgstr "Kann Verkn端pfung nicht senden"
 
-#: ../pidgin/gtkutils.c:1589
+#: pidgin/gtkutils.c:1599
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -15041,7 +14684,7 @@
 "Sie haben eine Verkn端pfung gew辰hlt. Wahrscheinlich wollten sie das Ziel der "
 "Verkn端pfung senden und nicht die Verkn端pfung selbst."
 
-#: ../pidgin/gtkutils.c:2311
+#: pidgin/gtkutils.c:2334
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -15052,108 +14695,110 @@
 "<b>Dateigr旦�e:</b> %s\n"
 "<b>Bildgr旦�e:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2607
+#: pidgin/gtkutils.c:2630
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr "Die Datei '%s' ist zu gro� f端r %s.  Bitte versuchen Sie ein kleineres Bild.\n"
-
-#: ../pidgin/gtkutils.c:2609
+msgstr ""
+"Die Datei '%s' ist zu gro� f端r %s.  Bitte versuchen Sie ein kleineres Bild.\n"
+
+#: pidgin/gtkutils.c:2632
 msgid "Icon Error"
 msgstr "Icon-Fehler"
 
-#: ../pidgin/gtkutils.c:2610
+#: pidgin/gtkutils.c:2633
 msgid "Could not set icon"
 msgstr "Konnte das Icon nicht setzen"
 
-#: ../pidgin/gtkutils.c:2710
+#: pidgin/gtkutils.c:2733
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "�ffnen der Datei '%s' fehlgeschlagen: %s"
 
-#: ../pidgin/gtkutils.c:2759
-#, c-format
-msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
+#: pidgin/gtkutils.c:2782
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 "Bild '%s' konnte nicht geladen werden: Grund unbekannt, vermutlich eine "
 "korrupte Bilddatei"
 
-#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
+#: pidgin/gtkwhiteboard.c:754 pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Datei speichern"
 
-#: ../pidgin/gtkwhiteboard.c:861
+#: pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Farbe ausw辰hlen"
 
-#: ../pidgin/pidginstock.c:81
+#: pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "Alia_s"
 
-#: ../pidgin/pidginstock.c:83
+#: pidgin/pidginstock.c:83
 msgid "Close _tabs"
 msgstr "_Reiter schlie�en"
 
-#: ../pidgin/pidginstock.c:85
+#: pidgin/pidginstock.c:85
 msgid "_Get Info"
 msgstr "_Benutzer-Info"
 
-#: ../pidgin/pidginstock.c:86
+#: pidgin/pidginstock.c:86
 msgid "_Invite"
 msgstr "_Einladen"
 
-#: ../pidgin/pidginstock.c:87
+#: pidgin/pidginstock.c:87
 msgid "_Modify"
 msgstr "_Bearbeiten"
 
-#: ../pidgin/pidginstock.c:88
+#: pidgin/pidginstock.c:88
 msgid "_Open Mail"
 msgstr "Mail 旦_ffnen"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+#: pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Pidgin-Smileys"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+#: pidgin/pixmaps/emotes/none/none.theme.in.h:1
 msgid "Penguin Pimps"
 msgstr "Pinguin Pimps"
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+#: pidgin/pixmaps/emotes/none/none.theme.in.h:2
 msgid "Selecting this disables graphical emoticons."
 msgstr "Wenn Sie dies ausw辰hlen, werden grafische Emoticons deaktiviert."
 
-#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+#: pidgin/pixmaps/emotes/none/none.theme.in.h:3
 msgid "none"
 msgstr "keine"
 
-#: ../pidgin/plugins/cap/cap.c:449
+#: pidgin/plugins/cap/cap.c:450
 msgid "Display Statistics"
 msgstr "Statistik anzeigen"
 
-#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+#: pidgin/plugins/cap/cap.c:462 pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr "Antwortwahrscheinlichkeit:"
 
-#: ../pidgin/plugins/cap/cap.c:810
+#: pidgin/plugins/cap/cap.c:811
 msgid "Statistics Configuration"
 msgstr "Statistik-Konfiguration"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:813
+#: pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
 msgstr "Maximale Antwort-Zeit端berschreitung:"
 
-#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
+#: pidgin/plugins/cap/cap.c:817 pidgin/plugins/cap/cap.c:824
+#: pidgin/plugins/cap/cap.c:831 pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "Minuten"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:820
+#: pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
 msgstr "Maximale \"zuletzt-gesehen\"-Differenz:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:827
+#: pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
 msgstr "Schwellwert:"
 
@@ -15163,18 +14808,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:935
+#: pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
 msgstr "Kontakt-Verf端gbarkeits-Vorhersage"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:937
+#: pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
 msgstr "Kontakt-Verf端gbarkeits-Vorhersage-Plugin."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:938
+#: pidgin/plugins/cap/cap.c:939
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -15182,32 +14827,32 @@
 "Das Kontakt-Verf端gbarkeits-Plugin (cap) wird benutzt um statistische "
 "Informationen 端ber Buddys anzuzeigen."
 
-#: ../pidgin/plugins/contact_priority.c:61
+#: pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
 msgstr "Buddy ist unt辰tig"
 
-#: ../pidgin/plugins/contact_priority.c:62
+#: pidgin/plugins/contact_priority.c:62
 msgid "Buddy is away"
 msgstr "Buddy ist abwesend"
 
-#: ../pidgin/plugins/contact_priority.c:63
+#: pidgin/plugins/contact_priority.c:63
 msgid "Buddy is \"extended\" away"
 msgstr "Buddy ist ��erweitert�� abwesend"
 
 #. Not used yet.
-#: ../pidgin/plugins/contact_priority.c:66
+#: pidgin/plugins/contact_priority.c:66
 msgid "Buddy is mobile"
 msgstr "Buddy ist mobil"
 
-#: ../pidgin/plugins/contact_priority.c:68
+#: pidgin/plugins/contact_priority.c:68
 msgid "Buddy is offline"
 msgstr "Buddy ist offline"
 
-#: ../pidgin/plugins/contact_priority.c:90
+#: pidgin/plugins/contact_priority.c:90
 msgid "Point values to use when..."
 msgstr "Punktzahlen, die benutzt werden, wenn..."
 
-#: ../pidgin/plugins/contact_priority.c:118
+#: 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"
@@ -15215,11 +14860,11 @@
 "Der Buddy mit der <i>h旦chsten Punktzahl</i> bekommt die h旦chste Priorit辰t im "
 "Kontakt.\n"
 
-#: ../pidgin/plugins/contact_priority.c:125
+#: pidgin/plugins/contact_priority.c:125
 msgid "Use last buddy when scores are equal"
 msgstr "Benutze den letzten Buddy, wenn die Punktzahlen gleich sind"
 
-#: ../pidgin/plugins/contact_priority.c:130
+#: pidgin/plugins/contact_priority.c:130
 msgid "Point values to use for account..."
 msgstr "Punktzahlen f端r dieses Konto..."
 
@@ -15229,21 +14874,22 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:187
+#: pidgin/plugins/contact_priority.c:187
 msgid "Contact Priority"
 msgstr "Kontaktpriorit辰t"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:190
-msgid "Allows for controlling the values associated with different buddy states."
+#: pidgin/plugins/contact_priority.c:190
+msgid ""
+"Allows for controlling the values associated with different buddy states."
 msgstr ""
 "Erlaubt die Anpassung der Werte, die mit den verschiedenen Buddy-Zust辰nden "
 "verbunden sind."
 
 #. *< description
-#: ../pidgin/plugins/contact_priority.c:192
+#: pidgin/plugins/contact_priority.c:192
 msgid ""
 "Allows for changing the point values of idle/away/offline states for buddies "
 "in contact priority computations."
@@ -15252,73 +14898,73 @@
 "abwesend, offline), die f端r die Berechnung der Kontakt-Priorit辰t verwendet "
 "werden."
 
-#: ../pidgin/plugins/convcolors.c:23
+#: pidgin/plugins/convcolors.c:23
 msgid "Conversation Colors"
 msgstr "Gespr辰chsfarben"
 
-#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
+#: pidgin/plugins/convcolors.c:25 pidgin/plugins/convcolors.c:26
 msgid "Customize colors in the conversation window"
 msgstr "Farben im Gespr辰chsfenster anpassen"
 
-#: ../pidgin/plugins/convcolors.c:82
+#: pidgin/plugins/convcolors.c:82
 msgid "Error Messages"
 msgstr "Fehlernachrichten"
 
-#: ../pidgin/plugins/convcolors.c:83
+#: pidgin/plugins/convcolors.c:83
 msgid "Highlighted Messages"
 msgstr "Hervorgehobene Nachrichten"
 
-#: ../pidgin/plugins/convcolors.c:84
+#: pidgin/plugins/convcolors.c:84
 msgid "System Messages"
 msgstr "Systemnachrichten"
 
-#: ../pidgin/plugins/convcolors.c:85
+#: pidgin/plugins/convcolors.c:85
 msgid "Sent Messages"
 msgstr "Gesendete Nachrichten"
 
-#: ../pidgin/plugins/convcolors.c:86
+#: pidgin/plugins/convcolors.c:86
 msgid "Received Messages"
 msgstr "Empfangene Nachrichten"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#: pidgin/plugins/convcolors.c:210 pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "Textfarbe f端r %s ausw辰hlen"
 
-#: ../pidgin/plugins/convcolors.c:287
+#: pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Fett"
 
-#: ../pidgin/plugins/convcolors.c:294
+#: pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../pidgin/plugins/convcolors.c:301
+#: pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Unterstrichen"
 
-#: ../pidgin/plugins/convcolors.c:310
+#: pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "Eingehendes Format ignorieren"
 
-#: ../pidgin/plugins/convcolors.c:311
+#: pidgin/plugins/convcolors.c:311
 msgid "Apply in Chats"
 msgstr "In Chats anwenden"
 
-#: ../pidgin/plugins/convcolors.c:312
+#: pidgin/plugins/convcolors.c:312
 msgid "Apply in IMs"
 msgstr "In IMs anwenden"
 
-#: ../pidgin/plugins/extplacement.c:80
+#: pidgin/plugins/extplacement.c:80
 msgid "By conversation count"
 msgstr "Nach der Zahl der Gespr辰che"
 
-#: ../pidgin/plugins/extplacement.c:101
+#: pidgin/plugins/extplacement.c:101
 msgid "Conversation Placement"
 msgstr "Platzierung der Gespr辰che"
 
 #. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
-#: ../pidgin/plugins/extplacement.c:105
+#: pidgin/plugins/extplacement.c:105
 msgid ""
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
@@ -15326,11 +14972,11 @@
 "Bemerkung: Die Einstellung f端r \"Neue Unterhaltungen\" muss auf \"Nach der "
 "Zahl der Gespr辰che\" gesetzt werden."
 
-#: ../pidgin/plugins/extplacement.c:111
+#: pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
 msgstr "Zahl der Gespr辰che pro Fenster"
 
-#: ../pidgin/plugins/extplacement.c:117
+#: pidgin/plugins/extplacement.c:117
 msgid "Separate IM and Chat windows when placing by number"
 msgstr "Getrennte IM- und Chat-Fenster bei der Platzierung nach Nummern"
 
@@ -15340,19 +14986,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/extplacement.c:146
+#: pidgin/plugins/extplacement.c:146
 msgid "ExtPlacement"
 msgstr "Erweiterte Platzierung"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/extplacement.c:148
+#: pidgin/plugins/extplacement.c:148
 msgid "Extra conversation placement options."
 msgstr "Zus辰tzliche Optionen zur Platzierung von Gespr辰chen."
 
 #. *< summary
 #. *  description
-#: ../pidgin/plugins/extplacement.c:150
+#: pidgin/plugins/extplacement.c:150
 msgid ""
 "Restrict the number of conversations per windows, optionally separating IMs "
 "and Chats"
@@ -15361,20 +15007,20 @@
 "Chats"
 
 #. Configuration frame
-#: ../pidgin/plugins/gestures/gestures.c:235
+#: pidgin/plugins/gestures/gestures.c:235
 msgid "Mouse Gestures Configuration"
 msgstr "Maus-Gestik-Konfiguration"
 
-#: ../pidgin/plugins/gestures/gestures.c:242
+#: pidgin/plugins/gestures/gestures.c:242
 msgid "Middle mouse button"
 msgstr "Mittlere Maustaste"
 
-#: ../pidgin/plugins/gestures/gestures.c:247
+#: pidgin/plugins/gestures/gestures.c:247
 msgid "Right mouse button"
 msgstr "Rechte Maustaste"
 
 #. "Visual gesture display" checkbox
-#: ../pidgin/plugins/gestures/gestures.c:259
+#: pidgin/plugins/gestures/gestures.c:259
 msgid "_Visual gesture display"
 msgstr "_Gestiken anzeigen"
 
@@ -15384,19 +15030,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gestures/gestures.c:295
+#: pidgin/plugins/gestures/gestures.c:295
 msgid "Mouse Gestures"
 msgstr "Maus-Gestiken"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/gestures/gestures.c:298
+#: pidgin/plugins/gestures/gestures.c:298
 msgid "Provides support for mouse gestures"
 msgstr "Erm旦glicht die Bedienung mit Maus-Gestiken"
 
 #. *  description
-#: ../pidgin/plugins/gestures/gestures.c:300
+#: pidgin/plugins/gestures/gestures.c:300
 msgid ""
 "Allows support for mouse gestures in conversation windows.\n"
 "Drag the middle mouse button to perform certain actions:\n"
@@ -15412,36 +15058,36 @@
 "und dann nach links, um auf ein voriges Gespr辰ch zu wechseln. Hochziehen und "
 "dann nach rechts, um zum n辰chsten Gespr辰che zu wechseln."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
+#: pidgin/plugins/gevolution/add_buddy_dialog.c:143
 msgid "Instant Messaging"
 msgstr "Sofortnachrichten"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
+#: pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "W辰hlen Sie eine Person aus Ihrem Adressbuch unten aus oder f端gen Sie eine "
 "neue Person hinzu."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
+#: pidgin/plugins/gevolution/add_buddy_dialog.c:551
+#: pidgin/plugins/gevolution/new_person_dialog.c:303
 msgid "Group:"
 msgstr "Gruppe:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
+#: pidgin/plugins/gevolution/add_buddy_dialog.c:577
+#: pidgin/plugins/gevolution/assoc-buddy.c:467
+#: pidgin/plugins/gevolution/new_person_dialog.c:249
 msgid "New Person"
 msgstr "Neue Person"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
+#: pidgin/plugins/gevolution/add_buddy_dialog.c:594
 msgid "Select Buddy"
 msgstr "Buddy ausw辰hlen"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
+#: pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -15450,43 +15096,43 @@
 "werden soll oder erstellen Sie einen neuen Kontakt."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
+#: pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "Benutzer_details"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
+#: pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Assoziiere den Buddy"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:238
-#: ../pidgin/plugins/gevolution/gevolution.c:244
+#: pidgin/plugins/gevolution/gevolution.c:240
+#: pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send e-mail"
 msgstr "E-Mail konnte nicht gesendet werden"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
+#: pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "Die ausf端hrbare Evolution-Datei wurde nicht im Pfad (PATH) gefunden."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
 msgstr "F端r diesen Buddy wurde keine E-Mail-Adresse gefunden."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:271
+#: pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Zum Adressbuch hinzuf端gen"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:283
+#: pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send E-Mail"
 msgstr "E-Mail senden"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:410
+#: pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "Konfiguration der Evolution-Integration"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:413
+#: pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "W辰hlen Sie alle Konten, zu denen Buddys automatisch hinzugef端gt werden "
@@ -15498,7 +15144,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:525
+#: pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Evolution-Integration"
 
@@ -15506,38 +15152,39 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:528
-#: ../pidgin/plugins/gevolution/gevolution.c:530
+#: pidgin/plugins/gevolution/gevolution.c:530
+#: pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "Erlaubt die Integration mit Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
+#: pidgin/plugins/gevolution/new_person_dialog.c:263
 msgid "Please enter the person's information below."
 msgstr "Bitte geben Sie die Informationen zu der Person unten ein."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+#: pidgin/plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the buddy's screen name and account type below."
-msgstr "Geben Sie bitte den Benutzernamen des Buddys und den Kontentyp unten ein."
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
+msgstr ""
+"Geben Sie bitte den Benutzernamen des Buddys und den Kontentyp unten ein."
+
+#: pidgin/plugins/gevolution/new_person_dialog.c:287
 msgid "Account type:"
 msgstr "Kontotyp:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
+#: pidgin/plugins/gevolution/new_person_dialog.c:311
 msgid "Optional information:"
 msgstr "Optionale Informationen:"
 
 # old strings
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
+#: pidgin/plugins/gevolution/new_person_dialog.c:346
 msgid "First name:"
 msgstr "Vorname:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
+#: pidgin/plugins/gevolution/new_person_dialog.c:358
 msgid "Last name:"
 msgstr "Nachname:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
+#: pidgin/plugins/gevolution/new_person_dialog.c:378
 msgid "E-mail:"
 msgstr "E-Mail:"
 
@@ -15547,7 +15194,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
+#: pidgin/plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
 msgstr "GTK-Signaltest"
 
@@ -15555,12 +15202,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gtk-signals-test.c:163
-#: ../pidgin/plugins/gtk-signals-test.c:165
+#: 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 "Test, um zu sehen, ob alle Signale richtig funktionieren."
 
-#: ../pidgin/plugins/gtkbuddynote.c:34
+#: pidgin/plugins/gtkbuddynote.c:34
 #, c-format
 msgid ""
 "\n"
@@ -15569,7 +15215,7 @@
 "\n"
 "<b>Buddy-Notizen</b>: %s"
 
-#: ../pidgin/plugins/history.c:188
+#: pidgin/plugins/history.c:188
 msgid "History"
 msgstr "Verlauf"
 
@@ -15579,7 +15225,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/iconaway.c:82
+#: pidgin/plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "Minimieren, wenn Abwesend"
 
@@ -15587,45 +15233,46 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
+#: pidgin/plugins/iconaway.c:85 pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
 msgstr "Minimiert die Buddy-Liste und die Gespr辰chsfenster, wenn Sie weggehen."
 
-#: ../pidgin/plugins/mailchk.c:160
+#: pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
 msgstr "Mail-Benachrichtigung"
 
-#: ../pidgin/plugins/mailchk.c:162
+#: pidgin/plugins/mailchk.c:162
 msgid "Checks for new local mail."
 msgstr "�berpr端ft, ob es neue lokale Mails gibt."
 
-#: ../pidgin/plugins/mailchk.c:163
+#: pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
 msgstr ""
 "F端gt eine kleine Box zur Buddy-Liste hinzu, die zeigt, ob Sie neue E-Mails "
 "haben."
 
-#: ../pidgin/plugins/markerline.c:23
+#: pidgin/plugins/markerline.c:23
 msgid "Markerline"
 msgstr "Markierunglinie"
 
-#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+#: pidgin/plugins/markerline.c:25 pidgin/plugins/markerline.c:26
 msgid "Draw a line to indicate new messages in a conversation."
-msgstr "Eine Linie zeichnen um neue Nachrichten in einer Unterhaltung anzuzeigen."
-
-#: ../pidgin/plugins/markerline.c:246
+msgstr ""
+"Eine Linie zeichnen um neue Nachrichten in einer Unterhaltung anzuzeigen."
+
+#: pidgin/plugins/markerline.c:246
 msgid "Draw Markerline in "
 msgstr "Zeichne eine Markierunglinie in "
 
-#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+#: pidgin/plugins/markerline.c:250 pidgin/plugins/notify.c:676
 msgid "_IM windows"
 msgstr "_IM-Fenstern"
 
-#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+#: pidgin/plugins/markerline.c:254 pidgin/plugins/notify.c:683
 msgid "C_hat windows"
 msgstr "C_hat-Fenstern"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
+#: pidgin/plugins/musicmessaging/musicmessaging.c:44
 msgid ""
 "A music messaging session has been requested. Please click the MM icon to "
 "accept."
@@ -15633,36 +15280,36 @@
 "Eine Musik-Nachrichten-Sitzung wurde angefragt. Bitte klicken Sie das MM-"
 "Icon zum Akzeptieren."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
+#: pidgin/plugins/musicmessaging/musicmessaging.c:45
 msgid "Music messaging session confirmed."
 msgstr "Musik-Nachrichten-Sitzung best辰tigt."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+#: pidgin/plugins/musicmessaging/musicmessaging.c:419
 msgid "Music Messaging"
 msgstr "Musik-Nachrichten"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+#: pidgin/plugins/musicmessaging/musicmessaging.c:420
 msgid "There was a conflict in running the command:"
 msgstr "Es gab einen Konflikt beim Ausf端hren des Kommandos:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+#: pidgin/plugins/musicmessaging/musicmessaging.c:528
 msgid "Error Running Editor"
 msgstr "Fehler beim Ausf端hren des Editors"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+#: pidgin/plugins/musicmessaging/musicmessaging.c:529
 msgid "The following error has occurred:"
 msgstr "Der folgende Fehler ist aufgetreten:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+#: pidgin/plugins/musicmessaging/musicmessaging.c:628
 msgid "Music Messaging Configuration"
 msgstr "Musik-Nachrichten-Konfiguration"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+#: pidgin/plugins/musicmessaging/musicmessaging.c:632
 msgid "Score Editor Path"
 msgstr "Pfad zum Partitur-Editor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+#: pidgin/plugins/musicmessaging/musicmessaging.c:633
 msgid "_Apply"
 msgstr "_Anwenden"
 
@@ -15674,12 +15321,12 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+#: pidgin/plugins/musicmessaging/musicmessaging.c:674
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Musik-Nachrichten-Plugin zum gemeinschaftlichen Komponieren."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+#: pidgin/plugins/musicmessaging/musicmessaging.c:676
 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."
@@ -15688,74 +15335,74 @@
 "Benutzern, simultan an einem Musikst端ck in Echtzeit zu arbeiten."
 
 #. ---------- "Notify For" ----------
-#: ../pidgin/plugins/notify.c:672
+#: pidgin/plugins/notify.c:672
 msgid "Notify For"
 msgstr "Benachrichtigung f端r"
 
-#: ../pidgin/plugins/notify.c:691
+#: pidgin/plugins/notify.c:691
 msgid "\t_Only when someone says your screen name"
 msgstr "\t_Nur wenn jemand Ihren Benutzernamen nennt"
 
-#: ../pidgin/plugins/notify.c:701
+#: pidgin/plugins/notify.c:701
 msgid "_Focused windows"
 msgstr "_Fokussierte Fenster"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:709
+#: pidgin/plugins/notify.c:709
 msgid "Notification Methods"
 msgstr "Benachrichtigungsmethoden"
 
-#: ../pidgin/plugins/notify.c:716
+#: pidgin/plugins/notify.c:716
 msgid "Prepend _string into window title:"
 msgstr "Stelle die _Zeichenkette vor den Fenstertitel:"
 
 #. Count method button
-#: ../pidgin/plugins/notify.c:735
+#: pidgin/plugins/notify.c:735
 msgid "Insert c_ount of new messages into window title"
 msgstr "F端ge _Anzahl der neuen Nachrichten in den Fenstertitel ein"
 
 #. Count xprop method button
-#: ../pidgin/plugins/notify.c:744
+#: pidgin/plugins/notify.c:744
 msgid "Insert count of new message into _X property"
 msgstr "F端ge _Anzahl der neuen Nachrichten in den Fenstertitel ein"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:752
+#: pidgin/plugins/notify.c:752
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Setze den ��_URGENT��-Hinweis f端r den Window-Manager"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:761
+#: pidgin/plugins/notify.c:761
 msgid "R_aise conversation window"
 msgstr "G_espr辰chsfenster in den Vordergrund bringen"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:769
+#: pidgin/plugins/notify.c:769
 msgid "Notification Removal"
 msgstr "Entfernung von Benachrichtigungen"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:774
+#: pidgin/plugins/notify.c:774
 msgid "Remove when conversation window _gains focus"
 msgstr "Entferne, wenn das _Gespr辰chsfenster den Fokus bekommt"
 
 #. Remove on click button
-#: ../pidgin/plugins/notify.c:781
+#: pidgin/plugins/notify.c:781
 msgid "Remove when conversation window _receives click"
 msgstr "Entferne, wenn das Gespr辰chsfenster ge_klickt wird"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:789
+#: pidgin/plugins/notify.c:789
 msgid "Remove when _typing in conversation window"
 msgstr "Entferne, wenn im Gespr辰chsfenster ge_tippt wird"
 
 #. Remove on message send button
-#: ../pidgin/plugins/notify.c:797
+#: pidgin/plugins/notify.c:797
 msgid "Remove when a _message gets sent"
 msgstr "Entferne, wenn eine _Nachricht gesendet wird"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:806
+#: pidgin/plugins/notify.c:806
 msgid "Remove on switch to conversation ta_b"
 msgstr "Entfernen bei der Umschaltung zum Gespr辰chs_reiter"
 
@@ -15765,7 +15412,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:901
+#: pidgin/plugins/notify.c:901
 msgid "Message Notification"
 msgstr "Benachrichtigung"
 
@@ -15773,7 +15420,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+#: pidgin/plugins/notify.c:904 pidgin/plugins/notify.c:906
 msgid "Provides a variety of ways of notifying you of unread messages."
 msgstr ""
 "Gibt Ihnen eine Reihe von M旦glichkeiten, 端ber ungelesene Nachrichten "
@@ -15785,21 +15432,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/pidgininc.c:91
+#: pidgin/plugins/pidgininc.c:91
 msgid "Pidgin Demonstration Plugin"
 msgstr "Pidgin Demonstrations-Plugin"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/pidgininc.c:94
+#: pidgin/plugins/pidgininc.c:94
 msgid "An example plugin that does stuff - see the description."
 msgstr ""
 "Ein Beispiel-Plugin, welches einige Sachen macht - sehen Sie sich die "
 "Beschreibung an."
 
 #. *  description
-#: ../pidgin/plugins/pidgininc.c:96
+#: pidgin/plugins/pidgininc.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"
@@ -15812,60 +15459,61 @@
 "- Es sendet eine Nachricht zu Leuten in Ihrer Buddy Liste, direkt wenn Sie "
 "sich angemeldet haben"
 
-#: ../pidgin/plugins/pidginrc.c:41
+#: pidgin/plugins/pidginrc.c:41
 msgid "Cursor Color"
 msgstr "Cursor-Farbe"
 
-#: ../pidgin/plugins/pidginrc.c:42
+#: pidgin/plugins/pidginrc.c:42
 msgid "Secondary Cursor Color"
 msgstr "Sekund辰re Cursor-Farbe"
 
-#: ../pidgin/plugins/pidginrc.c:43
+#: pidgin/plugins/pidginrc.c:43
 msgid "Hyperlink Color"
 msgstr "Hyperlink-Farbe"
 
-#: ../pidgin/plugins/pidginrc.c:54
+#: pidgin/plugins/pidginrc.c:54
 msgid "GtkTreeView Horizontal Separation"
 msgstr "GtkTreeview horizontaler Abstand"
 
-#: ../pidgin/plugins/pidginrc.c:73
+#: pidgin/plugins/pidginrc.c:73
 msgid "Conversation Entry"
 msgstr "Unterhaltungseintrag"
 
-#: ../pidgin/plugins/pidginrc.c:74
+#: pidgin/plugins/pidginrc.c:74
 msgid "Conversation History"
 msgstr "Unterhaltungsverlauf"
 
-#: ../pidgin/plugins/pidginrc.c:75
+#: pidgin/plugins/pidginrc.c:75
 msgid "Log Viewer"
 msgstr "Mitschnittsbetrachter"
 
-#: ../pidgin/plugins/pidginrc.c:76
+#: pidgin/plugins/pidginrc.c:76
 msgid "Request Dialog"
 msgstr "Dialog anfordern"
 
-#: ../pidgin/plugins/pidginrc.c:77
+#: pidgin/plugins/pidginrc.c:77
 msgid "Notify Dialog"
 msgstr "Benachrichtigungsdialog"
 
-#: ../pidgin/plugins/pidginrc.c:253
+#: pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "Farbe ausw辰hlen"
 
-#: ../pidgin/plugins/pidginrc.c:300
+#: pidgin/plugins/pidginrc.c:300
+#, c-format
 msgid "Select Interface Font"
 msgstr "Schriftart w辰hlen"
 
-#: ../pidgin/plugins/pidginrc.c:303
+#: pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "Schriftart f端r %s w辰hlen"
 
-#: ../pidgin/plugins/pidginrc.c:371
+#: pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "GTK+ Schrift"
 
-#: ../pidgin/plugins/pidginrc.c:391
+#: pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Text Shortcut-Thema"
 
@@ -15889,48 +15537,48 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:428
+#: pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "UI-Farben"
 
-#: ../pidgin/plugins/pidginrc.c:452
+#: pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "Widget-Gr旦�en"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "Schrift"
 
-#: ../pidgin/plugins/pidginrc.c:497
+#: pidgin/plugins/pidginrc.c:497
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc-Datei-Werkzeuge"
 
-#: ../pidgin/plugins/pidginrc.c:502
+#: pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Schreibe Einstellungen nach %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:511
+#: pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "Neueinlesen der gtkrc-Dateien"
 
-#: ../pidgin/plugins/pidginrc.c:544
+#: pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ Themenkontrolle"
 
-#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+#: pidgin/plugins/pidginrc.c:546 pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Erlaubt den Zugriff auf h辰ufig benutzte gtkrc-Einstellungen."
 
-#: ../pidgin/plugins/raw.c:175
+#: pidgin/plugins/raw.c:175
 msgid "Raw"
 msgstr "Raw"
 
-#: ../pidgin/plugins/raw.c:177
+#: pidgin/plugins/raw.c:177
 msgid "Lets you send raw input to text-based protocols."
 msgstr "Erlaubt Ihnen Rohdaten an textbasierte Protokolle zu senden."
 
-#: ../pidgin/plugins/raw.c:178
+#: pidgin/plugins/raw.c:178
 msgid ""
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
@@ -15939,7 +15587,7 @@
 "senden. Dr端cken Sie die 'Enter'-Taste im Eingabefeld zum Senden. Beachten "
 "Sie das Debug-Fenster."
 
-#: ../pidgin/plugins/relnot.c:71
+#: pidgin/plugins/relnot.c:71
 #, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
@@ -15948,12 +15596,12 @@
 "Sie verwenden %s Version %s.  Die aktuelle Version ist %s.Download unter <a "
 "href=\"%s\">%s</a><hr>"
 
-#: ../pidgin/plugins/relnot.c:79
+#: pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>�nderungen:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
+#: pidgin/plugins/relnot.c:84 pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "Neue Version verf端gbar"
 
@@ -15963,19 +15611,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:143
+#: pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Release-Benachrichtigung"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:146
+#: pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Pr端ft regelm辰�ig, ob neue Versionen verf端gbar sind."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:148
+#: pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -15983,70 +15631,72 @@
 "Pr端ft regelm辰�ig, ob neue Versionen verf端gbar sind und zeigt die �nderungen "
 "an."
 
-#: ../pidgin/plugins/spellchk.c:1962
+#: pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
 msgstr "Duplikat-Korrektur"
 
-#: ../pidgin/plugins/spellchk.c:1963
+#: pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "Das angegebene Wort ist bereits in der Korrekturliste enthalten."
 
-#: ../pidgin/plugins/spellchk.c:2177
+#: pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "Text-Ersetzung"
 
-#: ../pidgin/plugins/spellchk.c:2200
+#: pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "Sie tippen"
 
-#: ../pidgin/plugins/spellchk.c:2214
+#: pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "Sie senden"
 
-#: ../pidgin/plugins/spellchk.c:2228
+#: pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "Nur ganze W旦rter"
 
-#: ../pidgin/plugins/spellchk.c:2240
+#: pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "Gro�-/Kleinschreibung beachten"
 
-#: ../pidgin/plugins/spellchk.c:2266
+#: pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "F端gen Sie eine neue Textersetzung hinzu"
 
-#: ../pidgin/plugins/spellchk.c:2282
+#: pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "Sie _tippen:"
 
-#: ../pidgin/plugins/spellchk.c:2299
+#: pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "Sie _senden:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2311
+#: pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "_Genaue Gro�-/Kleinschreibung (deaktivieren f端r automatische Behandlung)"
-
-#: ../pidgin/plugins/spellchk.c:2313
+msgstr ""
+"_Genaue Gro�-/Kleinschreibung (deaktivieren f端r automatische Behandlung)"
+
+#: pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "Ersetze nur ganze _W旦rter"
 
-#: ../pidgin/plugins/spellchk.c:2338
+#: pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "Allgemeine Textersetzungsoptionen"
 
-#: ../pidgin/plugins/spellchk.c:2339
+#: pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "Ersetzung des letztes Worts beim Senden"
 
-#: ../pidgin/plugins/spellchk.c:2370
+#: pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "Textersetzung"
 
-#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
+#: pidgin/plugins/spellchk.c:2372 pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Ersetzt Text in ausgehenden Nachrichten durch benutzerdefinierte Regeln."
+msgstr ""
+"Ersetzt Text in ausgehenden Nachrichten durch benutzerdefinierte Regeln."
 
 #. *< type
 #. *< ui_requirement
@@ -16054,7 +15704,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
+#: pidgin/plugins/ticker/ticker.c:74 pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr "Buddy-Ticker"
 
@@ -16062,11 +15712,11 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
+#: pidgin/plugins/ticker/ticker.c:357 pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "Zeigt die Buddy-Liste als ticker辰hnliche Laufschrift."
 
-#: ../pidgin/plugins/timestamp.c:137
+#: pidgin/plugins/timestamp.c:137
 msgid "Display Timestamps Every"
 msgstr "Zeige Zeitstemple alle"
 
@@ -16076,49 +15726,48 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp.c:202
+#: pidgin/plugins/timestamp.c:202
 msgid "Timestamp"
 msgstr "Zeitstempel"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp.c:205
+#: pidgin/plugins/timestamp.c:205
 msgid "Display iChat-style timestamps"
 msgstr "Zeige iChat-辰hnliche Zeitstempel"
 
 #. *  description
-#: ../pidgin/plugins/timestamp.c:207
+#: pidgin/plugins/timestamp.c:207
 msgid "Display iChat-style timestamps every N minutes."
 msgstr "Zeige alle N Minuten iChat-辰hnliche Zeitstempel an."
 
-#: ../pidgin/plugins/timestamp_format.c:23
+#: pidgin/plugins/timestamp_format.c:23
 msgid "Timestamp Format Options"
 msgstr "Zeitstempelformat-Optionen"
 
-#: ../pidgin/plugins/timestamp_format.c:26
+#: pidgin/plugins/timestamp_format.c:26
+#, c-format
 msgid "_Force 24-hour time format"
 msgstr "_Erzwinge 24-Stunden Zeitformat"
 
-#: ../pidgin/plugins/timestamp_format.c:33
+#: pidgin/plugins/timestamp_format.c:33
 msgid "Show dates in..."
 msgstr "Zeige Datumsangaben in..."
 
-#: ../pidgin/plugins/timestamp_format.c:38
+#: pidgin/plugins/timestamp_format.c:38
 msgid "Co_nversations:"
 msgstr "U_nterhaltungen:"
 
-#: ../pidgin/plugins/timestamp_format.c:40
-#: ../pidgin/plugins/timestamp_format.c:49
+#: pidgin/plugins/timestamp_format.c:40 pidgin/plugins/timestamp_format.c:49
 msgid "For delayed messages"
 msgstr "F端r verz旦gerte Nachrichten"
 
-#: ../pidgin/plugins/timestamp_format.c:41
-#: ../pidgin/plugins/timestamp_format.c:50
+#: pidgin/plugins/timestamp_format.c:41 pidgin/plugins/timestamp_format.c:50
 msgid "For delayed messages and in chats"
 msgstr "F端r verz旦gerte Nachrichten in Chats"
 
-#: ../pidgin/plugins/timestamp_format.c:47
+#: pidgin/plugins/timestamp_format.c:47
 msgid "_Message Logs:"
 msgstr "Nachrichten-_Mitschnitt:"
 
@@ -16128,19 +15777,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/timestamp_format.c:151
+#: pidgin/plugins/timestamp_format.c:151
 msgid "Message Timestamp Formats"
 msgstr "Nachrichten-Zeitstempel-Formate"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/timestamp_format.c:154
+#: pidgin/plugins/timestamp_format.c:154
 msgid "Customizes the message timestamp formats."
 msgstr "Nachrichten-Zeitstempel-Formate anpassen."
 
 #. *  description
-#: ../pidgin/plugins/timestamp_format.c:156
+#: pidgin/plugins/timestamp_format.c:156
 msgid ""
 "This plugin allows the user to customize conversation and logging message "
 "timestamp formats."
@@ -16148,44 +15797,44 @@
 "Dieses Plugin erlaubt es dem Benutzer die Zeitstempel in Unterhaltungen und "
 "im Mitschnitt anzupassen."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:589
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636
+#: pidgin/plugins/win32/transparency/win2ktrans.c:174
+#: pidgin/plugins/win32/transparency/win2ktrans.c:589
+#: pidgin/plugins/win32/transparency/win2ktrans.c:636
 msgid "Opacity:"
 msgstr "Durchl辰ssigkeit:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
+#: pidgin/plugins/win32/transparency/win2ktrans.c:553
 msgid "IM Conversation Windows"
 msgstr "IM Gespr辰chsfenster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554
+#: pidgin/plugins/win32/transparency/win2ktrans.c:554
 msgid "_IM window transparency"
 msgstr "_IM Fenstertransparenz"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568
+#: pidgin/plugins/win32/transparency/win2ktrans.c:568
 msgid "_Show slider bar in IM window"
 msgstr "Zeige _Schiebebalken im IM-Fenster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575
+#: pidgin/plugins/win32/transparency/win2ktrans.c:575
 msgid "Remove IM window transparency on focus"
 msgstr "Transparenz des Unterhaltungsfensters beim Aktivieren aufheben"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:578
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626
+#: pidgin/plugins/win32/transparency/win2ktrans.c:578
+#: pidgin/plugins/win32/transparency/win2ktrans.c:626
 msgid "Always on top"
 msgstr "Immer im Vordergrund"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
+#: pidgin/plugins/win32/transparency/win2ktrans.c:610
 msgid "Buddy List Window"
 msgstr "Buddy-Listen-Fenster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611
+#: pidgin/plugins/win32/transparency/win2ktrans.c:611
 msgid "_Buddy List window transparency"
 msgstr "Transparenz des _Buddy-Listen-Fensters"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624
+#: pidgin/plugins/win32/transparency/win2ktrans.c:624
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Transparenz des Buddy-Listen-Fensters beim Aktivieren aufheben"
 
@@ -16195,19 +15844,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684
+#: pidgin/plugins/win32/transparency/win2ktrans.c:684
 msgid "Transparency"
 msgstr "Transparenz"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687
+#: pidgin/plugins/win32/transparency/win2ktrans.c:687
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variable Transparenz f端r die Buddy-Liste und die Gespr辰che."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:689
+#: pidgin/plugins/win32/transparency/win2ktrans.c:689
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -16219,51 +15868,53 @@
 "\n"
 "* Hinweis: Dieses Plugin verlangt Win2000 oder h旦her."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+#: pidgin/plugins/win32/winprefs/winprefs.c:307
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime Version"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+#: pidgin/plugins/win32/winprefs/winprefs.c:315
 msgid "Startup"
 msgstr "Start"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#: pidgin/plugins/win32/winprefs/winprefs.c:316
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Starte %s beim Windows-Start"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+#: pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Dockable Buddy List"
 msgstr "An_dockbare Buddy-Liste"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+#: pidgin/plugins/win32/winprefs/winprefs.c:335
 msgid "_Keep Buddy List window on top:"
 msgstr "_Buddy-Listen-Fenster bleibt im Vordergrund:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+#: pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Only when docked"
 msgstr "Nur wenn angedockt"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+#: pidgin/plugins/win32/winprefs/winprefs.c:345
 msgid "_Flash window when chat messages are received"
 msgstr "_Fenster blinkt, wenn Nachrichten empfangen werden"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+#: pidgin/plugins/win32/winprefs/winprefs.c:375
 msgid "Windows Pidgin Options"
 msgstr "Windows-Pidgin-Optionen"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+#: pidgin/plugins/win32/winprefs/winprefs.c:377
 msgid "Options specific to Pidgin for Windows."
 msgstr "Optionen f端r Pidgin unter Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
-msgid "Provides options specific to Pidgin for Windows , such as buddy list docking."
-msgstr "Bietet spezielle Optionen f端r Windows-Pidgin, wie Buddy-Listen-Docking."
-
-#: ../pidgin/plugins/xmppconsole.c:667
+#: pidgin/plugins/win32/winprefs/winprefs.c:378
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr ""
+"Bietet spezielle Optionen f端r Windows-Pidgin, wie Buddy-Listen-Docking."
+
+#: pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Abgemeldet.</font>"
 
@@ -16273,40 +15924,46 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
-#: ../pidgin/plugins/xmppconsole.c:860
+#: pidgin/plugins/xmppconsole.c:746 pidgin/plugins/xmppconsole.c:841
+#: pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "XMPP-Konsole"
 
-#: ../pidgin/plugins/xmppconsole.c:753
+#: pidgin/plugins/xmppconsole.c:753
 msgid "Account: "
 msgstr "Konto: "
 
-#: ../pidgin/plugins/xmppconsole.c:780
+#: pidgin/plugins/xmppconsole.c:780
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Nicht mit XMPP verbunden</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:790
+#: pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
 msgstr "Einen <iq/> Block einf端gen."
 
-#: ../pidgin/plugins/xmppconsole.c:799
+#: pidgin/plugins/xmppconsole.c:799
 msgid "Insert a <presence/> stanza."
 msgstr "Einen <presence/> Block einf端gen."
 
-#: ../pidgin/plugins/xmppconsole.c:808
+#: pidgin/plugins/xmppconsole.c:808
 msgid "Insert a <message/> stanza."
 msgstr "Einen <message/> Block einf端gen."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:863
+#: pidgin/plugins/xmppconsole.c:863
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Sendet und empf辰ngt RAW-XMPP-Bl旦cke."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:865
+#: pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
-msgstr "Dieses Plugin ist n端tzlich zur Fehlersuche in XMPP-Servern oder -Clients."
-
+msgstr ""
+"Dieses Plugin ist n端tzlich zur Fehlersuche in XMPP-Servern oder -Clients."
+
+#~ msgid "You have been signed off for an unknown reason."
+#~ msgstr "Sie haben sich aus einem unbekannten Grund abgemeldet."
+
+#~ msgid "Show buddy _icons"
+#~ msgstr "Buddy-_Icons anzeigen"
--- a/po/ro.po	Thu Aug 02 04:12:57 2007 +0000
+++ b/po/ro.po	Thu Aug 02 04:16:37 2007 +0000
@@ -6,23 +6,31 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: pidgin-2.0.2\n"
+"Project-Id-Version: pidgin-2.1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-04 00:01-0400\n"
-"PO-Revision-Date: 2007-06-06 01:35+0300\n"
+"POT-Creation-Date: 2007-07-25 03:22-0400\n"
+"PO-Revision-Date: 2007-07-26 12:53+0300\n"
 "Last-Translator: Mi�u Moldovan <dumol@gnome.ro>\n"
 "Language-Team: Romanian <gnomero-list@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=3;plural=(n==1?0:(n==0||((n%100)>0&&(n%100)<20))?1:2)\n"
-
-#: ../finch/finch.c:180
+"Plural-Forms: nplurals=3;plural=(n==1?0:(n==0||((n%100)>0&&(n%100)<20))?"
+"1:2)\n"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:70 ../finch/finch.c:298 ../finch/finch.c:327
+#: ../finch/finch.c:404
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:204
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. �ncerca釘i ��%s -h�� pentru mai multe informa釘ii.\n"
 
-#: ../finch/finch.c:182
+#: ../finch/finch.c:206
 #, c-format
 msgid ""
 "%s\n"
@@ -43,480 +51,506 @@
 "  -n, --nologin       f�r� autentificare automat�\n"
 "  -v, --version       arat� versiunea curent� �i ie�i\n"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../finch/finch.c:274 ../finch/finch.c:303
-msgid "Finch"
-msgstr "Finch"
-
-#: ../finch/finch.c:301 ../pidgin/gtkmain.c:688
+#: ../finch/finch.c:325 ../pidgin/gtkmain.c:708
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
 "investigate and complete the migration by hand. Please report this error at "
 "http://developer.pidgin.im"
 msgstr ""
-"%s a 樽nt但mpinat erori la migrarea preferin釘elor de la %s la %s. V� rug�m "
-"s� investiga釘i problema �i s� termina釘i manual migrarea. Raporta釘i aceast� "
+"%s a 樽nt但mpinat erori la migrarea preferin釘elor de la %s la %s. V� rug�m s� "
+"investiga釘i problema �i s� termina釘i manual migrarea. Raporta釘i aceast� "
 "eroare la http://developer.pidgin.im"
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:290 ../finch/gntblist.c:415
-#: ../finch/gntblist.c:428 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
-#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308
+#: ../libpurple/protocols/jabber/buddy.c:1464
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1229
-#: ../libpurple/protocols/qq/group_join.c:326
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/qq/group_join.c:328
+#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "Eroare"
 
-#: ../finch/gntaccount.c:119
+#: ../finch/gntaccount.c:123
 msgid "Account was not added"
 msgstr "Contul nu a fost ad�ugat"
 
-#: ../finch/gntaccount.c:120
+#: ../finch/gntaccount.c:124
 msgid "Screenname of an account must be non-empty."
 msgstr "Numele de identificare al unui cont nu poate fi gol."
 
-#: ../finch/gntaccount.c:423
+#: ../finch/gntaccount.c:431
 msgid "New mail notifications"
 msgstr "Notificare la mail nou"
 
-#: ../finch/gntaccount.c:433
+#: ../finch/gntaccount.c:441
 msgid "Remember password"
 msgstr "Salvare parol�"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1477
-#: ../pidgin/gtkblist.c:3978
+#: ../finch/gntaccount.c:479
+msgid "There's no protocol plugins installed."
+msgstr "Nu exist� nici un modul de protocol instalat"
+
+#: ../finch/gntaccount.c:480
+msgid "(You probably forgot to 'make install'.)"
+msgstr "(Probabil a釘i uitat s� face釘i ��make install��.)"
+
+#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4014
 msgid "Modify Account"
 msgstr "Modificare cont"
 
-#: ../finch/gntaccount.c:474
+#: ../finch/gntaccount.c:490
 msgid "New Account"
 msgstr "Cont nou"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "Protocol:"
 
-#: ../finch/gntaccount.c:508
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+#: ../finch/gntaccount.c:523
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "Nume de identificare:"
 
-#: ../finch/gntaccount.c:521
+#: ../finch/gntaccount.c:536
 msgid "Password:"
 msgstr "Parol�:"
 
-#: ../finch/gntaccount.c:531
+#: ../finch/gntaccount.c:546
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:853 ../finch/gntblist.c:334 ../finch/gntblist.c:403
-#: ../finch/gntblist.c:438 ../finch/gntblist.c:770 ../finch/gntblist.c:967
-#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2160 ../finch/gntplugin.c:360
-#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
-#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632
+#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2209 ../finch/gntplugin.c:378
+#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264
+#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:481 ../finch/gntstatus.c:606
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1173
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
 #: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
 #: ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1788
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:588
+#: ../libpurple/protocols/jabber/buddy.c:1826
+#: ../libpurple/protocols/jabber/buddy.c:1862
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:878
+#: ../libpurple/protocols/jabber/jabber.c:882
 #: ../libpurple/protocols/jabber/jabber.c:1384
-#: ../libpurple/protocols/jabber/si.c:865
+#: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
 #: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
 #: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
 #: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6006
+#: ../libpurple/protocols/oscar/oscar.c:6073
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:409
 #: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:363
-#: ../libpurple/protocols/qq/group_opt.c:143
-#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/group_join.c:140
+#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_opt.c:144
+#: ../libpurple/protocols/qq/group_opt.c:399
 #: ../libpurple/protocols/qq/sys_msg.c:115
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:269
-#: ../libpurple/protocols/sametime/sametime.c:3388
-#: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5487
-#: ../libpurple/protocols/sametime/sametime.c:5612
-#: ../libpurple/protocols/silc/buddy.c:468
-#: ../libpurple/protocols/silc/buddy.c:1084
-#: ../libpurple/protocols/silc/buddy.c:1189
-#: ../libpurple/protocols/silc/chat.c:600
-#: ../libpurple/protocols/silc/chat.c:730
-#: ../libpurple/protocols/silc/ops.c:1913
-#: ../libpurple/protocols/silc/silc.c:740
-#: ../libpurple/protocols/silc/silc.c:946
+#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/sametime/sametime.c:3475
+#: ../libpurple/protocols/sametime/sametime.c:3646
+#: ../libpurple/protocols/sametime/sametime.c:5398
+#: ../libpurple/protocols/sametime/sametime.c:5488
+#: ../libpurple/protocols/sametime/sametime.c:5613
+#: ../libpurple/protocols/silc/buddy.c:455
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/ops.c:1816
+#: ../libpurple/protocols/silc/silc.c:823
+#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1084
+#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1904
+#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc10/silc.c:942
 #: ../libpurple/protocols/yahoo/yahoo.c:989
 #: ../libpurple/protocols/yahoo/yahoo.c:3248
-#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1915
-#: ../pidgin/gtkaccount.c:2513 ../pidgin/gtkblist.c:5858
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:862
-#: ../pidgin/gtkdialogs.c:954 ../pidgin/gtkdialogs.c:974
-#: ../pidgin/gtkdialogs.c:998 ../pidgin/gtkdialogs.c:1020
-#: ../pidgin/gtkdialogs.c:1068 ../pidgin/gtkdialogs.c:1109
-#: ../pidgin/gtkdialogs.c:1165 ../pidgin/gtkdialogs.c:1204
-#: ../pidgin/gtkdialogs.c:1231 ../pidgin/gtkimhtmltoolbar.c:423
-#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
-#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1912
+#: ../pidgin/gtkaccount.c:2506 ../pidgin/gtkblist.c:5915
+#: ../pidgin/gtkdialogs.c:727 ../pidgin/gtkdialogs.c:865
+#: ../pidgin/gtkdialogs.c:957 ../pidgin/gtkdialogs.c:977
+#: ../pidgin/gtkdialogs.c:1001 ../pidgin/gtkdialogs.c:1023
+#: ../pidgin/gtkdialogs.c:1071 ../pidgin/gtkdialogs.c:1112
+#: ../pidgin/gtkdialogs.c:1168 ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1234 ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
+#: ../pidgin/gtkstatusbox.c:1582
 msgid "Cancel"
 msgstr "Renun釘�"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
+#: ../finch/gntprefs.c:264 ../finch/gntstatus.c:484 ../finch/gntstatus.c:594
 #: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:748
+#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "Salveaz�"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1907
-#: ../pidgin/gtksavedstatuses.c:328
+#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1904
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1576
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "Sigur dori釘i s� �terge釘i %s?"
 
-#: ../finch/gntaccount.c:614
+#: ../finch/gntaccount.c:629
 msgid "Delete Account"
 msgstr "�tergere cont"
 
 #. Delete button
-#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
-#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1914 ../pidgin/gtklog.c:301
-#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:336
+#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701
+#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143
+#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1911 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1581
 msgid "Delete"
 msgstr "�terge"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2339 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2115 ../finch/gntui.c:77
+#: ../pidgin/gtkaccount.c:2329 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "Conturi"
 
-#: ../finch/gntaccount.c:652
+#: ../finch/gntaccount.c:669
 msgid "You can enable/disable accounts from the following list."
 msgstr "Pute釘i activa �i �terge conturi din lista urm�toare."
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:852 ../finch/gntblist.c:333
-#: ../finch/gntblist.c:403 ../finch/gntblist.c:438 ../finch/gntnotify.c:369
-#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../finch/gntaccount.c:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntnotify.c:379
+#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:599 ../pidgin/gtkaccount.c:2512
-#: ../pidgin/gtkblist.c:5857 ../pidgin/gtkconv.c:1655
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2505
+#: ../pidgin/gtkblist.c:5914 ../pidgin/gtkconv.c:1650
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "Ad�ugare"
 
 #. Modify button
-#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
+#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710
 msgid "Modify"
 msgstr "Modificare"
 
-#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2459
+#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2452
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s l-a f�cut pe %s contactul s�u%s%s"
 
-#: ../finch/gntaccount.c:848 ../pidgin/gtkaccount.c:2511
+#: ../finch/gntaccount.c:873 ../pidgin/gtkaccount.c:2504
 msgid "Add buddy to your list?"
 msgstr "Dori釘i ad�ugarea utilizatorului 樽n lista de contacte?"
 
-#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2563
+#: ../finch/gntaccount.c:927 ../pidgin/gtkaccount.c:2556
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr ""
 "%s%s%s%s dore�te s� adauge utilizatorul %s 樽n lista sa de contacte%s%s."
 
-#: ../finch/gntaccount.c:922 ../finch/gntaccount.c:929
-#: ../pidgin/gtkaccount.c:2586 ../pidgin/gtkaccount.c:2592
+#: ../finch/gntaccount.c:952 ../finch/gntaccount.c:955
+#: ../finch/gntaccount.c:982 ../pidgin/gtkaccount.c:2579
+#: ../pidgin/gtkaccount.c:2585
 msgid "Authorize buddy?"
 msgstr "Autoriza釘i contactul?"
 
-#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933
-#: ../pidgin/gtkaccount.c:2587 ../pidgin/gtkaccount.c:2593
+#: ../finch/gntaccount.c:959 ../finch/gntaccount.c:986
+#: ../pidgin/gtkaccount.c:2580 ../pidgin/gtkaccount.c:2586
 msgid "Authorize"
 msgstr "Autorizeaz�"
 
-#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934
-#: ../pidgin/gtkaccount.c:2588 ../pidgin/gtkaccount.c:2594
+#: ../finch/gntaccount.c:960 ../finch/gntaccount.c:987
+#: ../pidgin/gtkaccount.c:2581 ../pidgin/gtkaccount.c:2587
 msgid "Deny"
 msgstr "Refuz�"
 
-#: ../finch/gntblist.c:279
+#: ../finch/gntblist.c:288
 msgid "You must provide a screename for the buddy."
 msgstr "Introduce釘i un nume de identificare pentru acest contact."
 
-#: ../finch/gntblist.c:281
+#: ../finch/gntblist.c:290
 msgid "You must provide a group."
 msgstr "Trebuie s� furniza釘i un grup."
 
-#: ../finch/gntblist.c:283
+#: ../finch/gntblist.c:292
 msgid "You must select an account."
 msgstr "Trebuie s� selecta釘i un cont."
 
-#: ../finch/gntblist.c:285
+#: ../finch/gntblist.c:294
 msgid "The selected account is not online."
 msgstr "Contul selectat nu este conectat."
 
-#: ../finch/gntblist.c:290
+#: ../finch/gntblist.c:299
 msgid "Error adding buddy"
 msgstr "Eroare la ad�ugarea contactului"
 
-#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2845
-#: ../pidgin/gtkaccount.c:1990 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2860
+#: ../pidgin/gtkaccount.c:1985 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "Nume de identificare"
 
-#: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
 #: ../libpurple/protocols/msn/msn.c:1364
-#: ../libpurple/protocols/silc/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:973
-#: ../pidgin/gtkdialogs.c:997 ../pidgin/gtkdialogs.c:1019
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:976
+#: ../pidgin/gtkdialogs.c:1000 ../pidgin/gtkdialogs.c:1022
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:321 ../finch/gntblist.c:398
+#: ../finch/gntblist.c:330 ../finch/gntblist.c:412
 msgid "Group"
 msgstr "Grup"
 
-#: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261
-#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1301
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2967 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:444
+#: ../pidgin/gtkblist.c:2974 ../pidgin/gtknotify.c:482
+#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Cont"
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:819
-#: ../libpurple/protocols/silc/buddy.c:737
-#: ../libpurple/protocols/silc/buddy.c:1033
-#: ../libpurple/protocols/silc/buddy.c:1080
-#: ../libpurple/protocols/silc/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5363
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+#: ../finch/gntblist.c:340 ../finch/gntblist.c:851
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5420
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Adaug� contact"
 
-#: ../finch/gntblist.c:331
+#: ../finch/gntblist.c:340
 msgid "Please enter buddy information."
 msgstr "Introduce釘i informa釘ii despre contact."
 
-#: ../finch/gntblist.c:358 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "Chat-uri"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:809
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:813
 #: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
 #: ../libpurple/protocols/msn/msn.c:1645
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
-#: ../pidgin/gtkroomlist.c:621
+#: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Nume"
 
-#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5743
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:818
+msgid "Auto-join"
+msgstr "Intr� automat"
+
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5800
 msgid "Add Chat"
 msgstr "Adaug� un chat"
 
-#: ../finch/gntblist.c:402
+#: ../finch/gntblist.c:419
 msgid "You can edit more information from the context menu later."
 msgstr "Pute釘i modifica mai multe date din acest meniu contextual mai t但rziu."
 
-#: ../finch/gntblist.c:415 ../finch/gntblist.c:428
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445
 msgid "Error adding group"
 msgstr "Eroare la ad�ugarea grupului"
 
-#: ../finch/gntblist.c:416
+#: ../finch/gntblist.c:433
 msgid "You must give a name for the group to add."
 msgstr "Trebuie s� da釘i un nume grupului de ad�ugat."
 
-#: ../finch/gntblist.c:429
+#: ../finch/gntblist.c:446
 msgid "A group with the name already exists."
 msgstr "Exist� deja un grup cu acest nume."
 
-#: ../finch/gntblist.c:436 ../finch/gntblist.c:823
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5854
+#: ../finch/gntblist.c:453 ../finch/gntblist.c:855
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5485 ../pidgin/gtkblist.c:5911
 msgid "Add Group"
 msgstr "Adaug� grup"
 
-#: ../finch/gntblist.c:436
+#: ../finch/gntblist.c:453
 msgid "Enter the name of the group"
 msgstr "Introduce釘i numele grupului"
 
-#: ../finch/gntblist.c:769
+#: ../finch/gntblist.c:801
 msgid "Edit Chat"
 msgstr "Editare chat"
 
-#: ../finch/gntblist.c:769
+#: ../finch/gntblist.c:801
 msgid "Please Update the necessary fields."
 msgstr "Trebuie s� actualiza釘i c但mpurile obligatorii."
 
-#: ../finch/gntblist.c:770 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
 msgid "Edit"
 msgstr "Editare"
 
-#: ../finch/gntblist.c:786
-msgid "Auto-join"
-msgstr "Intr� automat"
-
-#: ../finch/gntblist.c:795
+#: ../finch/gntblist.c:827
 msgid "Edit Settings"
 msgstr "Editare set�ri"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:681
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "Detalii"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:278
-#: ../pidgin/gtkconv.c:681
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr "Desc�rcare..."
 
-#: ../finch/gntblist.c:866 ../finch/gntconv.c:418
-#: ../libpurple/protocols/silc/chat.c:883
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:407
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Detalii"
 
-#: ../finch/gntblist.c:870
+#: ../finch/gntblist.c:907
 msgid "Add Buddy Pounce"
 msgstr "Ad�ugare 樽nt但mpinare"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:877 ../finch/gntconv.c:430
-#: ../libpurple/protocols/jabber/si.c:865
-#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1603
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:419
+#: ../libpurple/protocols/jabber/si.c:868
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585
+#: ../pidgin/gtkconv.c:1598
 msgid "Send File"
 msgstr "Trimitere fi�ier"
 
-#: ../finch/gntblist.c:881
+#: ../finch/gntblist.c:918
 msgid "View Log"
 msgstr "Arat� 樽nregistr�rile"
 
-#: ../finch/gntblist.c:962
+#: ../finch/gntblist.c:999
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Introduce釘i noul nume pentru %s"
 
-#: ../finch/gntblist.c:964 ../finch/gntblist.c:1211
+#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249
 msgid "Rename"
 msgstr "Redenumire"
 
-#: ../finch/gntblist.c:964
+#: ../finch/gntblist.c:1001
 msgid "Set Alias"
 msgstr "Setare alias"
 
-#: ../finch/gntblist.c:965
+#: ../finch/gntblist.c:1002
 msgid "Enter empty string to reset the name."
 msgstr "L�sa釘i c但mpul necompletat pentru a reseta numele."
 
-#: ../finch/gntblist.c:1041
+#: ../finch/gntblist.c:1078
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr "Eliminarea acestui contact va elimina �i identit�釘ile subordonate"
 
-#: ../finch/gntblist.c:1049
+#: ../finch/gntblist.c:1086
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr "Eliminarea acestui grup va elimina �i contactele din grup"
 
-#: ../finch/gntblist.c:1054
+#: ../finch/gntblist.c:1091
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "Sigur dori釘i s� �terge釘i %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1057
+#: ../finch/gntblist.c:1094
 msgid "Confirm Remove"
 msgstr "Confirmare eliminare"
 
-#: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223
-#: ../pidgin/gtkconv.c:1652 ../pidgin/gtkrequest.c:275
-#: ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:224
+#: ../pidgin/gtkconv.c:1647 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "�tergere"
 
 #. Buddy List
-#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4222
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2294 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:78 ../pidgin/gtkblist.c:4256
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
-msgstr "List� contacte"
-
-#: ../finch/gntblist.c:1218
+msgstr "List� de contacte"
+
+#: ../finch/gntblist.c:1256
 msgid "Place tagged"
 msgstr "Plasare etichetat�"
 
-#: ../finch/gntblist.c:1223
+#: ../finch/gntblist.c:1261
 msgid "Toggle Tag"
 msgstr "Schimb� eticheta"
 
 #. General
-#: ../finch/gntblist.c:1256 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/gg/gg.c:2204
+#: ../finch/gntblist.c:1296 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
+#: ../libpurple/protocols/gg/gg.c:2202
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:1589
-#: ../libpurple/protocols/jabber/buddy.c:1771
-#: ../libpurple/protocols/jabber/jabber.c:819
+#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:1627
+#: ../libpurple/protocols/jabber/buddy.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:823
 #: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1535
-#: ../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:2991
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:2998
 msgid "Nickname"
 msgstr "Pseudonim"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1276 ../finch/gntprefs.c:243
-#: ../libpurple/protocols/bonjour/bonjour.c:322
-#: ../libpurple/protocols/jabber/buddy.c:643
-#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../finch/gntblist.c:1316 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:314
+#: ../libpurple/protocols/jabber/buddy.c:647
+#: ../libpurple/protocols/jabber/buddy.c:687
 #: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2869
+#: ../libpurple/protocols/oscar/oscar.c:2884
 #: ../libpurple/protocols/yahoo/yahoo.c:2915
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3011
-#: ../pidgin/gtkblist.c:3404 ../pidgin/gtkprefs.c:1848
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3026
+#: ../pidgin/gtkblist.c:3435 ../pidgin/gtkprefs.c:1918
 msgid "Idle"
 msgstr "Inactiv(�)"
 
-#: ../finch/gntblist.c:1365
+#: ../finch/gntblist.c:1330
+msgid "On Mobile"
+msgstr "Mobil"
+
+#: ../finch/gntblist.c:1411
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -525,12 +559,12 @@
 "Conecta釘i: %d\n"
 "Total: %d"
 
-#: ../finch/gntblist.c:1374
+#: ../finch/gntblist.c:1420
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Cont: %s (%s)"
 
-#: ../finch/gntblist.c:1386
+#: ../finch/gntblist.c:1432
 #, c-format
 msgid ""
 "\n"
@@ -539,102 +573,114 @@
 "\n"
 "Ultima oar�: acum %s"
 
-#: ../finch/gntblist.c:1651 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1064
+#: ../finch/gntblist.c:1698 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1070
 msgid "New..."
 msgstr "Nou..."
 
-#: ../finch/gntblist.c:1658 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1065
+#: ../finch/gntblist.c:1705 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "Saved..."
 msgstr "Salvat..."
 
-#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../finch/gntblist.c:2083 ../finch/gntplugin.c:254 ../finch/gntui.c:82
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "Module"
 
-#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:843 ../pidgin/gtkdialogs.c:924
+#: ../finch/gntblist.c:2190 ../pidgin/gtkdialogs.c:708
+#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
 msgid "_Name"
 msgstr "_Nume"
 
-#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:848 ../pidgin/gtkdialogs.c:929
+#: ../finch/gntblist.c:2195 ../pidgin/gtkdialogs.c:713
+#: ../pidgin/gtkdialogs.c:851 ../pidgin/gtkdialogs.c:932
 msgid "_Account"
 msgstr "_Cont"
 
-#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:721
 msgid "New Instant Message"
 msgstr "Mesaj nou"
 
-#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2205 ../pidgin/gtkdialogs.c:723
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "Introduce釘i numele de identificare sau aliasul persoanei pe care dori釘i s� o "
 "contacta釘i."
 
-#: ../finch/gntblist.c:2159 ../finch/gntnotify.c:77 ../libpurple/account.c:983
+#: ../finch/gntblist.c:2208 ../finch/gntnotify.c:79 ../libpurple/account.c:983
 #: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
 #: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
 #: ../libpurple/protocols/jabber/jabber.c:1383
 #: ../libpurple/protocols/jabber/xdata.c:336
 #: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
 #: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6005
-#: ../libpurple/protocols/silc/buddy.c:467
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc/chat.c:464
-#: ../libpurple/protocols/silc/chat.c:729
-#: ../libpurple/protocols/silc/ops.c:1297
-#: ../libpurple/protocols/silc/ops.c:1912
-#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/oscar/oscar.c:6072
+#: ../libpurple/protocols/silc/buddy.c:454
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
+#: ../libpurple/protocols/silc/chat.c:745
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1815
+#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1903
+#: ../libpurple/protocols/silc10/silc.c:735
 #: ../libpurple/protocols/yahoo/yahoo.c:988
 #: ../libpurple/protocols/yahoo/yahoo.c:3247
-#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:3977
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:861
-#: ../pidgin/gtkdialogs.c:953 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:4013
+#: ../pidgin/gtkdialogs.c:726 ../pidgin/gtkdialogs.c:864
+#: ../pidgin/gtkdialogs.c:956 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2228 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
 msgid "Options"
 msgstr "Op釘iuni"
 
-#: ../finch/gntblist.c:2185
+#: ../finch/gntblist.c:2234
 msgid "Send IM..."
 msgstr "Trimitere mesaj..."
 
-#: ../finch/gntblist.c:2189
+#: ../finch/gntblist.c:2238
+msgid "Show empty groups"
+msgstr "Arat� grupurile f�r� contacte"
+
+#: ../finch/gntblist.c:2244
 msgid "Show offline buddies"
 msgstr "Arat� contactele deconectate"
 
-#: ../finch/gntblist.c:2195
+#: ../finch/gntblist.c:2250
 msgid "Sort by status"
 msgstr "Sorteaz� dup� status"
 
-#: ../finch/gntblist.c:2199
+#: ../finch/gntblist.c:2254
 msgid "Sort alphabetically"
 msgstr "Sorteaz� alfabetic"
 
-#: ../finch/gntblist.c:2203
+#: ../finch/gntblist.c:2258
 msgid "Sort by log size"
 msgstr "Sorteaz� dup� m�rimea 樽nregistr�rilor"
 
-#: ../finch/gntconn.c:109
+#: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:112
+#: ../finch/gntconn.c:113
 #, c-format
 msgid "%s disconnected."
 msgstr "%s s-a deconectat."
 
-#: ../finch/gntconn.c:113
+#: ../finch/gntconn.c:114
 #, c-format
 msgid ""
 "%s\n"
@@ -644,50 +690,46 @@
 msgstr ""
 "%s\n"
 "\n"
-"Nu se va mai re樽ncerca conectarea cu acest cont. Trebuie s� corecta釘i eroarea "
-"�i s� reactiva釘i contul."
-
-#: ../finch/gntconv.c:116
+"Nu se va mai re樽ncerca conectarea cu acest cont. Trebuie s� corecta釘i "
+"eroarea �i s� reactiva釘i contul."
+
+#: ../finch/gntconv.c:117
 msgid "No such command."
 msgstr "Nu exist� o asemenea comand�."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:491
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Eroare de sintax�: A釘i introdus un num�r gre�it de argumente pentru aceast� "
 "comand�."
 
-#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:517
+#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:497
 msgid "Your command failed for an unknown reason."
 msgstr "Comanda dat� a e�uat din motive necunoscute."
 
-#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:523
+#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:504
 msgid "That command only works in chats, not IMs."
 msgstr "Aceast� comand� func釘ioneaz� doar 樽n chat-uri, nu �i 樽n discu釘ii."
 
-#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:526
+#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:507
 msgid "That command only works in IMs, not chats."
 msgstr "Aceast� comand� func釘ioneaz� doar 樽n discu釘ii, nu �i 樽n chat-uri."
 
-#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:530
+#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:512
 msgid "That command doesn't work on this protocol."
 msgstr "Aceast� comand� nu func釘ioneaz� 樽n acest protocol."
 
-#: ../finch/gntconv.c:144
-msgid "Commands are not supported yet. Message was NOT sent."
-msgstr "Comenzile nu au fost 樽nc� implementate. Mesajul NU a fost trimis."
-
-#: ../finch/gntconv.c:230
+#: ../finch/gntconv.c:224
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:253
+#: ../finch/gntconv.c:247
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
+#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
 #, c-format
 msgid ""
 "\n"
@@ -696,48 +738,48 @@
 "\n"
 "%s v� scrie..."
 
-#: ../finch/gntconv.c:277
+#: ../finch/gntconv.c:271
 msgid "You have left this chat."
 msgstr "A釘i ie�it din acest chat."
 
-#: ../finch/gntconv.c:353
+#: ../finch/gntconv.c:342
 msgid "Send To"
 msgstr "Trimite c�tre"
 
-#: ../finch/gntconv.c:397
+#: ../finch/gntconv.c:386
 msgid "Conversation"
 msgstr "Discu釘ie"
 
-#: ../finch/gntconv.c:403
+#: ../finch/gntconv.c:392
 msgid "Clear Scrollback"
 msgstr "Gole�te fereastra"
 
-#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "Arat� marcaje de timp"
 
-#: ../finch/gntconv.c:423
+#: ../finch/gntconv.c:412
 msgid "Add Buddy Pounce..."
 msgstr "Ad�ugare 樽nt但mpinare..."
 
-#: ../finch/gntconv.c:586
+#: ../finch/gntconv.c:614
 msgid "<AUTO-REPLY> "
 msgstr "<R�spuns-Automat> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:702
+#: ../finch/gntconv.c:735
 msgid "List of users:\n"
 msgstr "Lista utilizatorilor:\n"
 
-#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:393
+#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:334
 msgid "Supported debug options are:  version"
 msgstr "Op釘iunile de depanare suportate sunt:  version"
 
-#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:429
+#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:383
 msgid "No such command (in this context)."
 msgstr "Nu exist� o asemenea comand� (樽n acest context)."
 
-#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:432
+#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:386
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -745,7 +787,7 @@
 "Utiliza釘i ��/help &lt;comand�&gt;�� pentru ajutor referitor la o comand�.\n"
 "Urm�toarele comenzi sunt disponibile 樽n acest context:\n"
 
-#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7092
+#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7224
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -753,12 +795,12 @@
 "say &lt;mesaj&gt;:  Trimite un mesaj normal, ca �i cum nu s-ar fi folosit o "
 "comand�."
 
-#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7095
+#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7227
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;ac釘iune&gt;:  Trimite o ac釘iune tip IRC c�tre un contact sau un chat."
 
-#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7098
+#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7230
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -766,43 +808,43 @@
 "debug &lt;op釘iune&gt;:  Trimite diverse informa釘ii de depanare 樽n discu釘ia "
 "curent�."
 
-#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7101
+#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7233
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Gole�te con釘inutul ferestrei de discu釘ii."
 
-#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7104
+#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7239
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;comand�&gt;:  Ajutor pentru o comand� specific�."
 
-#: ../finch/gntconv.c:958
+#: ../finch/gntconv.c:991
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Arat� lista utilizatorilor din chat."
 
-#: ../finch/gntconv.c:963
+#: ../finch/gntconv.c:996
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Arat� fereastra de module."
 
-#: ../finch/gntconv.c:966
+#: ../finch/gntconv.c:999
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Arat� lista de contacte"
 
-#: ../finch/gntconv.c:969
+#: ../finch/gntconv.c:1002
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Arat� fereastra de editare a conturilor."
 
-#: ../finch/gntconv.c:972
+#: ../finch/gntconv.c:1005
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Arat� fereastra de depanare."
 
-#: ../finch/gntconv.c:975
+#: ../finch/gntconv.c:1008
 msgid "prefs: Show the preference window."
 msgstr "prefs: Arat� fereastra cu preferin釘e."
 
-#: ../finch/gntconv.c:978
+#: ../finch/gntconv.c:1011
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Arat� fereastra de statusuri salvate."
 
-#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:80 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "Fereastr� de depanare"
 
@@ -810,15 +852,15 @@
 #. * 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:251 ../pidgin/gtkdebug.c:753
+#: ../finch/gntdebug.c:255 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "Gole�te"
 
-#: ../finch/gntdebug.c:257
+#: ../finch/gntdebug.c:261
 msgid "Filter: "
 msgstr "Filtru: "
 
-#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:762
+#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "Pauz�"
 
@@ -827,118 +869,120 @@
 msgid "File Transfers - %d%% of %d files"
 msgstr "Transfer de fi�iere - %d%% din %d fi�iere."
 
-#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
-#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+#. Create the window.
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:81
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "Transfer de fi�iere"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "Progres"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "Nume fi�ier"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "M�rime"
 
-#: ../finch/gntft.c:197
+#: ../finch/gntft.c:198
 msgid "Speed"
 msgstr "Vitez�"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "R�mas"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:326
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
-#: ../libpurple/protocols/gg/gg.c:1581
-#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572
+#: ../libpurple/protocols/bonjour/bonjour.c:318
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
+#: ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1214
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:677
+#: ../libpurple/protocols/jabber/jabber.c:1212
 #: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:803
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:2658
-#: ../libpurple/protocols/oscar/oscar.c:3769
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3055
-#: ../pidgin/gtkblist.c:3068 ../pidgin/gtkblist.c:3070
-#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
+#: ../libpurple/protocols/oscar/oscar.c:821
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:2672
+#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/sametime/sametime.c:3264
+#: ../libpurple/protocols/sametime/sametime.c:4151
+#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3083 ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "Status"
 
-#: ../finch/gntft.c:207
+#: ../finch/gntft.c:208
 msgid "Close this window when all transfers finish"
 msgstr "�nchide fereastra la terminarea tuturor transferurilor"
 
-#: ../finch/gntft.c:214
+#: ../finch/gntft.c:215
 msgid "Clear finished transfers"
 msgstr "�terge transferurile terminate"
 
-#: ../finch/gntft.c:228
+#: ../finch/gntft.c:229
 msgid "Stop"
 msgstr "Stop"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
-#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
-#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:377
-#: ../pidgin/gtkaccount.c:2486 ../pidgin/gtkrequest.c:272
+#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
+#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2479
+#: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "�nchide"
 
-#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "A�tept 樽nceperea transferului"
 
-#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "Oprit"
 
-#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "E�uat"
 
-#: ../finch/gntft.c:414 ../pidgin/gtkft.c:133
-#, c-format
-msgid "%.2f KB/s"
-msgstr "%.2f KO/s"
-
-#: ../finch/gntft.c:425 ../finch/gntft.c:426 ../pidgin/gtkft.c:162
-#: ../pidgin/gtkft.c:1118
+#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "Terminat"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "Transfer"
 
-#: ../finch/gntnotify.c:162
+#: ../finch/gntnotify.c:164
 msgid "Emails"
 msgstr "Mailuri"
 
-#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
+#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224
 msgid "You have mail!"
 msgstr "Ave釘i mail nou!"
 
-#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1174
-msgid "From"
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:489
+msgid "Sender"
 msgstr "Expeditor"
 
-#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:496
 msgid "Subject"
 msgstr "Subiect"
 
-#: ../finch/gntnotify.c:198
+#: ../finch/gntnotify.c:200
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
@@ -946,57 +990,57 @@
 msgstr[1] "%s (%s) are %d mesaje noi."
 msgstr[2] "%s (%s) are %d de mesaje noi."
 
-#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:335
 msgid "New Mail"
 msgstr "Mail nou"
 
-#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:915
 #, c-format
 msgid "Info for %s"
 msgstr "Detalii pentru %s"
 
-#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:907
+#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:916
 msgid "Buddy Information"
 msgstr "Detalii contact"
 
-#: ../finch/gntnotify.c:366
+#: ../finch/gntnotify.c:376
 msgid "Continue"
 msgstr "Continu�"
 
-#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1631 ../pidgin/gtkdebug.c:834
+#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1626 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Detalii"
 
-#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1592
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1587
 msgid "IM"
 msgstr "Mesaj"
 
-#: ../finch/gntnotify.c:378
+#: ../finch/gntnotify.c:388
 msgid "Join"
 msgstr "Intr�"
 
-#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3474
 msgid "Invite"
 msgstr "Invit�"
 
-#: ../finch/gntnotify.c:384
+#: ../finch/gntnotify.c:394
 msgid "(none)"
 msgstr "(nimic)"
 
-#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83
 msgid "ERROR"
 msgstr "EROARE"
 
-#: ../finch/gntplugin.c:73
+#: ../finch/gntplugin.c:74
 msgid "loading plugin failed"
 msgstr "activarea modulului a e�uat"
 
-#: ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:83
 msgid "unloading plugin failed"
 msgstr "dezactivarea modului a e�uat"
 
-#: ../finch/gntplugin.c:124
+#: ../finch/gntplugin.c:128
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1013,368 +1057,391 @@
 "Adres� Internet: %s\n"
 "Nume fi�ier: %s\n"
 
-#: ../finch/gntplugin.c:182
+#: ../finch/gntplugin.c:186
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Modulul trebuie 樽nc�rcat 樽nainte de a-l putea configura."
 
-#: ../finch/gntplugin.c:226
+#: ../finch/gntplugin.c:234
 msgid "No configuration options for this plugin."
 msgstr "Nu exist� preferin釘e pentru acest modul."
 
-#: ../finch/gntplugin.c:249
+#: ../finch/gntplugin.c:259
 msgid "You can (un)load plugins from the following list."
 msgstr "Pute釘i (dez)activa module din lista urm�toare."
 
-#: ../finch/gntplugin.c:296
+#: ../finch/gntplugin.c:314
 msgid "Configure Plugin"
 msgstr "Configurare modul"
 
-#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1992
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+#: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
+#: ../finch/gntui.c:83 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2060
 msgid "Preferences"
 msgstr "Preferin釘e"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
+#: ../finch/gntpounce.c:182 ../pidgin/gtkpounce.c:255
 msgid "Please enter a buddy to pounce."
 msgstr "Preciza釘i un contact pentru 樽nt但mpinare."
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#. Create the window.
+#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "�nt但mpinare nou�"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "Edit Buddy Pounce"
 msgstr "Editare 樽nt但mpinare"
 
-#: ../finch/gntpounce.c:330
+#: ../finch/gntpounce.c:332
 msgid "Pounce Who"
 msgstr "�nt但mpinare pentru"
 
 #. Account:
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452
 msgid "Account:"
 msgstr "Cont:"
 
-#: ../finch/gntpounce.c:355
+#: ../finch/gntpounce.c:357
 msgid "Buddy name:"
 msgstr "Nume contact:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586
 msgid "Pounce When Buddy..."
 msgstr "�nt但mpinare la..."
 
-#: ../finch/gntpounce.c:373
+#: ../finch/gntpounce.c:375
 msgid "Signs on"
 msgstr "Autentificare"
 
-#: ../finch/gntpounce.c:374
+#: ../finch/gntpounce.c:376
 msgid "Signs off"
 msgstr "Deconectare"
 
-#: ../finch/gntpounce.c:375
-msgid "Goes away"
-msgstr "Intrarea 樽n absen釘�"
-
-#: ../finch/gntpounce.c:376
-msgid "Returns from away"
-msgstr "�ntoarcerea din absen釘�"
-
 #: ../finch/gntpounce.c:377
-msgid "Becomes idle"
-msgstr "Intrarea 樽n inactivitate"
+msgid "Goes away"
+msgstr "Intrarea 樽n absen釘�"
 
 #: ../finch/gntpounce.c:378
+msgid "Returns from away"
+msgstr "�ntoarcerea din absen釘�"
+
+#: ../finch/gntpounce.c:379
+msgid "Becomes idle"
+msgstr "Intrarea 樽n inactivitate"
+
+#: ../finch/gntpounce.c:380
 msgid "Is no longer idle"
 msgstr "Revenirea din inactivitate"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:381
 msgid "Starts typing"
 msgstr "Tastarea unui mesaj nou"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:382
 msgid "Pauses while typing"
 msgstr "Pauz� 樽n timpul tast�rii"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:383
 msgid "Stops typing"
 msgstr "Oprirea din tastare"
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:384
 msgid "Sends a message"
 msgstr "Trimiterea unui mesaj"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647
 msgid "Action"
 msgstr "Ac釘iune"
 
-#: ../finch/gntpounce.c:413
+#: ../finch/gntpounce.c:415
 msgid "Open an IM window"
 msgstr "Deschide o discu釘ie"
 
-#: ../finch/gntpounce.c:414
-msgid "Pop up a notification"
-msgstr "Deschide o fereastr� de notificare"
-
-#: ../finch/gntpounce.c:415
-msgid "Send a message"
-msgstr "Trimite un mesaj"
-
 #: ../finch/gntpounce.c:416
+msgid "Pop up a notification"
+msgstr "Deschide o fereastr� de notificare"
+
+#: ../finch/gntpounce.c:417
+msgid "Send a message"
+msgstr "Trimite un mesaj"
+
+#: ../finch/gntpounce.c:418
 msgid "Execute a command"
 msgstr "Execut� o comand�"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:419
 msgid "Play a sound"
 msgstr "Red� un sunet"
 
-#: ../finch/gntpounce.c:445
+#: ../finch/gntpounce.c:447
 msgid "Pounce only when my status is not available"
 msgstr "�nt但mpinare doar 樽n starea de indisponibilitate"
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295
 msgid "Recurring"
 msgstr "Recurent�"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
+#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Sigur dori釘i s� �terge釘i 樽nt但mpinarea la %s pentru %s?"
 
-#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
+#: ../finch/gntpounce.c:685 ../finch/gntui.c:79 ../pidgin/gtkpounce.c:1339
 msgid "Buddy Pounces"
 msgstr "�nt但mpin�ri contacte"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s a 樽nceput s� v� scrie (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s s-a oprit 樽n timp ce v� scria (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s s-a autentificat (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s s-a 樽ntors din inactivitate (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s s-a 樽ntors din absen釘� (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s a 樽ncetat s� v� scrie (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s s-a deconectat (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s a intrat 樽n inactivitate (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s a intrat 樽n absen釘� (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s v-a trimis un mesaj. (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
 msgid "Unknown pounce event. Please report this!"
 msgstr "Eveniment necunoscut 樽n 樽nt但mpinare. Raporta釘i aceast� eroare."
 
-#: ../finch/gntprefs.c:79
+#: ../finch/gntprefs.c:91
 msgid "Based on keyboard use"
 msgstr "�n func釘ie de tastare"
 
-#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1853
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1923
 msgid "From last sent message"
 msgstr "�ncep但nd cu ultimul mesaj trimis"
 
-#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1852 ../pidgin/gtkprefs.c:1866
+#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:1922 ../pidgin/gtkprefs.c:1936
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "Niciodat�"
 
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:183
 msgid "Show Idle Time"
 msgstr "Arat� inactivitatea"
 
-#: ../finch/gntprefs.c:172
+#: ../finch/gntprefs.c:184
 msgid "Show Offline Buddies"
 msgstr "Arat� contactele deconectate"
 
-#: ../finch/gntprefs.c:179
+#: ../finch/gntprefs.c:191
 msgid "Notify buddies when you are typing"
 msgstr "Notific� contactele c但nd le scriu"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:197
 msgid "Log format"
 msgstr "Format 樽nregistr�ri"
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:198
 msgid "Log IMs"
 msgstr "�nregistreaz� mesajele"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:199
 msgid "Log chats"
 msgstr "�nregistreaz� chat-urile"
 
-#: ../finch/gntprefs.c:188
+#: ../finch/gntprefs.c:200
 msgid "Log status change events"
 msgstr "�nregistreaz� schimb�rile de status"
 
+#: ../finch/gntprefs.c:206
+msgid "Report Idle time"
+msgstr "Raporteaz� inactivitatea"
+
+#: ../finch/gntprefs.c:207
+msgid "Change status when idle"
+msgstr "Schimb� statusul 樽n inactivitate"
+
+#: ../finch/gntprefs.c:208
+msgid "Minutes before changing status"
+msgstr "Minute 樽naintea schimb�rii statusului:"
+
+#: ../finch/gntprefs.c:209
+msgid "Change status to"
+msgstr "Schimb� statusul 樽n:"
+
 #. Conversations
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:915 ../pidgin/gtkprefs.c:1956
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2026
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Discu釘ii"
 
-#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1392 ../pidgin/gtkprefs.c:1967
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1462 ../pidgin/gtkprefs.c:2037
 msgid "Logging"
 msgstr "�nregistrare"
 
-#: ../finch/gntrequest.c:532
+#: ../finch/gntrequest.c:563
 msgid "Not implemented yet."
 msgstr "Neimplementat 樽nc�."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1529
-#: ../pidgin/gtkrequest.c:1575
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1531
+#: ../pidgin/gtkrequest.c:1577
 msgid "Save File..."
 msgstr "Salveaz� fi�ierul..."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1532
+#: ../pidgin/gtkrequest.c:1578
 msgid "Open File..."
 msgstr "Deschide fi�ierul..."
 
-#: ../finch/gntstatus.c:135
+#: ../finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Sigur dori釘i s� �terge釘i %s?"
 
-#: ../finch/gntstatus.c:138
+#: ../finch/gntstatus.c:140
 msgid "Delete Status"
 msgstr "�tergere status"
 
-#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
+#: ../finch/gntstatus.c:175 ../pidgin/gtksavedstatuses.c:596
 msgid "Saved Statuses"
 msgstr "Statusuri salvate"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/buddy.c:973
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:464
+#: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
 msgstr "Titlu"
 
-#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
+#: ../finch/gntstatus.c:182 ../pidgin/gtksavedstatuses.c:514
 msgid "Type"
 msgstr "Tip"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
-#: ../libpurple/protocols/bonjour/bonjour.c:258
-#: ../libpurple/protocols/bonjour/bonjour.c:265
-#: ../libpurple/protocols/bonjour/bonjour.c:328
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
-#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
-#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1246
-#: ../libpurple/protocols/jabber/jabber.c:1256
-#: ../libpurple/protocols/jabber/jabber.c:1266
-#: ../libpurple/protocols/jabber/jabber.c:1276
-#: ../libpurple/protocols/jabber/jabber.c:1286
-#: ../libpurple/protocols/jabber/jabber.c:1298
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
+#: ../libpurple/protocols/bonjour/bonjour.c:247
+#: ../libpurple/protocols/bonjour/bonjour.c:254
+#: ../libpurple/protocols/bonjour/bonjour.c:320
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
+#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
+#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
+#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1296
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5466
-#: ../libpurple/protocols/oscar/oscar.c:5684
-#: ../libpurple/protocols/oscar/oscar.c:5698
-#: ../libpurple/protocols/oscar/oscar.c:5714
-#: ../libpurple/protocols/oscar/oscar.c:5721
-#: ../libpurple/protocols/oscar/oscar.c:5728
-#: ../libpurple/protocols/sametime/sametime.c:3286
-#: ../libpurple/protocols/sametime/sametime.c:3292
-#: ../libpurple/protocols/sametime/sametime.c:3298
-#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/oscar/oscar.c:5533
+#: ../libpurple/protocols/oscar/oscar.c:5751
+#: ../libpurple/protocols/oscar/oscar.c:5765
+#: ../libpurple/protocols/oscar/oscar.c:5781
+#: ../libpurple/protocols/oscar/oscar.c:5788
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../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:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
 #: ../libpurple/protocols/yahoo/yahoo.c:3494
 #: ../libpurple/protocols/yahoo/yahoo.c:3500
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
+#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Mesaj"
 
 #. Use
-#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589
 msgid "Use"
 msgstr "Activare"
 
-#: ../finch/gntstatus.c:294
+#: ../finch/gntstatus.c:300
 msgid "Invalid title"
 msgstr "Titlu invalid"
 
-#: ../finch/gntstatus.c:295
+#: ../finch/gntstatus.c:301
 msgid "Please enter a non-empty title for the status."
 msgstr "V� rug�m s� introduce釘i un titlu pentru status."
 
-#: ../finch/gntstatus.c:302
+#: ../finch/gntstatus.c:308
 msgid "Duplicate title"
 msgstr "Titlu duplicat"
 
-#: ../finch/gntstatus.c:303
+#: ../finch/gntstatus.c:309
 msgid "Please enter a different title for the status."
 msgstr "V�揃rug�m s� introduce釘i un titlu diferit pentru status."
 
-#: ../finch/gntstatus.c:443
+#: ../finch/gntstatus.c:449
 msgid "Substatus"
 msgstr "Substatus"
 
-#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:469
+#: ../finch/gntstatus.c:475
 msgid "Message:"
 msgstr "Mesaj:"
 
-#: ../finch/gntstatus.c:518
+#: ../finch/gntstatus.c:524
 msgid "Edit Status"
 msgstr "Editare status"
 
-#: ../finch/gntstatus.c:560
+#: ../finch/gntstatus.c:566
 msgid "Use different status for following accounts"
 msgstr "Activeaz� un status diferit pentru urm�toarele conturi:"
 
 #. Save & Use
-#: ../finch/gntstatus.c:594
+#: ../finch/gntstatus.c:600
 msgid "Save & Use"
 msgstr "Salveaz� �i activeaz�"
 
-#: ../finch/gntui.c:83
+#: ../finch/gntui.c:84
 msgid "Statuses"
 msgstr "Statusuri"
 
@@ -1537,12 +1604,12 @@
 msgstr "Lipse�te modulul de protocol pentru %s"
 
 #: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:3974
+#: ../pidgin/gtkblist.c:4010
 msgid "Connection Error"
 msgstr "Eroare la conectare"
 
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1336
+#: ../libpurple/protocols/jabber/jabber.c:1334
 msgid "New passwords do not match."
 msgstr "Noua parol� a fost confirmat� gre�it."
 
@@ -1581,24 +1648,24 @@
 msgstr "Detalii utilizator"
 
 #: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1424
-#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:1462
+#: ../libpurple/protocols/jabber/buddy.c:1479
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
-#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5253 ../pidgin/plugins/gevolution/gevolution.c:97
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
+#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5310 ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "Contacte"
 
-#: ../libpurple/blist.c:550
+#: ../libpurple/blist.c:548
 msgid "buddy list"
-msgstr "list� contacte"
+msgstr "list� de contacte"
 
 #: ../libpurple/connection.c:106
 msgid "Registration Error"
@@ -1615,83 +1682,84 @@
 msgstr "+++ %s s-a deconectat"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1712
+#: ../libpurple/protocols/jabber/buddy.c:1750
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "Eroare necunoscut�"
 
-#: ../libpurple/conversation.c:165
+#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "Nu s-a putut trimite mesajul: Mesajul este prea mare."
 
-#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
+#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Nu s-a putut trimite mesajul c�tre %s."
 
-#: ../libpurple/conversation.c:169
+#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "Mesaj 樽n absen釘� prea mare."
 
-#: ../libpurple/conversation.c:178
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:284
+#: ../libpurple/protocols/bonjour/jabber.c:326
 msgid "Unable to send message."
 msgstr "Nu se poate trimite mesajul."
 
-#: ../libpurple/conversation.c:1164
+#: ../libpurple/conversation.c:1169
 msgid "Send Message"
 msgstr "Trimitere mesaj"
 
-#: ../libpurple/conversation.c:1167
+#: ../libpurple/conversation.c:1172
 msgid "_Send Message"
 msgstr "Trimite mesa_jul"
 
-#: ../libpurple/conversation.c:1570
+#: ../libpurple/conversation.c:1578
 #, c-format
 msgid "%s entered the room."
 msgstr "%s a intrat 樽n chat."
 
-#: ../libpurple/conversation.c:1573
+#: ../libpurple/conversation.c:1581
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] a intrat 樽n chat."
 
-#: ../libpurple/conversation.c:1678
+#: ../libpurple/conversation.c:1691
 #, c-format
 msgid "You are now known as %s"
 msgstr "Sunte釘i cunoscut acum ca %s"
 
-#: ../libpurple/conversation.c:1698
+#: ../libpurple/conversation.c:1711
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s este acum %s"
 
-#: ../libpurple/conversation.c:1771
+#: ../libpurple/conversation.c:1786
 #, c-format
 msgid "%s left the room."
 msgstr "%s a ie�it din chat."
 
-#: ../libpurple/conversation.c:1774
+#: ../libpurple/conversation.c:1789
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s a ie�it din chat (%s)."
 
-#: ../libpurple/dbus-server.c:578
+#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Conectare e�uat�: %s"
 
-#: ../libpurple/dbus-server.c:590
+#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Nu s-a putut ob釘ine un nume: %s"
 
-#: ../libpurple/dbus-server.c:603
+#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Nu s-a putut ob釘ine un nume ��serv��: %s"
 
-#: ../libpurple/dbus-server.h:83
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr "Serverul D-BUS Purple nu este pornit din urm�toarele motive:"
 
@@ -1744,7 +1812,7 @@
 msgid "Unknown reason"
 msgstr "Motiv necunoscut"
 
-#: ../libpurple/ft.c:204
+#: ../libpurple/ft.c:207
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1753,7 +1821,7 @@
 "Eroare la citirea %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:208
+#: ../libpurple/ft.c:211
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1762,7 +1830,7 @@
 "Eroare la scrierea %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:212
+#: ../libpurple/ft.c:215
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1771,39 +1839,39 @@
 "Eroare la accesarea %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:248
+#: ../libpurple/ft.c:251
 msgid "Directory is not writable."
 msgstr "Nu se poate scrie 樽n director."
 
-#: ../libpurple/ft.c:263
+#: ../libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
 msgstr "Nu se poate trimite un fi�ier de 0 octe釘i."
 
-#: ../libpurple/ft.c:273
+#: ../libpurple/ft.c:276
 msgid "Cannot send a directory."
 msgstr "Nu se poate trimite un director."
 
-#: ../libpurple/ft.c:282
+#: ../libpurple/ft.c:285
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s nu este un fi�ier obi�nuit. Nu va fi suprascris.\n"
 
-#: ../libpurple/ft.c:342
+#: ../libpurple/ft.c:345
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s dore�te s� v� trimit� fi�ierul %s (%s)"
 
-#: ../libpurple/ft.c:349
+#: ../libpurple/ft.c:352
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s dore�te s� v� trimit� un fi�ier"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:395
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Accepta釘i transferul de fi�iere ini釘iat de %s?"
 
-#: ../libpurple/ft.c:396
+#: ../libpurple/ft.c:399
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1814,60 +1882,60 @@
 "Serverul: %s\n"
 "Portul: %d"
 
-#: ../libpurple/ft.c:431
+#: ../libpurple/ft.c:434
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s se ofer� s� trimit� fi�ierul %s"
 
-#: ../libpurple/ft.c:483
+#: ../libpurple/ft.c:486
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s nu este un nume de fi�ier valid.\n"
 
-#: ../libpurple/ft.c:504
+#: ../libpurple/ft.c:507
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Se ofer� trimiterea %s la %s"
 
-#: ../libpurple/ft.c:516
+#: ../libpurple/ft.c:519
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Se ini釘iaz� transferul fi�ierului %s de la %s"
 
-#: ../libpurple/ft.c:670
+#: ../libpurple/ft.c:680
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Transferul fi�ierului %s s-a terminat"
 
-#: ../libpurple/ft.c:673
+#: ../libpurple/ft.c:683
 msgid "File transfer complete"
 msgstr "Transferul fi�ierelor s-a terminat"
 
-#: ../libpurple/ft.c:1091
+#: ../libpurple/ft.c:1101
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "A釘i 樽ntrerupt transferul fi�ierului %s"
 
-#: ../libpurple/ft.c:1096
+#: ../libpurple/ft.c:1106
 msgid "File transfer cancelled"
 msgstr "Transferul fi�ierului a fost 樽ntrerupt"
 
-#: ../libpurple/ft.c:1154
+#: ../libpurple/ft.c:1164
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s a 樽ntrerupt transferul fi�ierului %s"
 
-#: ../libpurple/ft.c:1159
+#: ../libpurple/ft.c:1169
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s a 樽ntrerupt transferul fi�ierului"
 
-#: ../libpurple/ft.c:1216
+#: ../libpurple/ft.c:1226
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Transferul fi�ierului c�tre %s a e�uat."
 
-#: ../libpurple/ft.c:1218
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Transferul fi�ierului de la %s a e�uat."
@@ -2052,33 +2120,33 @@
 msgstr ""
 "Specific� dac� aceast� comand� ar trebui s� fie asociat� URL-urilor ��ymsgr��"
 
-#: ../libpurple/log.c:181
+#: ../libpurple/log.c:182
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">Nu exist� o func釘ie de citire a 樽nregistr�rilor</"
 "font></b>"
 
-#: ../libpurple/log.c:593
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:607
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Text simplu"
 
-#: ../libpurple/log.c:621
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "Vechiul format simplificat"
 
-#: ../libpurple/log.c:732
+#: ../libpurple/log.c:837
 msgid "Logging of this conversation failed."
 msgstr "�nregistrarea acestei discu釘ii a e�uat."
 
-#: ../libpurple/log.c:1175
+#: ../libpurple/log.c:1280
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1251
+#: ../libpurple/log.c:1364
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2087,7 +2155,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;R�spuns "
 "automat&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1253
+#: ../libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2096,16 +2164,16 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;R�spuns "
 "automat&gt;>:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
+#: ../libpurple/log.c:1424 ../libpurple/log.c:1557
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Nu g�sesc loca釘ia 樽nregistr�rilor!</b></font>"
 
-#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
+#: ../libpurple/log.c:1436 ../libpurple/log.c:1566
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Nu s-a putut citi fi�ierul: %s</b></font>"
 
-#: ../libpurple/log.c:1385
+#: ../libpurple/log.c:1498
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <R�spuns-Automat>: %s\n"
@@ -2198,13 +2266,13 @@
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1440
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:5798
-#: ../libpurple/protocols/oscar/oscar.c:5853
-#: ../libpurple/protocols/oscar/oscar.c:6079
-#: ../libpurple/protocols/oscar/oscar.c:6149 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1454
+#: ../libpurple/protocols/oscar/oscar.c:2247
+#: ../libpurple/protocols/oscar/oscar.c:2294
+#: ../libpurple/protocols/oscar/oscar.c:5865
+#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "_Renun釘�"
@@ -2221,12 +2289,12 @@
 msgid "Auto Reject"
 msgstr "Refuz� automat"
 
-#: ../libpurple/plugins/autoaccept.c:184
+#: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "Accept� automat transferurile de fi�iere..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:214
+#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2234,12 +2302,12 @@
 "Cale pentru salvarea fi�ierelor:\n"
 "(Preciza釘i calea complet�)"
 
-#: ../libpurple/plugins/autoaccept.c:219
+#: ../libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
 msgstr ""
 "Refuz� automat pentru utilizatorii ce nu fac parte din lista de contacte"
 
-#: ../libpurple/plugins/autoaccept.c:223
+#: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2256,7 +2324,7 @@
 msgid "Enter your notes below..."
 msgstr "Introduce釘i noti釘ele despre contactul selectat..."
 
-#: ../libpurple/plugins/buddynote.c:62
+#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "Editare noti釘e..."
 
@@ -2268,18 +2336,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Buddy Notes"
-msgstr "Noti釘e contacte"
+msgstr "Noti釘e asociate contactelor"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:92
 msgid "Store notes on particular buddies."
 msgstr "Permite asocierea de noti釘e contactelor din list�."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:93
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 "Adaug� op釘iunea de stocare de noti釘e pentru contactele din lista de contacte."
@@ -2473,34 +2541,34 @@
 #. * 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.
-#: ../libpurple/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:492
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1545
+#: ../libpurple/plugins/log_reader.c:1573
 msgid "User is offline."
 msgstr "Utilizatorul este deconectat."
 
-#: ../libpurple/plugins/log_reader.c:1551
+#: ../libpurple/plugins/log_reader.c:1579
 msgid "Auto-response sent:"
 msgstr "R�spuns automat trimis:"
 
-#: ../libpurple/plugins/log_reader.c:1561
-#: ../libpurple/plugins/log_reader.c:1564
+#: ../libpurple/plugins/log_reader.c:1589
+#: ../libpurple/plugins/log_reader.c:1592
 #: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s s-a deconectat."
 
-#: ../libpurple/plugins/log_reader.c:1578
+#: ../libpurple/plugins/log_reader.c:1606
 msgid "One or more messages may have been undeliverable."
 msgstr "Se poate s� nu fi ajuns unul sau mai multe mesaje."
 
-#: ../libpurple/plugins/log_reader.c:1588
+#: ../libpurple/plugins/log_reader.c:1616
 msgid "You were disconnected from the server."
 msgstr "A釘i fost deconectat de la server."
 
-#: ../libpurple/plugins/log_reader.c:1596
+#: ../libpurple/plugins/log_reader.c:1624
 msgid ""
 "You are currently disconnected. Messages will not be received unless you are "
 "logged in."
@@ -2508,69 +2576,77 @@
 "Sunte釘i momentan deconectat(�). Nu ve釘i mai primi mesaje p但n� la urm�toarea "
 "autentificare."
 
-#: ../libpurple/plugins/log_reader.c:1611
+#: ../libpurple/plugins/log_reader.c:1639
 msgid "Message could not be sent because the maximum length was exceeded."
 msgstr "Mesajul nu a putut fi trimis pentru c� a dep��it m�rimea maxim�."
 
-#: ../libpurple/plugins/log_reader.c:1616
+#: ../libpurple/plugins/log_reader.c:1644
 msgid "Message could not be sent."
 msgstr "Mesajul nu a putut fi trimis."
 
 #. 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.
-#: ../libpurple/plugins/log_reader.c:1969
-#: ../libpurple/plugins/log_reader.c:2078
+#: ../libpurple/plugins/log_reader.c:2343
+#: ../libpurple/plugins/log_reader.c:2466
 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.
-#: ../libpurple/plugins/log_reader.c:1982
-#: ../libpurple/plugins/log_reader.c:2083
+#: ../libpurple/plugins/log_reader.c:2356
+#: ../libpurple/plugins/log_reader.c:2471
 msgid "Fire"
 msgstr "Fire"
 
 #. 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.
-#: ../libpurple/plugins/log_reader.c:1994
-#: ../libpurple/plugins/log_reader.c:2087
+#: ../libpurple/plugins/log_reader.c:2368
+#: ../libpurple/plugins/log_reader.c:2475
 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.
-#: ../libpurple/plugins/log_reader.c:2007
-#: ../libpurple/plugins/log_reader.c:2092
+#: ../libpurple/plugins/log_reader.c:2382
+#: ../libpurple/plugins/log_reader.c:2480
+msgid "QIP"
+msgstr "QIP"
+
+#. 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.
+#: ../libpurple/plugins/log_reader.c:2394
+#: ../libpurple/plugins/log_reader.c:2484
 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.
-#: ../libpurple/plugins/log_reader.c:2019
-#: ../libpurple/plugins/log_reader.c:2096
+#: ../libpurple/plugins/log_reader.c:2406
+#: ../libpurple/plugins/log_reader.c:2488
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2060
+#: ../libpurple/plugins/log_reader.c:2448
 msgid "General Log Reading Configuration"
 msgstr "Configurare citire 樽nregistr�ri generale"
 
-#: ../libpurple/plugins/log_reader.c:2064
+#: ../libpurple/plugins/log_reader.c:2452
 msgid "Fast size calculations"
 msgstr "Calcul rapid m�rime"
 
-#: ../libpurple/plugins/log_reader.c:2068
+#: ../libpurple/plugins/log_reader.c:2456
 msgid "Use name heuristics"
 msgstr "Euristic� pentru nume"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2074
+#: ../libpurple/plugins/log_reader.c:2462
 msgid "Log Directory"
 msgstr "Director 樽nregistr�ri"
 
@@ -2580,19 +2656,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2125
+#: ../libpurple/plugins/log_reader.c:2517
 msgid "Log Reader"
 msgstr "Citire 樽nregistr�ri"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2129
+#: ../libpurple/plugins/log_reader.c:2521
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Import� 樽nregistr�rile altor clien釘i IM 樽n Gaim."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2133
+#: ../libpurple/plugins/log_reader.c:2525
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2682,9 +2758,11 @@
 #: ../libpurple/protocols/msn/dialog.c:133
 #: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1917
-#: ../libpurple/protocols/silc/buddy.c:314
-#: ../libpurple/protocols/silc/pk.c:119 ../libpurple/protocols/silc/wb.c:304
-#: ../pidgin/gtkrequest.c:267
+#: ../libpurple/protocols/silc/buddy.c:317
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
 msgid "Yes"
 msgstr "Da"
 
@@ -2692,9 +2770,11 @@
 #: ../libpurple/protocols/msn/dialog.c:134
 #: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
 #: ../libpurple/protocols/novell/novell.c:1918
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc/pk.c:120 ../libpurple/protocols/silc/wb.c:305
-#: ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
 msgid "No"
 msgstr "Nu"
 
@@ -2839,7 +2919,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:415
+#: ../libpurple/plugins/ssl/ssl-nss.c:423
 msgid "NSS"
 msgstr "NSS"
 
@@ -2847,8 +2927,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:418
-#: ../libpurple/plugins/ssl/ssl-nss.c:420
+#: ../libpurple/plugins/ssl/ssl-nss.c:426
+#: ../libpurple/plugins/ssl/ssl-nss.c:428
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Ofer� suport SSL prin bibliotecile Mozilla NSS."
 
@@ -2923,7 +3003,7 @@
 msgid "Provides support for loading Tcl plugins"
 msgstr "Permite 樽nc�rcarea de module Tcl."
 
-#: ../libpurple/plugins/tcl/tcl.c:495
+#: ../libpurple/plugins/tcl/tcl.c:507
 msgid ""
 "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
 "install ActiveTCL from http://www.activestate.com\n"
@@ -2932,11 +3012,11 @@
 "instala釘i ActiveTCL de la http://www.activestate.com\n"
 
 #. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:113
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Ascultarea interfa釘ei de re釘ea pentru noi conexiuni IM a e�uat\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:148
+#: ../libpurple/protocols/bonjour/bonjour.c:137
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Nu se poate deschide o conexiune cu serverul local mDNS. E pornit?"
@@ -2944,19 +3024,20 @@
 #. 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/bonjour/bonjour.c:294
 #: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1434
+#: ../libpurple/protocols/jabber/buddy.c:1472
 #: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:715
-#: ../libpurple/protocols/oscar/oscar.c:4499
-#: ../libpurple/protocols/oscar/oscar.c:5544
+#: ../libpurple/protocols/oscar/oscar.c:733
+#: ../libpurple/protocols/oscar/oscar.c:4545
+#: ../libpurple/protocols/oscar/oscar.c:5611
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/silc10/buddy.c:1476
 #: ../libpurple/protocols/yahoo/yahoo.c:3397
 #: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1862
-#: ../pidgin/gtkstatusbox.c:1052
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkstatusbox.c:1056
 msgid "Away"
 msgstr "Absent(�)"
 
@@ -2970,81 +3051,86 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:431
-#: ../libpurple/protocols/bonjour/bonjour.c:433
+#: ../libpurple/protocols/bonjour/bonjour.c:425
+#: ../libpurple/protocols/bonjour/bonjour.c:427
 msgid "Bonjour Protocol Plugin"
 msgstr "Modul de protocol Bonjour"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:476
-#: ../libpurple/protocols/bonjour/bonjour.c:483
-#: ../libpurple/protocols/bonjour/bonjour.c:541
+#: ../libpurple/protocols/bonjour/bonjour.c:470
+#: ../libpurple/protocols/bonjour/bonjour.c:477
+#: ../libpurple/protocols/bonjour/bonjour.c:526
 msgid "Purple Person"
 msgstr "Persoan� Purple"
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:589
-#: ../libpurple/protocols/silc/silc.c:922
+#: ../libpurple/protocols/bonjour/bonjour.c:575
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Nume calculator"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/bonjour/bonjour.c:579
 #: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:824
+#: ../libpurple/protocols/jabber/jabber.c:828
 msgid "First name"
 msgstr "Prenume"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/bonjour/bonjour.c:582
 #: ../libpurple/protocols/gg/gg.c:622
-#: ../libpurple/protocols/jabber/jabber.c:829
+#: ../libpurple/protocols/jabber/jabber.c:833
 msgid "Last name"
 msgstr "Nume de familie"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:599
+#: ../libpurple/protocols/bonjour/bonjour.c:585
 #: ../libpurple/protocols/gg/gg.c:472
-#: ../libpurple/protocols/jabber/jabber.c:814
-#: ../libpurple/protocols/silc/silc.c:685
-#: ../libpurple/protocols/silc/silc.c:926
+#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
 msgstr "Mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:602
+#: ../libpurple/protocols/bonjour/bonjour.c:588
 msgid "AIM Account"
 msgstr "Cont AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:605
+#: ../libpurple/protocols/bonjour/bonjour.c:591
 msgid "XMPP Account"
 msgstr "Cont XMPP"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:395
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s a 樽ncheiat discu釘ia."
 
-#: ../libpurple/protocols/bonjour/jabber.c:461
+#: ../libpurple/protocols/bonjour/jabber.c:441
+#: ../libpurple/protocols/bonjour/jabber.c:654
+#: ../libpurple/protocols/bonjour/jabber.c:679
+msgid "Unable to send the message, the conversation couldn't be started."
+msgstr "Nu s-a putut trimite mesajul, discu釘ia nu a putut fi ini釘iat�."
+
+#: ../libpurple/protocols/bonjour/jabber.c:575
 msgid "Cannot open socket"
 msgstr "Nu s-a putut deschide un socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:469
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Error setting socket options"
 msgstr "Eroare la setarea op釘iunilor socket-ului"
 
-#: ../libpurple/protocols/bonjour/jabber.c:493
+#: ../libpurple/protocols/bonjour/jabber.c:607
 msgid "Could not bind socket to port"
 msgstr "Nu se poate face bind pentru socket pe port"
 
-#: ../libpurple/protocols/bonjour/jabber.c:501
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not listen on socket"
 msgstr "Nu se poate asculta pe socket"
 
-#: ../libpurple/protocols/bonjour/jabber.c:599
-msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Nu s-a putut trimite mesajul, discu釘ia nu a putut fi ini釘iat�."
-
 #: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
 msgid "Invalid proxy settings"
 msgstr "Set�ri proxy invalide"
@@ -3119,8 +3205,8 @@
 msgstr "�nregistrare terminat� cu succes!"
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
-#: ../libpurple/protocols/jabber/jabber.c:803
-#: ../libpurple/protocols/jabber/jabber.c:1371
+#: ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Password"
 msgstr "Parol�"
 
@@ -3145,10 +3231,10 @@
 msgstr "Completa釘i urm�toarele c但mpuri:"
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/jabber/jabber.c:839
-#: ../libpurple/protocols/oscar/oscar.c:3778
-#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/gg/gg.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:843
+#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3811
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Ora�"
@@ -3158,11 +3244,11 @@
 msgstr "An na�tere"
 
 #: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3721
+#: ../libpurple/protocols/oscar/oscar.c:3741
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Sex"
 
@@ -3171,14 +3257,14 @@
 msgstr "Masculin sau feminin"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3721
+#: ../libpurple/protocols/oscar/oscar.c:3741
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Masculin"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3721
+#: ../libpurple/protocols/oscar/oscar.c:3741
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3238,147 +3324,148 @@
 msgstr "Ad�ugare 樽n chat..."
 
 #: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:5516
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:5583
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3055 ../pidgin/gtkblist.c:3383
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
+#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3411
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
 msgid "Offline"
 msgstr "Deconectat(�)"
 
 #: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1430
+#: ../libpurple/protocols/jabber/buddy.c:1468
 #: ../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:2816
 #: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
 msgid "Available"
 msgstr "Disponibil(�)"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2657
-#: ../libpurple/protocols/oscar/oscar.c:3688
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
+#: ../libpurple/protocols/oscar/oscar.c:2671
+#: ../libpurple/protocols/oscar/oscar.c:3708
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1585
-#: ../libpurple/protocols/jabber/buddy.c:1761
-#: ../libpurple/protocols/oscar/oscar.c:3699
-#: ../libpurple/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
+#: ../libpurple/protocols/jabber/buddy.c:1623
+#: ../libpurple/protocols/jabber/buddy.c:1799
+#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Prenume"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
 msgid "Birth Year"
 msgstr "An na�tere"
 
-#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3900
+#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
+#: ../libpurple/protocols/oscar/oscar.c:3920
 msgid "Unable to display the search results."
 msgstr "Rezultatele c�ut�rii nu pot fi afi�ate."
 
-#: ../libpurple/protocols/gg/gg.c:1168
+#: ../libpurple/protocols/gg/gg.c:1166
 msgid "Gadu-Gadu Public Directory"
 msgstr "Director public Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1169
+#: ../libpurple/protocols/gg/gg.c:1167
 msgid "Search results"
 msgstr "Rezultatele c�ut�rii"
 
-#: ../libpurple/protocols/gg/gg.c:1212
+#: ../libpurple/protocols/gg/gg.c:1210
 msgid "No matching users found"
 msgstr "Nu s-au g�sit utilizatori care s� corespund�"
 
-#: ../libpurple/protocols/gg/gg.c:1213
+#: ../libpurple/protocols/gg/gg.c:1211
 msgid "There are no users matching your search criteria."
 msgstr "Nu exist� utilizatori care s� se potriveasc� termenilor c�ut�rii."
 
-#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
+#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
 msgid "Unable to read socket"
 msgstr "Nu se poate citi din socket"
 
-#: ../libpurple/protocols/gg/gg.c:1392
+#: ../libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list downloaded"
 msgstr "Lista de contacte a fost desc�rcat�"
 
-#: ../libpurple/protocols/gg/gg.c:1393
+#: ../libpurple/protocols/gg/gg.c:1391
 msgid "Your buddy list was downloaded from the server."
 msgstr "Lista de contacte a fost desc�rcat� de pe server."
 
-#: ../libpurple/protocols/gg/gg.c:1400
+#: ../libpurple/protocols/gg/gg.c:1398
 msgid "Buddy list uploaded"
 msgstr "List� de contacte stocat�"
 
-#: ../libpurple/protocols/gg/gg.c:1401
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Your buddy list was stored on the server."
 msgstr "Lista de contacte v-a fost stocat� pe server."
 
-#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
+#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "Conexiunea a e�uat."
 
-#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "Blocat(�)"
 
-#: ../libpurple/protocols/gg/gg.c:1641
+#: ../libpurple/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "Adaug� 樽n chat"
 
-#: ../libpurple/protocols/gg/gg.c:1650
+#: ../libpurple/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "Deblocare"
 
-#: ../libpurple/protocols/gg/gg.c:1654
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Blocare"
 
-#: ../libpurple/protocols/gg/gg.c:1671
+#: ../libpurple/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "_Nume chat:"
 
-#: ../libpurple/protocols/gg/gg.c:1911
+#: ../libpurple/protocols/gg/gg.c:1909
 msgid "Chat error"
 msgstr "Eroare de chat"
 
-#: ../libpurple/protocols/gg/gg.c:1912
+#: ../libpurple/protocols/gg/gg.c:1910
 msgid "This chat name is already in use"
 msgstr "Exist� deja un chat cu acest nume"
 
-#: ../libpurple/protocols/gg/gg.c:1995
+#: ../libpurple/protocols/gg/gg.c:1993
 msgid "Not connected to the server."
 msgstr "Neconectat(�) la server."
 
-#: ../libpurple/protocols/gg/gg.c:2018
+#: ../libpurple/protocols/gg/gg.c:2016
 msgid "Find buddies..."
 msgstr "C�utare contacte..."
 
-#: ../libpurple/protocols/gg/gg.c:2024
+#: ../libpurple/protocols/gg/gg.c:2022
 msgid "Change password..."
 msgstr "Schimbare parol�..."
 
-#: ../libpurple/protocols/gg/gg.c:2030
+#: ../libpurple/protocols/gg/gg.c:2028
 msgid "Upload buddylist to Server"
 msgstr "Stocheaz� lista de contacte pe server"
 
-#: ../libpurple/protocols/gg/gg.c:2034
+#: ../libpurple/protocols/gg/gg.c:2032
 msgid "Download buddylist from Server"
 msgstr "Descarc� lista de contacte de pe server"
 
-#: ../libpurple/protocols/gg/gg.c:2038
+#: ../libpurple/protocols/gg/gg.c:2036
 msgid "Delete buddylist from Server"
 msgstr "�terge lista de contacte de pe server"
 
-#: ../libpurple/protocols/gg/gg.c:2042
+#: ../libpurple/protocols/gg/gg.c:2040
 msgid "Save buddylist to file..."
 msgstr "Salveaz� lista de contacte 樽n fi�ierul..."
 
-#: ../libpurple/protocols/gg/gg.c:2046
+#: ../libpurple/protocols/gg/gg.c:2044
 msgid "Load buddylist from file..."
 msgstr "�ncarc� lista de contacte din fi�ierul..."
 
@@ -3393,43 +3480,46 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2150
+#: ../libpurple/protocols/gg/gg.c:2148
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Modul de protocol Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2151
+#: ../libpurple/protocols/gg/gg.c:2149
 msgid "Polish popular IM"
 msgstr "Protocol popular 樽n Polonia"
 
-#: ../libpurple/protocols/gg/gg.c:2205
+#: ../libpurple/protocols/gg/gg.c:2203
 msgid "Gadu-Gadu User"
 msgstr "Utilizator Gadu-Gadu"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1573
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Comand� necunoscut�: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1281
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "topicul curent este: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1285
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "Nu exist� topic"
 
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "File Transfer Failed"
 msgstr "Transferul fi�ierului a e�uat"
 
@@ -3465,11 +3555,12 @@
 msgstr "Afi�are MOTD"
 
 #: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "C_hat:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:523
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
 msgid "_Password:"
 msgstr "_Parol�:"
 
@@ -3479,43 +3570,42 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1044
+#: ../libpurple/protocols/jabber/jabber.c:1046
 #: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1270
+#: ../libpurple/protocols/oscar/oscar.c:1288
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/simple/simple.c:1676
 #: ../libpurple/protocols/yahoo/yahoo.c:2762
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "Autentificare"
 
 #: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:599
-#: ../libpurple/protocols/jabber/jabber.c:946
+#: ../libpurple/protocols/jabber/jabber.c:603
+#: ../libpurple/protocols/jabber/jabber.c:950
 msgid "SSL support unavailable"
 msgstr "Suportul SSL nu este disponibil"
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1591
 msgid "Couldn't create socket"
 msgstr "Nu s-a putut crea un socket"
 
 #: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/jabber/jabber.c:466
-#: ../libpurple/protocols/oscar/oscar.c:1266
+#: ../libpurple/protocols/oscar/oscar.c:1284
 msgid "Couldn't connect to host"
 msgstr "Conectarea la server a e�uat"
 
 #: ../libpurple/protocols/irc/irc.c:438
-#: ../libpurple/protocols/jabber/jabber.c:495
+#: ../libpurple/protocols/jabber/jabber.c:499
 msgid "Connection Failed"
 msgstr "Conexiunea a e�uat"
 
 #: ../libpurple/protocols/irc/irc.c:441
-#: ../libpurple/protocols/jabber/jabber.c:498
+#: ../libpurple/protocols/jabber/jabber.c:502
 msgid "SSL Handshake Failed"
 msgstr "Conexiunea SSL a e�uat"
 
@@ -3524,16 +3614,19 @@
 msgstr "Eroare la citire"
 
 #: ../libpurple/protocols/irc/irc.c:775
-#: ../libpurple/protocols/silc/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
+#: ../libpurple/protocols/yahoo/yahoochat.c:1401
 msgid "Users"
 msgstr "Utilizatori"
 
 #: ../libpurple/protocols/irc/irc.c:778
-#: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1429
-#: ../libpurple/protocols/silc/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../libpurple/protocols/silc/chat.c:1415
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/chat.c:1429
+#: ../libpurple/protocols/silc10/ops.c:1382
+#: ../libpurple/protocols/yahoo/yahoochat.c:1410
 msgid "Topic"
 msgstr "Topic"
 
@@ -3545,55 +3638,65 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "IRC Protocol Plugin"
 msgstr "Modul de protocol IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:917
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Modul 樽mbun�t�釘it de protocol IRC"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
 #: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6583
+#: ../libpurple/protocols/oscar/oscar.c:6650
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5727
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1850
+#: ../libpurple/protocols/sametime/sametime.c:5728
+#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:1855
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6586
+#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6653
 #: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1866
+#: ../libpurple/protocols/sametime/sametime.c:5733
+#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:948
 msgid "Encodings"
 msgstr "Cod�ri"
 
-#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:799
+#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:803
 #: ../libpurple/protocols/silc/buddy.c:1539
-#: ../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:920
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../libpurple/protocols/silc/ops.c:1334
+#: ../libpurple/protocols/silc/ops.c:1337
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:916
 msgid "Username"
 msgstr "Nume utilizator"
 
-#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:924
+#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Nume real"
 
@@ -3601,7 +3704,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:961
+#: ../libpurple/protocols/irc/irc.c:962
 msgid "Use SSL"
 msgstr "Utilizare SSL"
 
@@ -3632,13 +3735,15 @@
 msgstr " <i>(identificat)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3689
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Pseudonim"
 
 #: ../libpurple/protocols/irc/msgs.c:329
-#: ../libpurple/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "Prezent 樽n"
 
@@ -3735,7 +3840,8 @@
 msgstr "A釘i fost dat afar� din %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Respins de %s: (%s)"
@@ -3793,7 +3899,8 @@
 msgstr "Nu s-a putut intra 樽n %s: E nevoie de 樽nregistrare"
 
 #: ../libpurple/protocols/irc/msgs.c:1111
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Nu s-a putut intra 樽n chat"
 
@@ -4060,8 +4167,8 @@
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
 "this and continue authentication?"
 msgstr ""
-"%s necesit� autentificare 樽n clar printr-o conexiune necriptat�. "
-"Permite釘i autentificarea 樽n aceste condi釘ii?"
+"%s necesit� autentificare 樽n clar printr-o conexiune necriptat�. Permite釘i "
+"autentificarea 樽n aceste condi釘ii?"
 
 #: ../libpurple/protocols/jabber/auth.c:296
 #: ../libpurple/protocols/jabber/auth.c:297
@@ -4107,110 +4214,115 @@
 msgstr "Eroare SASL"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:787
-#: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/sametime/sametime.c:4129
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Nume complet"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:800
-#: ../libpurple/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/jabber/buddy.c:838
+#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Nume de familie"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:804
+#: ../libpurple/protocols/jabber/buddy.c:842
 msgid "Given Name"
 msgstr "Prenume"
 
 #: ../libpurple/protocols/jabber/buddy.c:275
-#: ../libpurple/protocols/jabber/jabber.c:859
+#: ../libpurple/protocols/jabber/jabber.c:863
 msgid "URL"
 msgstr "Pagin� Internet"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Street Address"
 msgstr "Adres� local�"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:890
 msgid "Extended Address"
 msgstr "Adres� complet�"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:898
 msgid "Locality"
 msgstr "Localitate"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:902
 msgid "Region"
 msgstr "Regiune"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:868
+#: ../libpurple/protocols/jabber/buddy.c:906
 msgid "Postal Code"
 msgstr "Cod po�tal"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/silc/silc.c:930
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "鄭ar�"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:884
-#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:922
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Telephone"
 msgstr "Telefon"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:902
-#: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1591
-#: ../libpurple/protocols/silc/ops.c:1075
-#: ../libpurple/protocols/silc/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
+#: ../libpurple/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:948
+#: ../libpurple/protocols/jabber/buddy.c:1629
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "E-Mail"
 msgstr "Mail"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
 msgstr "Nume organiza釘ie"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:967
 msgid "Organization Unit"
 msgstr "Departament"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:976
 msgid "Role"
 msgstr "Func釘ie"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3738
+#: ../libpurple/protocols/oscar/oscar.c:3758
 msgid "Birthday"
 msgstr "Zi de na�tere"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3066
-#: ../pidgin/gtkprefs.c:680
+#: ../libpurple/protocols/jabber/buddy.c:979
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "Descriere"
 
-#: ../libpurple/protocols/jabber/buddy.c:578
-#: ../libpurple/protocols/jabber/buddy.c:579
+#: ../libpurple/protocols/jabber/buddy.c:582
+#: ../libpurple/protocols/jabber/buddy.c:583
 msgid "Edit XMPP vCard"
 msgstr "Editare vCard XMPP"
 
-#: ../libpurple/protocols/jabber/buddy.c:580
+#: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
@@ -4218,114 +4330,116 @@
 "To釘i itemii de mai jos sunt op釘ionali. Introduce釘i doar informa釘iile pe care "
 "dori釘i s� le face釘i publice."
 
-#: ../libpurple/protocols/jabber/buddy.c:651
-#: ../libpurple/protocols/jabber/buddy.c:692
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Client"
 msgstr "Client"
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:659
+#: ../libpurple/protocols/jabber/buddy.c:700
 msgid "Operating System"
 msgstr "Sistem de operare"
 
-#: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:198
-#: ../libpurple/protocols/jabber/si.c:850
+#: ../libpurple/protocols/jabber/buddy.c:669
+#: ../libpurple/protocols/jabber/libxmpp.c:202
+#: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr "Resurs�"
 
-#: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1245
-#: ../libpurple/protocols/jabber/jabber.c:1255
-#: ../libpurple/protocols/jabber/jabber.c:1265
-#: ../libpurple/protocols/jabber/jabber.c:1275
-#: ../libpurple/protocols/jabber/jabber.c:1285
+#: ../libpurple/protocols/jabber/buddy.c:671
+#: ../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:1283
 msgid "Priority"
 msgstr "Prioritate"
 
-#: ../libpurple/protocols/jabber/buddy.c:808
-#: ../libpurple/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/jabber/buddy.c:846
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Ini釘ial�"
 
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/jabber.c:834
-#: ../libpurple/protocols/oscar/oscar.c:3777
-#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/jabber.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3810
 #: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1064
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Adres�"
 
-#: ../libpurple/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:886
 msgid "P.O. Box"
 msgstr "C�su釘� po�tal�"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Photo"
 msgstr "Avatar"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Logo"
 msgstr "Sigl�"
 
-#: ../libpurple/protocols/jabber/buddy.c:1371
+#: ../libpurple/protocols/jabber/buddy.c:1409
 msgid "Un-hide From"
 msgstr "Arat�-m� din nou pentru"
 
-#: ../libpurple/protocols/jabber/buddy.c:1375
+#: ../libpurple/protocols/jabber/buddy.c:1413
 msgid "Temporarily Hide From"
 msgstr "Ascunde-m� temporar de"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1383
+#: ../libpurple/protocols/jabber/buddy.c:1421
 msgid "Cancel Presence Notification"
 msgstr "Anuleaz� notificarea prezen釘ei"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
+#: ../libpurple/protocols/jabber/buddy.c:1428
 msgid "(Re-)Request authorization"
 msgstr "Solicit (din nou) autorizare"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:1437
 msgid "Unsubscribe"
 msgstr "Desubscrie"
 
-#: ../libpurple/protocols/jabber/buddy.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/buddy.c:1470
+#: ../libpurple/protocols/jabber/jabber.c:1252
 msgid "Chatty"
 msgstr "Cu chef de vorb�"
 
-#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
+#: ../libpurple/protocols/jabber/buddy.c:1474
 msgid "Extended Away"
 msgstr "Demult absent"
 
-#: ../libpurple/protocols/jabber/buddy.c:1438
-#: ../libpurple/protocols/jabber/jabber.c:1284
-#: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:5720
-#: ../libpurple/protocols/sametime/sametime.c:3297
+#: ../libpurple/protocols/jabber/buddy.c:1476
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/oscar/oscar.c:727
+#: ../libpurple/protocols/oscar/oscar.c:5787
+#: ../libpurple/protocols/sametime/sametime.c:3298
 msgid "Do Not Disturb"
 msgstr "Nu deranja釘i"
 
-#: ../libpurple/protocols/jabber/buddy.c:1583
+#: ../libpurple/protocols/jabber/buddy.c:1621
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1587
-#: ../libpurple/protocols/jabber/buddy.c:1766
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/jabber/buddy.c:1625
+#: ../libpurple/protocols/jabber/buddy.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:3720
 msgid "Last Name"
 msgstr "Nume de familie"
 
-#: ../libpurple/protocols/jabber/buddy.c:1619
+#: ../libpurple/protocols/jabber/buddy.c:1657
 msgid "The following are the results of your search"
 msgstr "Acestea sunt rezultatele c�ut�rii:"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1732
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
@@ -4333,71 +4447,71 @@
 "C�uta釘i un contact prin introducerea unui criteriu de c�utare 樽n c但mpurile "
 "date. Not�: Fiecare c但mp suport� c�utare cu caractere de tip ��wildcard�� (%)"
 
-#: ../libpurple/protocols/jabber/buddy.c:1714
+#: ../libpurple/protocols/jabber/buddy.c:1752
 msgid "Directory Query Failed"
 msgstr "Interogarea directorului a e�uat"
 
-#: ../libpurple/protocols/jabber/buddy.c:1715
+#: ../libpurple/protocols/jabber/buddy.c:1753
 msgid "Could not query the directory server."
 msgstr "Nu s-a putut interoga serverul de directoare"
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1749
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Instruc釘iuni server: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 "Completa釘i unul sau mai multe c但mpuri pentru a specifica criterii de c�utare "
 "a utilizatorilor XMPP."
 
-#: ../libpurple/protocols/jabber/buddy.c:1776
+#: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3703
-#: ../libpurple/protocols/oscar/oscar.c:3712
+#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/oscar/oscar.c:3732
 msgid "E-Mail Address"
 msgstr "Adres� de mail"
 
-#: ../libpurple/protocols/jabber/buddy.c:1785
-#: ../libpurple/protocols/jabber/buddy.c:1786
+#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1824
 msgid "Search for XMPP users"
 msgstr "C�utare utilizator XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:1825
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:176
 #: ../libpurple/protocols/qq/sys_msg.c:253
 #: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5611
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "Caut�"
 
-#: ../libpurple/protocols/jabber/buddy.c:1802
+#: ../libpurple/protocols/jabber/buddy.c:1840
 msgid "Invalid Directory"
 msgstr "Director invalid"
 
-#: ../libpurple/protocols/jabber/buddy.c:1819
+#: ../libpurple/protocols/jabber/buddy.c:1857
 msgid "Enter a User Directory"
 msgstr "Introduce釘i un director cu utilizatori"
 
-#: ../libpurple/protocols/jabber/buddy.c:1820
+#: ../libpurple/protocols/jabber/buddy.c:1858
 msgid "Select a user directory to search"
 msgstr "Selecta釘i pentru interogare un director cu utilizatori"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1861
 msgid "Search Directory"
 msgstr "Caut� 樽n acest director"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5226
-#: ../libpurple/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/oscar/oscar.c:5273
+#: ../libpurple/protocols/yahoo/yahoochat.c:962
 msgid "_Room:"
 msgstr "Ca_mer�:"
 
@@ -4466,7 +4580,8 @@
 
 #: ../libpurple/protocols/jabber/chat.c:678
 #: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Eroare la ob釘inerea listei camerelor de chat"
 
@@ -4501,141 +4616,160 @@
 msgid "Read Error"
 msgstr "Eroare la citire"
 
-#: ../libpurple/protocols/jabber/jabber.c:519
+#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/yahoo/yahoo.c:2381
+#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"Nu s-a putut face o conexiune cu serverul:\n"
+"%s"
+
+#: ../libpurple/protocols/jabber/jabber.c:523
 msgid "Unable to create socket"
 msgstr "Nu se poate crea un socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:564
-#: ../libpurple/protocols/jabber/jabber.c:914
+#: ../libpurple/protocols/jabber/jabber.c:568
+#: ../libpurple/protocols/jabber/jabber.c:918
 msgid "Invalid XMPP ID"
 msgstr "ID XMPP invalid"
 
-#: ../libpurple/protocols/jabber/jabber.c:569
+#: ../libpurple/protocols/jabber/jabber.c:573
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "ID XMPP invalid. Trebuie precizat domeniul."
 
-#: ../libpurple/protocols/jabber/jabber.c:640
+#: ../libpurple/protocols/jabber/jabber.c:644
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "�nregistrarea %s@%s a reu�it"
 
-#: ../libpurple/protocols/jabber/jabber.c:642
-#: ../libpurple/protocols/jabber/jabber.c:643
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Successful"
 msgstr "�nregistrare reu�it�"
 
-#: ../libpurple/protocols/jabber/jabber.c:649
+#: ../libpurple/protocols/jabber/jabber.c:653
 #: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "Eroare necunoscut�"
 
-#: ../libpurple/protocols/jabber/jabber.c:651
-#: ../libpurple/protocols/jabber/jabber.c:652
+#: ../libpurple/protocols/jabber/jabber.c:655
+#: ../libpurple/protocols/jabber/jabber.c:656
 msgid "Registration Failed"
 msgstr "�nregistrare e�uat�"
 
-#: ../libpurple/protocols/jabber/jabber.c:767
-#: ../libpurple/protocols/jabber/jabber.c:768
+#: ../libpurple/protocols/jabber/jabber.c:771
+#: ../libpurple/protocols/jabber/jabber.c:772
 msgid "Already Registered"
 msgstr "Este deja 樽nregistrat"
 
-#: ../libpurple/protocols/jabber/jabber.c:844
-#: ../libpurple/protocols/oscar/oscar.c:3779
-#: ../libpurple/protocols/oscar/oscar.c:3792
+#: ../libpurple/protocols/jabber/jabber.c:848
+#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3812
 msgid "State"
 msgstr "Stat"
 
-#: ../libpurple/protocols/jabber/jabber.c:849
+#: ../libpurple/protocols/jabber/jabber.c:853
 msgid "Postal code"
 msgstr "Cod po�tal"
 
-#: ../libpurple/protocols/jabber/jabber.c:854
-#: ../libpurple/protocols/silc/ops.c:1069
-#: ../libpurple/protocols/silc/silc.c:687
-#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:772
+#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Date"
 msgstr "Dat�"
 
-#: ../libpurple/protocols/jabber/jabber.c:872
+#: ../libpurple/protocols/jabber/jabber.c:876
 msgid "Please fill out the information below to register your new account."
 msgstr "Completa釘i informa釘iile de mai jos pentru 樽nregistrarea unui nou cont."
 
-#: ../libpurple/protocols/jabber/jabber.c:875
-#: ../libpurple/protocols/jabber/jabber.c:876
+#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/jabber/jabber.c:880
 msgid "Register New XMPP Account"
 msgstr "�nregistrare cont nou XMPP"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:877 ../pidgin/gtkaccount.c:1525
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1518
 msgid "Register"
 msgstr "�nregistrare cont"
 
-#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/jabber/jabber.c:1050
 msgid "Initializing Stream"
 msgstr "Ini釘ializare flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1053
+#: ../libpurple/protocols/jabber/jabber.c:1055
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Autentificare"
 
-#: ../libpurple/protocols/jabber/jabber.c:1062
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Re-initializing Stream"
 msgstr "Reini釘ializare flux"
 
-#: ../libpurple/protocols/jabber/jabber.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:1126
 #: ../libpurple/protocols/jabber/jabber.c:1502
 #: ../libpurple/protocols/jabber/jabber.c:1543
 #: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:5514
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:5581
 msgid "Not Authorized"
 msgstr "Neautorizat(�)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1170
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "Both"
 msgstr "Ambele"
 
+#: ../libpurple/protocols/jabber/jabber.c:1170
+msgid "From (To pending)"
+msgstr "Expeditor (樽n a�teptare)"
+
 #: ../libpurple/protocols/jabber/jabber.c:1172
-msgid "From (To pending)"
-msgstr "Expeditor (樽n a�teptare)"
-
-#: ../libpurple/protocols/jabber/jabber.c:1177
+msgid "From"
+msgstr "Expeditor"
+
+#: ../libpurple/protocols/jabber/jabber.c:1175
 msgid "To"
 msgstr "Destinatar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "None (To pending)"
 msgstr "Niciunul (樽n a�teptare)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1181
+#: ../libpurple/protocols/jabber/jabber.c:1179
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "F�r�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1184
+#: ../libpurple/protocols/jabber/jabber.c:1182
 msgid "Subscription"
 msgstr "Subscriere"
 
-#: ../libpurple/protocols/jabber/jabber.c:1314
+#: ../libpurple/protocols/jabber/jabber.c:1312
 msgid "Password Changed"
 msgstr "Parola a fost schimbat�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1315
+#: ../libpurple/protocols/jabber/jabber.c:1313
 msgid "Your password has been changed."
 msgstr "Parola v-a fost schimbat�."
 
-#: ../libpurple/protocols/jabber/jabber.c:1319
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1317
+#: ../libpurple/protocols/jabber/jabber.c:1318
 msgid "Error changing password"
 msgstr "Eroare la schimbarea parolei"
 
-#: ../libpurple/protocols/jabber/jabber.c:1376
+#: ../libpurple/protocols/jabber/jabber.c:1375
 msgid "Password (again)"
 msgstr "Confirmare parol�"
 
@@ -4649,15 +4783,17 @@
 msgstr "Introduce釘i noua parol�"
 
 #: ../libpurple/protocols/jabber/jabber.c:1394
-#: ../libpurple/protocols/oscar/oscar.c:6300
-#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Setare detalii..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
 #: ../libpurple/protocols/jabber/jabber.c:1399
-#: ../libpurple/protocols/oscar/oscar.c:6311
-#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Schimbare parol�..."
 
@@ -4784,7 +4920,8 @@
 msgstr "Conflict de resurse"
 
 #: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Conexiunea a expirat"
 
@@ -4964,32 +5101,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:166
-#: ../libpurple/protocols/jabber/libxmpp.c:168
+#: ../libpurple/protocols/jabber/libxmpp.c:169
+#: ../libpurple/protocols/jabber/libxmpp.c:171
 msgid "XMPP Protocol Plugin"
 msgstr "Modul de protocol XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:505
+#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
 msgid "Domain"
 msgstr "Domeniu"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:201
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Force old (port 5223) SSL"
 msgstr "Impune utilizarea versiunii vechi de SSL (pe portul 5223)"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:211
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Permite autentificarea 樽n clar prin conexiuni necriptate"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
-#: ../libpurple/protocols/simple/simple.c:1856
+#: ../libpurple/protocols/jabber/libxmpp.c:216
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Connect port"
 msgstr "Port de conectare"
 
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:215
-#: ../libpurple/protocols/silc/silc.c:1862 ../pidgin/gtkaccount.c:834
+#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/silc/silc.c:1914
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Server de conectare"
 
@@ -5031,16 +5169,16 @@
 msgid "XML Parse error"
 msgstr "Eroare la analiza XML"
 
-#: ../libpurple/protocols/jabber/presence.c:279
+#: ../libpurple/protocols/jabber/presence.c:290
 msgid "Unknown Error in presence"
 msgstr "Eroare necunoscut� 樽n starea de prezen釘�"
 
-#: ../libpurple/protocols/jabber/presence.c:353
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:364
+#: ../libpurple/protocols/jabber/presence.c:365
 msgid "Create New Room"
 msgstr "Creeaz� o nou� camer� de chat"
 
-#: ../libpurple/protocols/jabber/presence.c:355
+#: ../libpurple/protocols/jabber/presence.c:366
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5048,56 +5186,58 @@
 "Sunte釘i pe cale s� crea釘i o nou� camer� de chat. Dori釘i s� o configura釘i sau "
 "accepta釘i set�rile implicite?"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:372
 msgid "_Configure Room"
 msgstr "_Configurare camer� de chat"
 
-#: ../libpurple/protocols/jabber/presence.c:362
+#: ../libpurple/protocols/jabber/presence.c:373
 msgid "_Accept Defaults"
 msgstr "_Set�ri implicite"
 
-#: ../libpurple/protocols/jabber/presence.c:399
+#: ../libpurple/protocols/jabber/presence.c:409
 #, c-format
 msgid "Error in chat %s"
 msgstr "Eroare 樽n camera de chat %s"
 
-#: ../libpurple/protocols/jabber/presence.c:402
+#: ../libpurple/protocols/jabber/presence.c:412
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Eroare la intrarea 樽n camera de chat %s"
 
-#: ../libpurple/protocols/jabber/si.c:766
+#: ../libpurple/protocols/jabber/si.c:769
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
-msgstr "Nu se poate trimite fi�ierul c�tre %s, nu suport� transferul de fi�iere"
-
-#: ../libpurple/protocols/jabber/si.c:767
-#: ../libpurple/protocols/jabber/si.c:768
-#: ../libpurple/protocols/jabber/si.c:836
+msgstr ""
+"Nu se poate trimite fi�ierul c�tre %s, nu suport� transferul de fi�iere"
+
+#: ../libpurple/protocols/jabber/si.c:770
+#: ../libpurple/protocols/jabber/si.c:771
+#: ../libpurple/protocols/jabber/si.c:839
 msgid "File Send Failed"
 msgstr "Trimiterea fi�ierului a e�uat"
 
-#: ../libpurple/protocols/jabber/si.c:829
+#: ../libpurple/protocols/jabber/si.c:832
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
 msgstr "Nu se poate trimite fi�ierul c�tre %s, JID invalid"
 
-#: ../libpurple/protocols/jabber/si.c:831
+#: ../libpurple/protocols/jabber/si.c:834
 #, c-format
 msgid "Unable to send file to %s, user is not online"
 msgstr "Nu se poate trimite fi�ierul c�tre %s, contactul nu este conectat"
 
-#: ../libpurple/protocols/jabber/si.c:833
+#: ../libpurple/protocols/jabber/si.c:836
 #, c-format
 msgid "Unable to send file to %s, not subscribed to user presence"
 msgstr "Nu se poate trimite fi�ierul c�tre %s, nu e subscris pentru prezen釘�"
 
-#: ../libpurple/protocols/jabber/si.c:848
+#: ../libpurple/protocols/jabber/si.c:851
 #, c-format
 msgid "Please select which resource of %s you would like to send a file to"
-msgstr "Preciza釘i c�rei resurse a contactului %s dori釘i s�-i trimite釘i fi�ierul"
-
-#: ../libpurple/protocols/jabber/si.c:864
+msgstr ""
+"Preciza釘i c�rei resurse a contactului %s dori釘i s�-i trimite釘i fi�ierul"
+
+#: ../libpurple/protocols/jabber/si.c:867
 msgid "Select a Resource"
 msgstr "Selecta釘i o resurs�"
 
@@ -5317,9 +5457,10 @@
 msgstr "Server prea 樽nc�rcat"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1363
-#: ../libpurple/protocols/silc/ops.c:1718 ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1363
+#: ../libpurple/protocols/oscar/oscar.c:1381
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
 msgid "Authentication failed"
 msgstr "Autentificare e�uat�"
 
@@ -5427,7 +5568,9 @@
 #: ../libpurple/protocols/novell/novell.c:2822
 #: ../libpurple/protocols/novell/novell.c:2952
 #: ../libpurple/protocols/silc/buddy.c:1480
-#: ../libpurple/protocols/silc/silc.c:47
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
 #: ../libpurple/protocols/yahoo/yahoo.c:2897
 #: ../libpurple/protocols/yahoo/yahoo.c:3507
 msgid "Busy"
@@ -5492,32 +5635,32 @@
 msgstr "Conectarea la server a e�uat."
 
 #: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Eroare la desc�rcarea profilului"
 
 #: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:448
+#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "Generale"
 
 #: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3744
+#: ../libpurple/protocols/oscar/oscar.c:3764
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "V但rst�"
 
 #: ../libpurple/protocols/msn/msn.c:1559
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Ocupa釘ie"
 
 #: ../libpurple/protocols/msn/msn.c:1560
 #: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
@@ -5539,7 +5682,7 @@
 msgstr "Social"
 
 #: ../libpurple/protocols/msn/msn.c:1590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Status marital"
 
@@ -5573,7 +5716,7 @@
 
 #: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
 #: ../libpurple/protocols/msn/msn.c:1785
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Citat preferat"
 
@@ -5598,7 +5741,7 @@
 msgstr "Telefon acas� 2"
 
 #: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Home Address"
 msgstr "Adres� acas�"
 
@@ -5628,12 +5771,13 @@
 msgstr "Serviciu"
 
 #: ../libpurple/protocols/msn/msn.c:1646
-#: ../libpurple/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Titlu"
 
 #: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3823
 msgid "Company"
 msgstr "Companie"
 
@@ -5655,7 +5799,7 @@
 msgstr "Telefon serviciu 2"
 
 #: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/oscar/oscar.c:3815
 msgid "Work Address"
 msgstr "Adres� serviciu"
 
@@ -5694,7 +5838,8 @@
 
 #: ../libpurple/protocols/msn/msn.c:1804
 #: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Pagin� personal�"
 
@@ -5721,7 +5866,7 @@
 "utilizatorul nu exist�."
 
 #: ../libpurple/protocols/msn/msn.c:1841
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Adres� profil"
 
@@ -5766,8 +5911,8 @@
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoochat.c:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Unable to connect"
 msgstr "Conectare e�uat�"
 
@@ -5816,15 +5961,15 @@
 msgid "Service Temporarily Unavailable."
 msgstr "Serviciu temporar indisponibil."
 
-#: ../libpurple/protocols/msn/notification.c:840
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "Grupul nu poate fi redenumit"
 
-#: ../libpurple/protocols/msn/notification.c:895
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "Grupul nu poate fi �ters"
 
-#: ../libpurple/protocols/msn/notification.c:1314
+#: ../libpurple/protocols/msn/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -5883,7 +6028,7 @@
 msgstr "Eroare la prelucrarea datelor HTTP."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3456
+#: ../libpurple/protocols/oscar/flap_connection.c:384
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "V-a釘i autentificat de la o alt� loca釘ie."
@@ -5963,12 +6108,12 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
-"Message could not be sent because we wer unable to establish a session with "
+"Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
 "Mesajul nu a putut fi trimis deoarece nu s-a putut deschide o sesiune de "
 "comunicare cu serverul. Aceasta este probabil o problem� de server, "
-"re樽ncerca釘i 樽n c但teva minute."
+"re樽ncerca釘i 樽n c但teva minute:"
 
 #: ../libpurple/protocols/msn/switchboard.c:431
 msgid ""
@@ -6246,7 +6391,7 @@
 msgstr "Mailstop"
 
 #: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4122
+#: ../libpurple/protocols/sametime/sametime.c:4123
 msgid "User ID"
 msgstr "ID utilizator"
 
@@ -6360,7 +6505,7 @@
 msgid "Server port"
 msgstr "Port server"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:379
+#: ../libpurple/protocols/oscar/flap_connection.c:387
 #: ../libpurple/protocols/yahoo/yahoo.c:2292
 #: ../libpurple/protocols/yahoo/yahoo.c:2459
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
@@ -6369,7 +6514,7 @@
 msgid "Server closed the connection."
 msgstr "Serverul a 樽nchis conexiunea."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:381
+#: ../libpurple/protocols/oscar/flap_connection.c:389
 #: ../libpurple/protocols/yahoo/yahoo.c:2286
 #: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
@@ -6382,24 +6527,13 @@
 "S-a pierdut conexiunea cu serverul:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/oscar/flap_connection.c:392
 #: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
 #: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
 #: ../libpurple/proxy.c:1461
 msgid "Received invalid data on connection with server."
 msgstr "S-au primit date invalide de la server."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:386
-#: ../libpurple/protocols/yahoo/yahoo.c:2381
-#: ../libpurple/protocols/yahoo/yahoo.c:2413
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"Nu s-a putut face o conexiune cu serverul:\n"
-"%s"
-
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6562,7 +6696,7 @@
 msgid "Not while on AOL"
 msgstr "Nu (c但t timp e pe AOL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:330
+#: ../libpurple/protocols/oscar/oscar.c:348
 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 "
@@ -6574,7 +6708,7 @@
 "codare este aceasta, o pute釘i specifica 樽n op釘iunile avansate ale contului "
 "AIM/ICQ utilizat.)"
 
-#: ../libpurple/protocols/oscar/oscar.c:439
+#: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6584,144 +6718,146 @@
 "potrive�te cu cea aleas� de %s sau %s utilizeaz� un client problematic)."
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2309
-#: ../pidgin/gtkutils.c:2339
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2363
+#: ../pidgin/gtkutils.c:2393
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "Avatar"
 
-#: ../libpurple/protocols/oscar/oscar.c:624
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "Voce"
 
-#: ../libpurple/protocols/oscar/oscar.c:627
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "Discu釘ie direct� AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:630
-#: ../libpurple/protocols/silc/silc.c:683
-#: ../libpurple/protocols/silc/util.c:549
+#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/silc/silc.c:768
+#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Chat"
 
-#: ../libpurple/protocols/oscar/oscar.c:633
-#: ../libpurple/protocols/oscar/oscar.c:5922
+#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get File"
 msgstr "Ia fi�ierul"
 
-#: ../libpurple/protocols/oscar/oscar.c:640
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "Jocuri"
 
-#: ../libpurple/protocols/oscar/oscar.c:643
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "Ad�ugiri"
 
-#: ../libpurple/protocols/oscar/oscar.c:646
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "Trimite lista de contacte"
 
-#: ../libpurple/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "Conectare direct� ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "Utilizator AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:655
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "RTF ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr "Schimb de server ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr "UTF8 ICQ (vechi)"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
 msgstr "Criptare Trillian"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr "UTF8 ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr "Securitate activat�"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
+#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "Videochat"
 
-#: ../libpurple/protocols/oscar/oscar.c:683
+#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:686
+#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "Video 樽n direct"
 
-#: ../libpurple/protocols/oscar/oscar.c:689
+#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "Camer�"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
-#: ../libpurple/protocols/oscar/oscar.c:5692
+#: ../libpurple/protocols/oscar/oscar.c:725
+#: ../libpurple/protocols/oscar/oscar.c:5759
 msgid "Free For Chat"
 msgstr "Disponibil(�)"
 
-#: ../libpurple/protocols/oscar/oscar.c:711
-#: ../libpurple/protocols/oscar/oscar.c:5727
+#: ../libpurple/protocols/oscar/oscar.c:729
+#: ../libpurple/protocols/oscar/oscar.c:5794
 msgid "Not Available"
 msgstr "Indisponibil(�)"
 
-#: ../libpurple/protocols/oscar/oscar.c:713
-#: ../libpurple/protocols/oscar/oscar.c:5713
+#: ../libpurple/protocols/oscar/oscar.c:731
+#: ../libpurple/protocols/oscar/oscar.c:5780
 msgid "Occupied"
 msgstr "Ocupat(�)"
 
-#: ../libpurple/protocols/oscar/oscar.c:717
+#: ../libpurple/protocols/oscar/oscar.c:735
 msgid "Web Aware"
 msgstr "Prezent(�) online"
 
-#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
 msgid "Invisible"
 msgstr "Invizibil(�)"
 
-#: ../libpurple/protocols/oscar/oscar.c:721
+#: ../libpurple/protocols/oscar/oscar.c:739
 msgid "Online"
 msgstr "Conectat(�)"
 
-#: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:3696
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1052
+#: ../libpurple/protocols/oscar/oscar.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3716
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1121
 msgid "IP Address"
 msgstr "Adres� IP"
 
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2848
+#: ../libpurple/protocols/oscar/oscar.c:845
+#: ../libpurple/protocols/oscar/oscar.c:2863
 msgid "Warning Level"
 msgstr "Nivel de avertizare"
 
-#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "Comentariu contact"
 
-#: ../libpurple/protocols/oscar/oscar.c:977
+#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6730,7 +6866,7 @@
 "Conectarea pentru serverul de autentificare a e�uat:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:985
+#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6739,53 +6875,54 @@
 "Conectarea la serverul BOS a e�uat:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1025
+#: ../libpurple/protocols/oscar/oscar.c:1043
 msgid "Screen name sent"
 msgstr "Numele de identificare a fost trimis"
 
-#: ../libpurple/protocols/oscar/oscar.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr "Conexiune ini釘ializat�, cookie trimis"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1059
+#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr "Finalizare conexiune"
 
-#: ../libpurple/protocols/oscar/oscar.c:1243
+#: ../libpurple/protocols/oscar/oscar.c:1261
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-"Autentificarea pentru %s a e�uat deoarece numele de identificare este "
-"invalid. Un nume valid trebuie ori s� 樽nceap� cu o liter�, ori s� con釘in� "
-"doar litere, numere �i spa釘ii, ori s� con釘in� doar numere."
-
-#: ../libpurple/protocols/oscar/oscar.c:1328
+"invalid.  Screen names must be a valid email address, or start with a letter "
+"and contain only letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"Eroare la autentificare: autentificarea pentru %s a e�uat deoarece numele "
+"de identificare este invalid. Un nume valid trebuie s� fie o adres� de mail "
+"sau s� 樽nceap� cu o liter� �i s� con釘in� doar litere, numere �i spa釘ii sau "
+"s� con釘in� doar numere."
+
+#: ../libpurple/protocols/oscar/oscar.c:1346
 #: ../libpurple/protocols/yahoo/yahoo.c:1934
 msgid "Invalid screen name."
 msgstr "Nume de identificare invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:1335
+#: ../libpurple/protocols/oscar/oscar.c:1353
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1037
+#: ../libpurple/protocols/simple/simple.c:1039
 #: ../libpurple/protocols/yahoo/yahoo.c:1952
 msgid "Incorrect password."
 msgstr "Parol� incorect�."
 
-#: ../libpurple/protocols/oscar/oscar.c:1340
+#: ../libpurple/protocols/oscar/oscar.c:1358
 msgid "Your account is currently suspended."
 msgstr "Contul dumneavoastr� este momentan suspendat."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1344
+#: ../libpurple/protocols/oscar/oscar.c:1362
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Serviciul de mesagerie instant AOL este temporar indisponibil."
 
-#: ../libpurple/protocols/oscar/oscar.c:1349
-#: ../libpurple/protocols/oscar/oscar.c:1360
+#: ../libpurple/protocols/oscar/oscar.c:1367
+#: ../libpurple/protocols/oscar/oscar.c:1378
 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."
@@ -6793,44 +6930,44 @@
 "V-a釘i conectat �i deconectat prea des. A�tepta釘i zece minute �i 樽ncerca釘i "
 "din nou. Dac� continua釘i s� 樽ncerca釘i, va trebui s� a�tepta釘i mai mult."
 
-#: ../libpurple/protocols/oscar/oscar.c:1354
+#: ../libpurple/protocols/oscar/oscar.c:1372
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Versiunea clientului folosit este prea veche. Actualiza釘i-l la %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:1411
 msgid "Could Not Connect"
 msgstr "Conectare e�uat�"
 
-#: ../libpurple/protocols/oscar/oscar.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:1415
 msgid "Received authorization"
 msgstr "Autorizarea a fost primit�"
 
-#: ../libpurple/protocols/oscar/oscar.c:1422
+#: ../libpurple/protocols/oscar/oscar.c:1437
 msgid "The SecurID key entered is invalid."
 msgstr "Cheia SecurID introdus� este invalid�."
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1450
 msgid "Enter SecurID"
 msgstr "Introducere SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1437
+#: ../libpurple/protocols/oscar/oscar.c:1451
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Introduce釘i num�rul de �ase cifre afi�at digital."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1439
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2279
-#: ../libpurple/protocols/oscar/oscar.c:5797
-#: ../libpurple/protocols/oscar/oscar.c:6078 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1453
+#: ../libpurple/protocols/oscar/oscar.c:2246
+#: ../libpurple/protocols/oscar/oscar.c:2293
+#: ../libpurple/protocols/oscar/oscar.c:5864
+#: ../libpurple/protocols/oscar/oscar.c:6145 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1478
-#: ../libpurple/protocols/oscar/oscar.c:1521
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6839,57 +6976,57 @@
 "S-ar putea s� fi釘i rapid deconectat(�). Poate dori釘i s� 樽ncerca釘i TOC p但n� "
 "ce se rezolv� aceast� problem�. Vizita釘i %s pentru actualiz�ri."
 
-#: ../libpurple/protocols/oscar/oscar.c:1481
-#: ../libpurple/protocols/oscar/oscar.c:1524
+#: ../libpurple/protocols/oscar/oscar.c:1495
+#: ../libpurple/protocols/oscar/oscar.c:1538
 msgid "Unable to get a valid AIM login hash."
 msgstr "Nu s-a putut ob釘ine un hash valid pentru autentificarea AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:1609
+#: ../libpurple/protocols/oscar/oscar.c:1623
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "S-ar putea s� fi釘i 樽n scurt timp deconectat(�). Vizita釘i %s pentru "
 "actualiz�ri."
 
-#: ../libpurple/protocols/oscar/oscar.c:1612
+#: ../libpurple/protocols/oscar/oscar.c:1626
 msgid "Unable to get a valid login hash."
 msgstr "Nu s-a putut ob釘ine un hash valid pentru autentificare."
 
-#: ../libpurple/protocols/oscar/oscar.c:1641
+#: ../libpurple/protocols/oscar/oscar.c:1655
 msgid "Password sent"
 msgstr "Parola a fost trimis�"
 
-#: ../libpurple/protocols/oscar/oscar.c:1697
+#: ../libpurple/protocols/oscar/oscar.c:1711
 msgid "Unable to initialize connection"
 msgstr "Nu se poate ini釘ializa o nou� conexiune"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2216
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 "Am nevoie de autorizarea ta pentru a te putea ad�uga apoi 樽n lista mea de "
 "contacte."
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2244
 msgid "Authorization Request Message:"
 msgstr "Mesaj cerere de autorizare:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2245
 msgid "Please authorize me!"
 msgstr "Am nevoie de autorizare..."
 
-#: ../libpurple/protocols/oscar/oscar.c:2271
-#: ../libpurple/protocols/oscar/oscar.c:2278
-#: ../libpurple/protocols/oscar/oscar.c:2405
-#: ../libpurple/protocols/oscar/oscar.c:5195
+#: ../libpurple/protocols/oscar/oscar.c:2285
+#: ../libpurple/protocols/oscar/oscar.c:2292
+#: ../libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:5242
 #: ../libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "F�r� motiv."
 
-#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:2291
 msgid "Authorization Denied Message:"
 msgstr "Mesajul de autorizare refuzat�:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6900,18 +7037,18 @@
 "motiv但nd astfel:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2406
+#: ../libpurple/protocols/oscar/oscar.c:2420
 msgid "ICQ authorization denied."
 msgstr "Autorizarea ICQ a fost refuzat�."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "Utilizatorul %u v-a acordat dreptul de a-l ad�uga la lista de contacte."
 
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6924,7 +7061,7 @@
 "Expeditor: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2429
+#: ../libpurple/protocols/oscar/oscar.c:2443
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6937,7 +7074,7 @@
 "Expeditor: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2437
+#: ../libpurple/protocols/oscar/oscar.c:2451
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6950,24 +7087,24 @@
 "Mesajul este:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2458
+#: ../libpurple/protocols/oscar/oscar.c:2472
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "Utilizatorul ICQ %u v-a trimis un contact: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2464
+#: ../libpurple/protocols/oscar/oscar.c:2478
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Dori釘i s� ad�uga釘i acest contact 樽n lista de contacte?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2469 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2483 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_Adaug�"
 
-#: ../libpurple/protocols/oscar/oscar.c:2470
+#: ../libpurple/protocols/oscar/oscar.c:2484
 msgid "_Decline"
 msgstr "_Refuz"
 
-#: ../libpurple/protocols/oscar/oscar.c:2554
+#: ../libpurple/protocols/oscar/oscar.c:2568
 #, 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."
@@ -6975,7 +7112,7 @@
 msgstr[1] "A釘i pierdut %hu mesaje de la %s deoarece erau invalide."
 msgstr[2] "A釘i pierdut %hu de mesaje de la %s deoarece erau invalide."
 
-#: ../libpurple/protocols/oscar/oscar.c:2563
+#: ../libpurple/protocols/oscar/oscar.c:2577
 #, 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."
@@ -6983,7 +7120,7 @@
 msgstr[1] "A釘i pierdut %hu mesaje de la %s pentru c� erau prea mari."
 msgstr[2] "A釘i pierdut %hu de mesaje de la %s pentru c� erau prea mari."
 
-#: ../libpurple/protocols/oscar/oscar.c:2572
+#: ../libpurple/protocols/oscar/oscar.c:2586
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6994,7 +7131,7 @@
 msgstr[2] ""
 "A釘i pierdut %hu de mesaje de la %s pentru c� au dep��it limita fixat�."
 
-#: ../libpurple/protocols/oscar/oscar.c:2581
+#: ../libpurple/protocols/oscar/oscar.c:2595
 #, 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."
@@ -7005,7 +7142,7 @@
 msgstr[2] ""
 "A釘i pierdut %hu de mesaje de la %s pentru c� expeditorul era prea periculos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2590
+#: ../libpurple/protocols/oscar/oscar.c:2604
 #, 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."
@@ -7014,7 +7151,7 @@
 msgstr[2] ""
 "A釘i pierdut %hu de mesaje de la %s pentru c� a釘i fost prea periculos."
 
-#: ../libpurple/protocols/oscar/oscar.c:2599
+#: ../libpurple/protocols/oscar/oscar.c:2613
 #, 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."
@@ -7023,61 +7160,55 @@
 msgstr[2] "A釘i pierdut %hu de mesaje de la %s din motive necunoscute."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2754
+#: ../libpurple/protocols/oscar/oscar.c:2768
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Mesajul nu poate fi trimis: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2754
-#: ../libpurple/protocols/oscar/oscar.c:2759
-#: ../libpurple/protocols/oscar/oscar.c:2821
-#: ../libpurple/protocols/oscar/oscar.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2768
+#: ../libpurple/protocols/oscar/oscar.c:2773
+#: ../libpurple/protocols/oscar/oscar.c:2837
 msgid "Unknown reason."
 msgstr "Motiv necunoscut."
 
-#: ../libpurple/protocols/oscar/oscar.c:2757
+#: ../libpurple/protocols/oscar/oscar.c:2771
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Nu se poate trimite mesajul c�tre %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2821
+#: ../libpurple/protocols/oscar/oscar.c:2837
 #, c-format
 msgid "User information not available: %s"
 msgstr "Detaliile utilizatorului nu sunt disponibile: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2824
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "Detaliile utilizatorului %s nu sunt disponibile:"
-
-#: ../libpurple/protocols/oscar/oscar.c:2853
+#: ../libpurple/protocols/oscar/oscar.c:2868
 msgid "Online Since"
 msgstr "Conectat(�) din"
 
-#: ../libpurple/protocols/oscar/oscar.c:2858
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2873
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Membru din"
 
-#: ../libpurple/protocols/oscar/oscar.c:2863
+#: ../libpurple/protocols/oscar/oscar.c:2878
 msgid "Capabilities"
 msgstr "Facilit�釘i"
 
-#: ../libpurple/protocols/oscar/oscar.c:2893
+#: ../libpurple/protocols/oscar/oscar.c:2908
 msgid "Available Message"
 msgstr "Mesaj ce arat� disponibilitatea"
 
-#: ../libpurple/protocols/oscar/oscar.c:2919
+#: ../libpurple/protocols/oscar/oscar.c:2936
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/oscar/oscar.c:2996
+#: ../libpurple/protocols/oscar/oscar.c:3016
 msgid "Your AIM connection may be lost."
 msgstr "S-ar putea s� fi pierdut conexiunea AIM."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3183
+#: ../libpurple/protocols/oscar/oscar.c:3204
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7085,7 +7216,7 @@
 "[Nu se poate afi�a mesajul acestui utilizator deoarece con釘ine caractere "
 "invalide]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3386
+#: ../libpurple/protocols/oscar/oscar.c:3407
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7093,56 +7224,53 @@
 "Ultima ac釘iune cerut� nu a fost 樽ndeplinit� pentru c� a釘i dep��it limitarea "
 "fixat�. A�tepta釘i 10 secunde �i 樽ncerca釘i din nou."
 
-#: ../libpurple/protocols/oscar/oscar.c:3458
-msgid "You have been signed off for an unknown reason."
-msgstr "A釘i fost deconectat(�) din motive necunoscute."
-
-#: ../libpurple/protocols/oscar/oscar.c:3471
+#: ../libpurple/protocols/oscar/oscar.c:3490
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "A釘i fost deconectat(�) din camera de chat %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3718
-#: ../libpurple/protocols/silc/util.c:581
+#: ../libpurple/protocols/oscar/oscar.c:3738
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Telefon mobil"
 
-#: ../libpurple/protocols/oscar/oscar.c:3748
+#: ../libpurple/protocols/oscar/oscar.c:3768
 msgid "Personal Web Page"
 msgstr "Pagin� personal�"
 
-#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3792
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Alte informa釘ii"
 
-#: ../libpurple/protocols/oscar/oscar.c:3780
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3813
 msgid "Zip Code"
 msgstr "Cod po�tal"
 
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3824
 msgid "Division"
 msgstr "Departament"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3825
 msgid "Position"
 msgstr "Pozi釘ie"
 
-#: ../libpurple/protocols/oscar/oscar.c:3807
+#: ../libpurple/protocols/oscar/oscar.c:3827
 msgid "Web Page"
 msgstr "Adres� Internet"
 
-#: ../libpurple/protocols/oscar/oscar.c:3810
+#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Work Information"
 msgstr "Informa釘ii serviciu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3866
+#: ../libpurple/protocols/oscar/oscar.c:3886
 msgid "Pop-Up Message"
 msgstr "Mesaj popup"
 
-#: ../libpurple/protocols/oscar/oscar.c:3906
+#: ../libpurple/protocols/oscar/oscar.c:3926
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
@@ -7150,29 +7278,29 @@
 msgstr[1] "Urm�toarele nume de identificare sunt asociate cu %s:"
 msgstr[2] "Urm�toarele nume de identificare sunt asociate cu %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/oscar/oscar.c:3931
 msgid "Screen name"
 msgstr "Nume de identificare"
 
-#: ../libpurple/protocols/oscar/oscar.c:3937
+#: ../libpurple/protocols/oscar/oscar.c:3957
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Nu s-a g�sit nici un rezultat pentru adresa de mail %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3978
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Ar trebui s� primi釘i un mail care s� v� cear� confirmarea %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3960
+#: ../libpurple/protocols/oscar/oscar.c:3980
 msgid "Account Confirmation Requested"
 msgstr "Vi s-a cerut confirmarea contului"
 
-#: ../libpurple/protocols/oscar/oscar.c:3991
+#: ../libpurple/protocols/oscar/oscar.c:4011
 msgid "Error Changing Account Info"
 msgstr "Eroare la schimbarea detaliilor contului"
 
-#: ../libpurple/protocols/oscar/oscar.c:3994
+#: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7181,14 +7309,14 @@
 "Eroare 0x%04x: Nu se poate formata numele de identificare pentru c� numele "
 "cerut este diferit de cel original."
 
-#: ../libpurple/protocols/oscar/oscar.c:3997
+#: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Eroare 0x%04x: Nu se poate formata numele de identificare pentru c� este "
 "invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:4000
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7197,7 +7325,7 @@
 "Eroare 0x%04x: Nu se poate formata numele de identificare pentru c� numele "
 "cerut este prea lung."
 
-#: ../libpurple/protocols/oscar/oscar.c:4003
+#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7206,7 +7334,7 @@
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru c� exist� deja o "
 "cerere 樽n a�teptare pentru acest nume de identificare."
 
-#: ../libpurple/protocols/oscar/oscar.c:4006
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7215,7 +7343,7 @@
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru c� adresa introdus� "
 "are prea multe nume de identificare asociate."
 
-#: ../libpurple/protocols/oscar/oscar.c:4009
+#: ../libpurple/protocols/oscar/oscar.c:4029
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7224,32 +7352,32 @@
 "Eroare 0x%04x: Nu se poate schimba adresa de mail pentru c� adresa introdus� "
 "este invalid�."
 
-#: ../libpurple/protocols/oscar/oscar.c:4012
+#: ../libpurple/protocols/oscar/oscar.c:4032
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Eroare 0x%04x: Eroare necunoscut�."
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4042
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "Adresa de mail pentru %s este %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4024
+#: ../libpurple/protocols/oscar/oscar.c:4044
 msgid "Account Info"
 msgstr "Detalii cont"
 
-#: ../libpurple/protocols/oscar/oscar.c:4196
+#: ../libpurple/protocols/oscar/oscar.c:4216
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Avatarul nu v-a fost trimis. Trebuie s� v� conecta釘i direct pentru a fi "
 "posibil� trimiterea avatarului."
 
-#: ../libpurple/protocols/oscar/oscar.c:4441
+#: ../libpurple/protocols/oscar/oscar.c:4487
 msgid "Unable to set AIM profile."
 msgstr "Nu se poate seta profilul AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4442
+#: ../libpurple/protocols/oscar/oscar.c:4488
 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 "
@@ -7259,7 +7387,7 @@
 "Profilul v� va r�m但ne la fel. �ncerca釘i s�-l seta釘i din nou c但nd ve釘i fi "
 "conectat(�) 100%."
 
-#: ../libpurple/protocols/oscar/oscar.c:4456
+#: ../libpurple/protocols/oscar/oscar.c:4502
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7277,11 +7405,11 @@
 "A釘i dep��it lungimea maxim� de %d de octe釘i a profilului. A fost trunchiat "
 "automat."
 
-#: ../libpurple/protocols/oscar/oscar.c:4461
+#: ../libpurple/protocols/oscar/oscar.c:4507
 msgid "Profile too long."
 msgstr "Profil prea lung."
 
-#: ../libpurple/protocols/oscar/oscar.c:4506
+#: ../libpurple/protocols/oscar/oscar.c:4552
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7296,35 +7424,35 @@
 "Mesajul 樽n absen釘� dep��e�te lungimea maxim� de %d octe釘i. S-a trunchiat "
 "mesajul �i a釘i fost trecut(�) 樽n absen釘�."
 msgstr[2] ""
-"Mesajul 樽n absen釘� dep��e�te lungimea maxim� de %d de octe釘i. S-a "
-"trunchiat mesajul �i a釘i fost trecut(�) 樽n absen釘�."
-
-#: ../libpurple/protocols/oscar/oscar.c:4511
+"Mesajul 樽n absen釘� dep��e�te lungimea maxim� de %d de octe釘i. S-a trunchiat "
+"mesajul �i a釘i fost trecut(�) 樽n absen釘�."
+
+#: ../libpurple/protocols/oscar/oscar.c:4557
 msgid "Away message too long."
 msgstr "Mesaj 樽n absen釘� prea lung."
 
-#: ../libpurple/protocols/oscar/oscar.c:4580
+#: ../libpurple/protocols/oscar/oscar.c:4626
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
-msgstr ""
-"Nu se poate ad�uga contactul %s deoarece numele de identificare este invalid. "
-"Un nume valid trebuie s� 樽nceap� cu o liter� sau s� con釘in� doar litere, "
-"numere �i spa釘ii sau doar numere."
-
-#: ../libpurple/protocols/oscar/oscar.c:4582
-#: ../libpurple/protocols/oscar/oscar.c:5005
-#: ../libpurple/protocols/oscar/oscar.c:5019
+"must be a valid email address, or start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"Nu se poate ad�uga contactul %s deoarece numele de identificare este invalid."
+" Un nume valid trebuie s� fie o adres� de mail sau s� 樽nceap� cu o liter� "
+"�i s� con釘in� doar litere, numere �i spa釘ii sau doar numere."
+
+#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:5051
+#: ../libpurple/protocols/oscar/oscar.c:5066
 msgid "Unable To Add"
 msgstr "Ad�ugare e�uat�"
 
-#: ../libpurple/protocols/oscar/oscar.c:4686
+#: ../libpurple/protocols/oscar/oscar.c:4732
 msgid "Unable To Retrieve Buddy List"
 msgstr "Nu se poate desc�rca lista de contacte"
 
-#: ../libpurple/protocols/oscar/oscar.c:4687
+#: ../libpurple/protocols/oscar/oscar.c:4733
 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."
@@ -7332,16 +7460,16 @@
 "Nu s-a putut desc�rca deocamdat� lista de contacte de pe serverele AIM. "
 "Lista nu este pierdut�, dar va fi probabil disponibil� abia 樽n c但teva ore."
 
-#: ../libpurple/protocols/oscar/oscar.c:4891
-#: ../libpurple/protocols/oscar/oscar.c:4892
-#: ../libpurple/protocols/oscar/oscar.c:4897
-#: ../libpurple/protocols/oscar/oscar.c:5073
-#: ../libpurple/protocols/oscar/oscar.c:5074
-#: ../libpurple/protocols/oscar/oscar.c:5079
+#: ../libpurple/protocols/oscar/oscar.c:4937
+#: ../libpurple/protocols/oscar/oscar.c:4938
+#: ../libpurple/protocols/oscar/oscar.c:4943
+#: ../libpurple/protocols/oscar/oscar.c:5120
+#: ../libpurple/protocols/oscar/oscar.c:5121
+#: ../libpurple/protocols/oscar/oscar.c:5126
 msgid "Orphans"
 msgstr "Orfani"
 
-#: ../libpurple/protocols/oscar/oscar.c:5003
+#: ../libpurple/protocols/oscar/oscar.c:5049
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7350,22 +7478,17 @@
 "Nu s-a putut ad�uga contactul %s deoarece ave釘i prea multe contacte 樽n lista "
 "de contacte. �terge釘i unul �i 樽ncerca釘i din nou."
 
-#: ../libpurple/protocols/oscar/oscar.c:5003
-#: ../libpurple/protocols/oscar/oscar.c:5017
+#: ../libpurple/protocols/oscar/oscar.c:5049
+#: ../libpurple/protocols/oscar/oscar.c:5064
 msgid "(no name)"
 msgstr "(f�r� nume)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5017
-#, 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 ""
-"Nu s-a putut ad�uga contactul %s dintr-un motiv necunoscut. Cel mai probabil "
-"a釘i atins num�rul maxim permis de contacte 樽n lista de contacte."
-
-#: ../libpurple/protocols/oscar/oscar.c:5110
+#: ../libpurple/protocols/oscar/oscar.c:5063
+#, c-format
+msgid "Could not add the buddy %s for an unknown reason."
+msgstr "Din motive necunoscute nu s-a putut ad�uga contactul %s."
+
+#: ../libpurple/protocols/oscar/oscar.c:5157
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7374,23 +7497,23 @@
 "Utilizatorul %s v-a autorizat s�-l ad�uga釘i 樽n lista de contacte. Dori釘i s�-"
 "l ad�uga釘i?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5118
+#: ../libpurple/protocols/oscar/oscar.c:5165
 msgid "Authorization Given"
 msgstr "Autorizare acordat�"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5191
+#: ../libpurple/protocols/oscar/oscar.c:5238
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr ""
 "Utilizatorul %s v-a acordat permisiunea de a-l ad�uga 樽n lista de contacte."
 
-#: ../libpurple/protocols/oscar/oscar.c:5192
+#: ../libpurple/protocols/oscar/oscar.c:5239
 msgid "Authorization Granted"
 msgstr "Autorizare acordat�"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5195
+#: ../libpurple/protocols/oscar/oscar.c:5242
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7401,52 +7524,52 @@
 "urm�torul motiv:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5196
+#: ../libpurple/protocols/oscar/oscar.c:5243
 msgid "Authorization Denied"
 msgstr "Autorizare refuzat�"
 
-#: ../libpurple/protocols/oscar/oscar.c:5232
+#: ../libpurple/protocols/oscar/oscar.c:5279
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "Cheie numeric� (e_xchange):"
 
-#: ../libpurple/protocols/oscar/oscar.c:5272
+#: ../libpurple/protocols/oscar/oscar.c:5319
 msgid "Invalid chat name specified."
 msgstr "A釘i specificat un nume invalid de camer� de chat."
 
-#: ../libpurple/protocols/oscar/oscar.c:5342
+#: ../libpurple/protocols/oscar/oscar.c:5388
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Avatarul nu v-a fost trimis. Nu v� pute釘i trimite avatarul 樽n chat-urile AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5481
-#: ../libpurple/protocols/oscar/oscar.c:5486
+#: ../libpurple/protocols/oscar/oscar.c:5548
+#: ../libpurple/protocols/oscar/oscar.c:5553
 msgid "Away Message"
 msgstr "Mesaj 樽n absen釘�"
 
-#: ../libpurple/protocols/oscar/oscar.c:5486
+#: ../libpurple/protocols/oscar/oscar.c:5553
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(se descarc�)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5686
+#: ../libpurple/protocols/oscar/oscar.c:5753
 msgid "iTunes Music Store Link"
 msgstr "Link c�tre magazinul iTunes"
 
-#: ../libpurple/protocols/oscar/oscar.c:5794
+#: ../libpurple/protocols/oscar/oscar.c:5861
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Comentariu contact pentru %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../libpurple/protocols/oscar/oscar.c:5862
 msgid "Buddy Comment:"
 msgstr "Comentariu contact:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5842
+#: ../libpurple/protocols/oscar/oscar.c:5909
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "A釘i ales s� deschide釘i o discu釘ie direct� cu %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5846
+#: ../libpurple/protocols/oscar/oscar.c:5913
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7454,65 +7577,66 @@
 "Pentru c� adresa IP v� va fi vizibil�, v� rug�m s� evalua釘i riscurile la "
 "care v� expune釘i. Dori釘i s� continua釘i?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5852
+#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "C_onectare"
 
-#: ../libpurple/protocols/oscar/oscar.c:5887
+#: ../libpurple/protocols/oscar/oscar.c:5954
 msgid "Get AIM Info"
 msgstr "Detalii AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5893
+#: ../libpurple/protocols/oscar/oscar.c:5960
 msgid "Edit Buddy Comment"
 msgstr "Editare comentariu"
 
-#: ../libpurple/protocols/oscar/oscar.c:5901
+#: ../libpurple/protocols/oscar/oscar.c:5968
 msgid "Get Status Msg"
 msgstr "Arat� mesajul de status"
 
-#: ../libpurple/protocols/oscar/oscar.c:5914
+#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Direct IM"
 msgstr "Discu釘ie direct�"
 
-#: ../libpurple/protocols/oscar/oscar.c:5936
+#: ../libpurple/protocols/oscar/oscar.c:6003
 msgid "Re-request Authorization"
 msgstr "Solicit din nou autorizare"
 
-#: ../libpurple/protocols/oscar/oscar.c:5995
+#: ../libpurple/protocols/oscar/oscar.c:6062
 msgid "Require authorization"
 msgstr "Solicit autorizare"
 
-#: ../libpurple/protocols/oscar/oscar.c:5998
+#: ../libpurple/protocols/oscar/oscar.c:6065
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Prezen釘� online (activarea v� expune la spam!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6003
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "ICQ Privacy Options"
 msgstr "Op釘iuni de securitate ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6022
+#: ../libpurple/protocols/oscar/oscar.c:6089
 msgid "The new formatting is invalid."
 msgstr "Formatul nou este invalid."
 
-#: ../libpurple/protocols/oscar/oscar.c:6023
+#: ../libpurple/protocols/oscar/oscar.c:6090
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Formatarea numelor de identificare nu poate schimba dec但t spa釘iile albe �i "
 "capitalizarea."
 
-#: ../libpurple/protocols/oscar/oscar.c:6076
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Change Address To:"
 msgstr "Schimb� adresa 樽n:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6122
+#: ../libpurple/protocols/oscar/oscar.c:6189
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>nu a�tepta釘i nici o autorizare</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6125
+#: ../libpurple/protocols/oscar/oscar.c:6192
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Lista contactelor de la care a�tepta釘i autorizarea"
 
-#: ../libpurple/protocols/oscar/oscar.c:6126
+#: ../libpurple/protocols/oscar/oscar.c:6193
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7520,73 +7644,73 @@
 "Pute釘i solicita din nou autorizarea de la aceste contacte select但nd ��Solicit "
 "din nou autorizare�� dup� un click dreapta pe nume 樽n lista contactelor."
 
-#: ../libpurple/protocols/oscar/oscar.c:6143
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "Find Buddy by E-Mail"
 msgstr "C�utare contact dup� adresa de mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6144
+#: ../libpurple/protocols/oscar/oscar.c:6211
 msgid "Search for a buddy by e-mail address"
 msgstr "C�utare contact dup� adresa de mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6145
+#: ../libpurple/protocols/oscar/oscar.c:6212
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Introduce釘i adresa de mail a contactului c�utat:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6148
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "_Search"
 msgstr "C_aut�"
 
-#: ../libpurple/protocols/oscar/oscar.c:6306
+#: ../libpurple/protocols/oscar/oscar.c:6373
 msgid "Set User Info (URL)..."
 msgstr "Setare detalii (online)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6317
+#: ../libpurple/protocols/oscar/oscar.c:6384
 msgid "Change Password (URL)"
 msgstr "Schimbare parol� (online)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6321
+#: ../libpurple/protocols/oscar/oscar.c:6388
 msgid "Configure IM Forwarding (URL)"
 msgstr "Configurare 樽naintare mesaje (online)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6331
+#: ../libpurple/protocols/oscar/oscar.c:6398
 msgid "Set Privacy Options..."
 msgstr "Op釘iuni de securitate..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6338
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Confirm Account"
 msgstr "Confirmare cont"
 
-#: ../libpurple/protocols/oscar/oscar.c:6342
+#: ../libpurple/protocols/oscar/oscar.c:6409
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Afi�are adres� de mail 樽nregistrat� curent"
 
-#: ../libpurple/protocols/oscar/oscar.c:6346
+#: ../libpurple/protocols/oscar/oscar.c:6413
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Schimbare adres� de mail 樽nregistrat� curent..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6353
+#: ../libpurple/protocols/oscar/oscar.c:6420
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Afi�are contacte ce a�teapt� autorizarea"
 
-#: ../libpurple/protocols/oscar/oscar.c:6359
+#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "C�utare contact dup� adresa de mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6364
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by Information"
 msgstr "C�utare contact dup� detalii"
 
-#: ../libpurple/protocols/oscar/oscar.c:6432
+#: ../libpurple/protocols/oscar/oscar.c:6499
 msgid "Use recent buddies group"
 msgstr "Utilizeaz� un grup pentru contactele recente"
 
-#: ../libpurple/protocols/oscar/oscar.c:6435
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Show how long you have been idle"
 msgstr "Arat� perioada de inactivitate"
 
-#: ../libpurple/protocols/oscar/oscar.c:6590
+#: ../libpurple/protocols/oscar/oscar.c:6657
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7623,10 +7747,6 @@
 "necesar� pentru imaginile asociate conturilor. Pentru c� adresa IP v� va fi "
 "expus�, lua釘i 樽n considerare riscurile la care v� expune釘i."
 
-#: ../libpurple/protocols/oscar/peer.c:1022
-msgid "_Connect"
-msgstr "_Conectare"
-
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Informa釘ii de baz�"
@@ -7807,13 +7927,13 @@
 msgstr "Avatar QQ invalid"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/group_opt.c:136
 #, c-format
 msgid "You rejected %d's request"
 msgstr "A釘i respins cererea f�cut� de %d"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Input your reason:"
 msgstr "Preciza釘i motivul:"
 
@@ -7823,13 +7943,13 @@
 
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
 msgstr "Scuze, nu e�ti genul meu..."
 
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:142
-#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
 #: ../libpurple/protocols/qq/sys_msg.c:91
 #: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
@@ -7853,13 +7973,13 @@
 msgstr "Utilizatorul %d are nevoie de autorizare"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:404
-#: ../libpurple/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Introduce釘i aici cererea"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
 #: ../libpurple/protocols/qq/buddy_opt.c:405
-#: ../libpurple/protocols/qq/group_join.c:135
+#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Vrei s� fim prieteni?"
 
@@ -7867,8 +7987,8 @@
 #. masked
 #. hint
 #: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:142
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Trimite"
 
@@ -7917,59 +8037,59 @@
 msgid "You can only search for permanent QQ groups\n"
 msgstr "Pute釘i c�uta doar grupuri QQ permanente\n"
 
-#: ../libpurple/protocols/qq/group_im.c:124
+#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "Utilizatorul %d a cerut 樽nscrierea 樽n grupul %d"
 
-#: ../libpurple/protocols/qq/group_im.c:125
-#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/group_im.c:127
+#: ../libpurple/protocols/qq/group_im.c:181
 #: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "Motiv: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:134
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/group_im.c:221
-#: ../libpurple/protocols/qq/group_im.c:256
-#: ../libpurple/protocols/qq/group_im.c:290
-#: ../libpurple/protocols/qq/group_join.c:231
-#: ../libpurple/protocols/qq/group_join.c:357
-#: ../libpurple/protocols/qq/group_opt.c:234
-#: ../libpurple/protocols/qq/group_opt.c:304
-#: ../libpurple/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_im.c:136
+#: ../libpurple/protocols/qq/group_im.c:183
+#: ../libpurple/protocols/qq/group_im.c:223
+#: ../libpurple/protocols/qq/group_im.c:258
+#: ../libpurple/protocols/qq/group_im.c:292
+#: ../libpurple/protocols/qq/group_join.c:233
+#: ../libpurple/protocols/qq/group_join.c:359
+#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr "Opera釘ie QQ Qun"
 
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/group_im.c:141
+#: ../libpurple/protocols/qq/group_opt.c:128
 #: ../libpurple/protocols/qq/sys_msg.c:92
 #: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Aprob�"
 
-#: ../libpurple/protocols/qq/group_im.c:178
+#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "Cererea de a v� al�tura grupului %d v-a fost respins� de adminul %d"
 
-#: ../libpurple/protocols/qq/group_im.c:219
+#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr "Cererea de a v� al�tura grupului %d v-a fost aprobat� de adminul %d"
 
-#: ../libpurple/protocols/qq/group_im.c:255
+#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "[%d] a p�r�sit grupul ��%d��"
 
-#: ../libpurple/protocols/qq/group_im.c:289
+#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "[%d] a fost ad�ugat de grupul ��%d��"
 
-#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Acest grup a fost ad�ugat la lista dumneavoastr� de contacte"
 
@@ -7993,31 +8113,31 @@
 msgid "Unknown status"
 msgstr "Status necunoscut"
 
-#: ../libpurple/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
-msgstr "Acest grup nu permite 樽nscriearea altor contacte"
-
-#: ../libpurple/protocols/qq/group_join.c:231
+msgstr "Acest grup nu permite 樽nscrierea altor contacte"
+
+#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully exited the group"
 msgstr "A釘i p�r�sit cu succes grupul"
 
-#: ../libpurple/protocols/qq/group_join.c:255
+#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "Autorizare grup QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:256
+#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "Opera釘ia de autorizare a fost acceptat� de serverul QQ"
 
-#: ../libpurple/protocols/qq/group_join.c:327
+#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You inputted a group id outside the acceptable range"
 msgstr "A釘i introdus un ID de grup prea mic sau prea mare"
 
-#: ../libpurple/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure to exit this Qun?"
 msgstr "Sigur dori釘i ie�irea din Qun?"
 
-#: ../libpurple/protocols/qq/group_join.c:360
+#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -8025,58 +8145,58 @@
 "Nota釘i c�, dac� dumneavoastr� sunte釘i ini釘iatorul, \n"
 "aceast� ac釘iune va elimina acest Qun."
 
-#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Go ahead"
 msgstr "Continu�"
 
-#: ../libpurple/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Cod [0x%02X]: %s"
 
-#: ../libpurple/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr "Eroare de operare asupra grupului"
 
 #. we wanna see window
-#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/group_opt.c:124
 #: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "Dori釘i s� aproba釘i cererea?"
 
-#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modify Qun member"
 msgstr "A釘i modificat cu succes membrul Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:305
 msgid "You have successfully modify Qun information"
 msgstr "A釘i modificat cu succes informa釘ia Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr "A釘i creat cu succes un Qun"
 
-#: ../libpurple/protocols/qq/group_opt.c:393
+#: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
 msgstr "Dori釘i s� seta釘i detaliile Qun acum?"
 
-#: ../libpurple/protocols/qq/group_opt.c:397
+#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "Op釘iuni"
 
-#: ../libpurple/protocols/qq/im.c:430
+#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Mesaj de sistem"
 
-#: ../libpurple/protocols/qq/im.c:574
+#: ../libpurple/protocols/qq/im.c:576
 msgid "Server ACK"
 msgstr "Server ACK"
 
-#: ../libpurple/protocols/qq/im.c:574
-msgid "Send IM fail\n"
-msgstr "Trimiterea mesajului a e�uat\n"
-
-#: ../libpurple/protocols/qq/keep_alive.c:85
+#: ../libpurple/protocols/qq/im.c:576
+msgid "Failed to send IM."
+msgstr "Nu s-a putut trimite mesajul."
+
+#: ../libpurple/protocols/qq/keep_alive.c:87
 msgid "Keep alive error, seems connection lost!"
 msgstr ""
 "Eroare la men釘inerea conexiunii active, se pare c� s-a 樽ntrerupt conexiunea!"
@@ -8091,8 +8211,8 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Nu se poate deschide o conexiune."
@@ -8233,27 +8353,27 @@
 msgid "Unable to read from socket"
 msgstr "Nu se poate citi din socket"
 
-#: ../libpurple/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d a refuzat fi�ierul %s"
 
-#: ../libpurple/protocols/qq/send_file.c:709
-#: ../libpurple/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:710
+#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "Trimitere fi�ier"
 
-#: ../libpurple/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d a anulat transferul fi�ierului %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "Conexiune pierdut�"
 
 #. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "Autentificare e�uat�, nici un r�spuns"
 
@@ -8395,7 +8515,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
+#: ../libpurple/protocols/sametime/sametime.c:3727
 msgid "Unable to connect to host"
 msgstr "Conectarea la server a e�uat"
 
@@ -8416,37 +8536,37 @@
 msgid "Place Closed"
 msgstr "Loc 樽nchis"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Microphone"
 msgstr "Microfon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Speakers"
 msgstr "Difuzoare"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3232
 msgid "Video Camera"
 msgstr "Camer� video"
 
-#: ../libpurple/protocols/sametime/sametime.c:3235
+#: ../libpurple/protocols/sametime/sametime.c:3236
 msgid "File Transfer"
 msgstr "Transfer de fi�iere"
 
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3270
+#: ../libpurple/protocols/sametime/sametime.c:4146
 msgid "Supports"
 msgstr "Suport�:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
+#: ../libpurple/protocols/sametime/sametime.c:3275
+#: ../libpurple/protocols/sametime/sametime.c:4120
 msgid "External User"
 msgstr "Utilizator extern"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
+#: ../libpurple/protocols/sametime/sametime.c:3381
 msgid "Create conference with user"
 msgstr "Ini釘ializa釘i o conferin釘� cu acest utilizator"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3382
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -8455,27 +8575,27 @@
 "Introduce釘i un topic pentru noua conferin釘� �i un mesaj pentru invitarea "
 "utilizatorului %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3385
+#: ../libpurple/protocols/sametime/sametime.c:3386
 msgid "New Conference"
 msgstr "Conferin釘� nou�"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
+#: ../libpurple/protocols/sametime/sametime.c:3388
 msgid "Create"
 msgstr "Creeaz�"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
+#: ../libpurple/protocols/sametime/sametime.c:3453
 msgid "Available Conferences"
 msgstr "Conferin釘e disponibile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
+#: ../libpurple/protocols/sametime/sametime.c:3459
 msgid "Create New Conference..."
 msgstr "Creeaz� o nou� conferin釘�..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3465
+#: ../libpurple/protocols/sametime/sametime.c:3466
 msgid "Invite user to a conference"
 msgstr "Invit� utilizatorul 樽ntr-o conferin釘�"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3467
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -8486,27 +8606,27 @@
 "utilizatorului %s. Selecta釘i ��Creeaz� o nou� conferin釘��� dac� dori釘i s� "
 "crea釘i o nou� conferin釘� 樽n care s� invita釘i acest utilizator."
 
-#: ../libpurple/protocols/sametime/sametime.c:3471
+#: ../libpurple/protocols/sametime/sametime.c:3472
 msgid "Invite to Conference"
 msgstr "Invit� 樽ntr-o conferin釘�"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
+#: ../libpurple/protocols/sametime/sametime.c:3563
 msgid "Invite to Conference..."
 msgstr "Invit� 樽ntr-o conferin釘�..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3567
+#: ../libpurple/protocols/sametime/sametime.c:3568
 msgid "Send TEST Announcement"
 msgstr "Trimite un anun釘 TEST"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4181
+#: ../libpurple/protocols/sametime/sametime.c:3587 ../pidgin/gtkconv.c:4284
 msgid "Topic:"
 msgstr "Topic:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
+#: ../libpurple/protocols/sametime/sametime.c:3615
 msgid "No Sametime Community Server specified"
 msgstr "Nu s-a specificat un server de comunitate Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3636
+#: ../libpurple/protocols/sametime/sametime.c:3637
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -8515,42 +8635,42 @@
 "Nici un nume de server sau adres� IP nu au fost configurate pentru contul "
 "Meanwhile %s. Introduce釘i una mai jos pentru a continua autentificarea."
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "Meanwhile Connection Setup"
 msgstr "Op釘iuni conexiune Meanwhile"
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3643
 msgid "No Sametime Community Server Specified"
 msgstr "Nu s-a specificat un server de comunitate Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:3979
+#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4015
 msgid "Connect"
 msgstr "Conectare"
 
-#: ../libpurple/protocols/sametime/sametime.c:4135
+#: ../libpurple/protocols/sametime/sametime.c:4136
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Necunoscut (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4137
+#: ../libpurple/protocols/sametime/sametime.c:4138
 msgid "Last Known Client"
 msgstr "Ultim client cunoscut"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
+#: ../libpurple/protocols/sametime/sametime.c:4302
+#: ../libpurple/protocols/sametime/sametime.c:5507
 msgid "User Name"
 msgstr "Nume utilizator"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
+#: ../libpurple/protocols/sametime/sametime.c:4305
+#: ../libpurple/protocols/sametime/sametime.c:5510
 msgid "Sametime ID"
 msgstr "ID Sametime"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4329
 msgid "An ambiguous user ID was entered"
 msgstr "S-a introdus un ID ambiguu de utilizator"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4330
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8559,28 +8679,28 @@
 "Identificatorul ��%s�� s-ar putea referi la oricare din utilizatorii urm�tori. "
 "Selecta釘i utilizatorul corect pentru a-l ad�uga 樽n lista de contacte."
 
-#: ../libpurple/protocols/sametime/sametime.c:4334
+#: ../libpurple/protocols/sametime/sametime.c:4335
 msgid "Select User"
 msgstr "Selecta釘i utilizatorul"
 
-#: ../libpurple/protocols/sametime/sametime.c:4418
+#: ../libpurple/protocols/sametime/sametime.c:4419
 msgid "Unable to add user: user not found"
 msgstr "Nu se poate ad�uga utilizatorul: nu a fost g�sit"
 
-#: ../libpurple/protocols/sametime/sametime.c:4420
+#: ../libpurple/protocols/sametime/sametime.c:4421
 #, 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 ""
 "Identificatorul ��%s�� nu corespunde nici unui utilizator din comunitatea "
-"Sametime. Aceasta intrare v-a fost �tears� din lista de contacte."
-
-#: ../libpurple/protocols/sametime/sametime.c:4425
+"Sametime. Aceast� intrare v-a fost �tears� din lista de contacte."
+
+#: ../libpurple/protocols/sametime/sametime.c:4426
 msgid "Unable to add user"
 msgstr "Nu se poate ad�uga utilizatorul"
 
-#: ../libpurple/protocols/sametime/sametime.c:5011
+#: ../libpurple/protocols/sametime/sametime.c:5012
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8589,63 +8709,63 @@
 "Eroare la citirea fi�ierului %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
+#: ../libpurple/protocols/sametime/sametime.c:5147
 msgid "Remotely Stored Buddy List"
 msgstr "List� de contacte stocat� pe server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5151
+#: ../libpurple/protocols/sametime/sametime.c:5152
 msgid "Buddy List Storage Mode"
 msgstr "Stocare list� de contacte"
 
-#: ../libpurple/protocols/sametime/sametime.c:5154
+#: ../libpurple/protocols/sametime/sametime.c:5155
 msgid "Local Buddy List Only"
 msgstr "Doar list� de contacte local�"
 
-#: ../libpurple/protocols/sametime/sametime.c:5156
+#: ../libpurple/protocols/sametime/sametime.c:5157
 msgid "Merge List from Server"
 msgstr "Combin� cu lista de contacte de pe server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5158
+#: ../libpurple/protocols/sametime/sametime.c:5159
 msgid "Merge and Save List to Server"
 msgstr "Combin� �i stocheaz� lista pe server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5160
+#: ../libpurple/protocols/sametime/sametime.c:5161
 msgid "Synchronize List with Server"
 msgstr "Sincronizez lista cu serverul"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
+#: ../libpurple/protocols/sametime/sametime.c:5216
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Import lista Sametime pentru contul %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5255
+#: ../libpurple/protocols/sametime/sametime.c:5256
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Export lista Sametime pentru contul %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
+#: ../libpurple/protocols/sametime/sametime.c:5310
 msgid "Unable to add group: group exists"
 msgstr "Nu se poate ad�uga grupul: grupul exist�."
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5311
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "Un grup numit ��%s�� exist� deja 樽n lista de contacte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5314
+#: ../libpurple/protocols/sametime/sametime.c:5444
 msgid "Unable to add group"
 msgstr "Nu se poate ad�uga grupul"
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
+#: ../libpurple/protocols/sametime/sametime.c:5373
 msgid "Possible Matches"
 msgstr "Potriviri posibile"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5389
 msgid "Notes Address Book group results"
 msgstr "Rezultate grup agend� Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5390
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8656,15 +8776,15 @@
 "din agenda Notes. Selecta釘i grupul corect din lista de mai jos �i ad�uga釘i-l "
 "樽n lista de contacte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5394
+#: ../libpurple/protocols/sametime/sametime.c:5395
 msgid "Select Notes Address Book"
 msgstr "Selecta釘i agenda Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5438
 msgid "Unable to add group: group not found"
 msgstr "Nu se poate ad�uga grupul: nu a fost g�sit"
 
-#: ../libpurple/protocols/sametime/sametime.c:5439
+#: ../libpurple/protocols/sametime/sametime.c:5440
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -8673,11 +8793,11 @@
 "Identificatorul ��%s�� nu se potrive�te cu nici un grup din agenda Notes a "
 "comunit�釘ii Sametime din care face釘i parte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid "Notes Address Book Group"
 msgstr "Grup agend� Notes"
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5482
 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."
@@ -8685,12 +8805,12 @@
 "Introduce釘i numele unei agende Notes 樽n c但mpul de mai jos �i ad�uga釘i grupul "
 "�i membrii s�i 樽n lista de contacte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5530
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Rezultatele c�ut�rii dup� ��%s��"
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5532
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8701,30 +8821,31 @@
 "utilizatori. Pute釘i ad�uga ace�ti utilizatori la lista de contacte ori le "
 "pute釘i trimite mesaje utiliz但nd ac釘iunile de mai jos."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
+#. Create the window
+#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtknotify.c:718
 msgid "Search Results"
 msgstr "Rezultatele c�ut�rii"
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: ../libpurple/protocols/sametime/sametime.c:5564
 msgid "No matches"
 msgstr "Nici o potrivire"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5565
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 "Identificatorul ��%s�� nu corespunde nici unui utilizator din comunitatea "
 "Sametime din care face釘i parte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5568
+#: ../libpurple/protocols/sametime/sametime.c:5569
 msgid "No Matches"
 msgstr "Nici o potrivire"
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid "Search for a user"
 msgstr "Caut� un utilizator"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5607
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -8732,90 +8853,115 @@
 "Introduce釘i numele or parte din ID 樽n c但mpul de mai jos pentru a c�uta "
 "utilizatori care s� corespund� 樽n comunitatea Sametime din care face釘i parte."
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5610
 msgid "User Search"
 msgstr "C�utare utilizator"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5623
 msgid "Import Sametime List..."
 msgstr "Import list� Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
+#: ../libpurple/protocols/sametime/sametime.c:5627
 msgid "Export Sametime List..."
 msgstr "Export list� Sametime..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5630
+#: ../libpurple/protocols/sametime/sametime.c:5631
 msgid "Add Notes Address Book Group..."
 msgstr "Adaug� grupul agendei Notes..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
+#: ../libpurple/protocols/sametime/sametime.c:5635
 msgid "User Search..."
 msgstr "C�utare utilizatori..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5741
 msgid "Force login (ignore server redirects)"
 msgstr "Autentificare for釘at� (ignor� redirect�rile serverului)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5751
 msgid "Hide client identity"
 msgstr "Ascunde identitatea clientului"
 
 #: ../libpurple/protocols/silc/buddy.c:52
-#: ../libpurple/protocols/silc/buddy.c:421
-#: ../libpurple/protocols/silc/buddy.c:546
-#: ../libpurple/protocols/silc/buddy.c:712
-#: ../libpurple/protocols/silc/ft.c:338
+#: ../libpurple/protocols/silc/buddy.c:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Utilizatorul %s nu este prezent 樽n re釘ea"
 
 #: ../libpurple/protocols/silc/buddy.c:53
+#: ../libpurple/protocols/silc/buddy.c:110
 #: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:119
 #: ../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
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Schimb de chei"
 
 #: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Nu s-a reu�it schimbul de chei"
 
-#: ../libpurple/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "A intervenit o eroare 樽n cursul schimbului de chei"
 
-#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Schimbul de chei a e�uat"
 
-#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Time-out la schimbul de chei"
 
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc10/buddy.c:130
+msgid "Key agreement was aborted"
+msgstr "Schimbul de chei a fost abandonat"
+
 #: ../libpurple/protocols/silc/buddy.c:130
-msgid "Key agreement was aborted"
-msgstr "Schimbul de chei a fost abandonat"
-
-#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Schimbul de chei a 樽nceput deja"
 
-#: ../libpurple/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Schimbul de chei nu poate fi ini釘iat cu propria identitate"
 
-#: ../libpurple/protocols/silc/buddy.c:258
-#: ../libpurple/protocols/silc/buddy.c:389
-#: ../libpurple/protocols/silc/buddy.c:514
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "Cel�lalt utilizator nu mai este prezent 樽n re釘ea"
 
-#: ../libpurple/protocols/silc/buddy.c:295
+#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc10/buddy.c:295
 #, c-format
 msgid ""
 "Key agreement request received from %s. Would you like to perform the key "
@@ -8824,7 +8970,8 @@
 "Cerere de schimb de chei primit� de la %s. Dori釘i s� accepta釘i schimbul de "
 "chei?"
 
-#: ../libpurple/protocols/silc/buddy.c:299
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -8835,69 +8982,99 @@
 "Calculator la distan釘�: %s\n"
 "Portul la distan釘�: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:312
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Cerere de schimb de chei"
 
-#: ../libpurple/protocols/silc/buddy.c:388
-#: ../libpurple/protocols/silc/buddy.c:423
-#: ../libpurple/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "IM parolat"
 
-#: ../libpurple/protocols/silc/buddy.c:424
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Nu se poate seta cheia IM"
 
-#: ../libpurple/protocols/silc/buddy.c:466
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Setare parol� IM"
 
-#: ../libpurple/protocols/silc/buddy.c:513
-#: ../libpurple/protocols/silc/buddy.c:548
-#: ../libpurple/protocols/silc/ops.c:1494
-#: ../libpurple/protocols/silc/ops.c:1505
+#: ../libpurple/protocols/silc/buddy.c:496
+#: ../libpurple/protocols/silc/buddy.c:507
+#: ../libpurple/protocols/silc/buddy.c:540
+#: ../libpurple/protocols/silc/ops.c:1499
+#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "Ob釘ine cheia public�"
 
-#: ../libpurple/protocols/silc/buddy.c:549
-#: ../libpurple/protocols/silc/ops.c:1495
-#: ../libpurple/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Nu se poate ob釘ine cheia public�"
 
-#: ../libpurple/protocols/silc/buddy.c:635
-#: ../libpurple/protocols/silc/buddy.c:1654
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Arat� cheia public�"
 
-#: ../libpurple/protocols/silc/buddy.c:636
-#: ../libpurple/protocols/silc/buddy.c:1033
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Nu s-a putut 樽nc�rca cheia public�"
 
-#: ../libpurple/protocols/silc/buddy.c:713
-#: ../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
+#: ../libpurple/protocols/silc/buddy.c:701
+#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1168
+#: ../libpurple/protocols/silc/ops.c:1288
+#: ../libpurple/protocols/silc/ops.c:1289
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Detalii utilizator"
 
-#: ../libpurple/protocols/silc/buddy.c:714
-#: ../libpurple/protocols/silc/ops.c:1160
-#: ../libpurple/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:702
+#: ../libpurple/protocols/silc/ops.c:1169
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Nu s-au putut ob釘ine detalii despre utilizator"
 
-#: ../libpurple/protocols/silc/buddy.c:735
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Contactul %s nu este de 樽ncredere"
 
-#: ../libpurple/protocols/silc/buddy.c:738
+#: ../libpurple/protocols/silc/buddy.c:726
+#: ../libpurple/protocols/silc10/buddy.c:738
 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."
@@ -8906,16 +9083,19 @@
 "sa public�. Utiliza釘i comanda ��Ob釘ine cheia public��� pentru a o importa."
 
 #. Open file selector to select the public key.
-#: ../libpurple/protocols/silc/buddy.c:1067
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "Deschide..."
 
-#: ../libpurple/protocols/silc/buddy.c:1078
+#: ../libpurple/protocols/silc/buddy.c:1070
+#: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "Utilizatorul %s nu este prezent 樽n re釘ea"
 
-#: ../libpurple/protocols/silc/buddy.c:1081
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
 msgid ""
 "To add the buddy you must import his/her public key. Press Import to import "
 "a public key."
@@ -8923,15 +9103,18 @@
 "Pentru a ad�uga contactul trebuie s� importa釘i cheia sa public�. Utiliza釘i "
 "pentru aceasta comand� ��Import���."
 
-#: ../libpurple/protocols/silc/buddy.c:1085
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "_Import�..."
 
-#: ../libpurple/protocols/silc/buddy.c:1181
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "Selecta釘i utilizatorul corect"
 
-#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc10/buddy.c:1183
 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."
@@ -8939,7 +9122,8 @@
 "Mai mul釘i utilizatori par s� aib� aceea�i cheie public�. Selecta釘i-l pe cel "
 "corect din list� pentru a-l ad�uga 樽n lista de contacte."
 
-#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc10/buddy.c:1185
 msgid ""
 "More than one user was found with the same name. Select the correct user "
 "from the list to add to the buddy list."
@@ -8948,237 +9132,318 @@
 "corect pentru a-l ad�uga 樽n lista de contacte."
 
 #: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "Deta�at(�)"
 
 #: ../libpurple/protocols/silc/buddy.c:1478
-#: ../libpurple/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Prost dispus(�)"
 
 #: ../libpurple/protocols/silc/buddy.c:1482
-#: ../libpurple/protocols/silc/silc.c:51
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Treze�te-m�!"
 
 #: ../libpurple/protocols/silc/buddy.c:1484
-#: ../libpurple/protocols/silc/silc.c:43
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hiperactiv(�)"
 
 #: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "Robo釘el"
 
 #: ../libpurple/protocols/silc/buddy.c:1493
-#: ../libpurple/protocols/silc/silc.c:658
-#: ../libpurple/protocols/silc/util.c:512
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Fericit(�)"
 
 #: ../libpurple/protocols/silc/buddy.c:1495
-#: ../libpurple/protocols/silc/silc.c:660
-#: ../libpurple/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Trist(�)"
 
 #: ../libpurple/protocols/silc/buddy.c:1497
-#: ../libpurple/protocols/silc/silc.c:662
-#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Sup�rat(�)"
 
 #: ../libpurple/protocols/silc/buddy.c:1499
-#: ../libpurple/protocols/silc/silc.c:664
-#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Gelos/Geloas�"
 
 #: ../libpurple/protocols/silc/buddy.c:1501
-#: ../libpurple/protocols/silc/silc.c:666
-#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Ru�inat(�)"
 
 #: ../libpurple/protocols/silc/buddy.c:1503
-#: ../libpurple/protocols/silc/silc.c:668
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Invincibil(�)"
 
 #: ../libpurple/protocols/silc/buddy.c:1505
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "�ndr�gostit(�)"
 
 #: ../libpurple/protocols/silc/buddy.c:1507
-#: ../libpurple/protocols/silc/silc.c:672
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Adormit(�)"
 
 #: ../libpurple/protocols/silc/buddy.c:1509
-#: ../libpurple/protocols/silc/silc.c:674
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Plictisit(�)"
 
 #: ../libpurple/protocols/silc/buddy.c:1511
-#: ../libpurple/protocols/silc/silc.c:676
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Entuziast(�)"
 
 #: ../libpurple/protocols/silc/buddy.c:1513
-#: ../libpurple/protocols/silc/silc.c:678
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Stresat(�)"
 
 #: ../libpurple/protocols/silc/buddy.c:1545
-#: ../libpurple/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Moduri utilizator"
 
 #: ../libpurple/protocols/silc/buddy.c:1557
-#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Dispozi釘ie"
 
 #: ../libpurple/protocols/silc/buddy.c:1562
-#: ../libpurple/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Contact preferat"
 
 #: ../libpurple/protocols/silc/buddy.c:1567
-#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Limb� preferat�"
 
 #: ../libpurple/protocols/silc/buddy.c:1572
-#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Dispozitiv"
 
 #: ../libpurple/protocols/silc/buddy.c:1577
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc/silc.c:726
-#: ../libpurple/protocols/silc/silc.c:728
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Fus orar"
 
 #: ../libpurple/protocols/silc/buddy.c:1582
-#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Loca釘ie geografic�"
 
-#: ../libpurple/protocols/silc/buddy.c:1636
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "Reseteaz� cheia IM"
 
-#: ../libpurple/protocols/silc/buddy.c:1642
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "IM cu schimb de chei"
 
-#: ../libpurple/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr "IM parolat"
 
-#: ../libpurple/protocols/silc/buddy.c:1660
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "Ob釘ine cheia public�..."
 
-#: ../libpurple/protocols/silc/buddy.c:1667
-#: ../libpurple/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Elimin� utilizatorul"
 
-#: ../libpurple/protocols/silc/buddy.c:1677
-#: ../libpurple/protocols/silc/chat.c:977
+#: ../libpurple/protocols/silc/buddy.c:1678
+#: ../libpurple/protocols/silc/chat.c:993
+#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Deseneaz� 樽n ��whiteboard��"
 
 #: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Fraz� secret�:"
 
 #: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Chat-ul %s nu exist� 樽n re釘ea"
 
 #: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Detalii chat"
 
 #: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Nu s-au putut ob釘ine detalii despre chat"
 
 #: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Nume chat:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Contor utilizatori:</b> %d"
 
 #: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Ini釘iator chat:</b> %s"
 
 #: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Cifru chat:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libpurple/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:143
+#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Chat HMAC:</b> %s"
 
-#: ../libpurple/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Topic chat:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Moduri chat:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Amprenta cheii fondatorului:</b><br>%s"
 
-#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Amprent� silabic� a cheii fondatorului:</b><br>%s"
 
 #: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Adaug� cheia public� a chat-ului"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Deschide cheia public�..."
 
-#: ../libpurple/protocols/silc/chat.c:401
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Fraz� secret� pentru chat"
 
-#: ../libpurple/protocols/silc/chat.c:408
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "List� chei publice chat"
 
-#: ../libpurple/protocols/silc/chat.c:413
+#: ../libpurple/protocols/silc/chat.c:435
+#: ../libpurple/protocols/silc10/chat.c:413
 msgid ""
 "Channel authentication is used to secure the channel from unauthorized "
 "access. The authentication may be based on passphrase and digital "
@@ -9192,106 +9457,124 @@
 "�n cel de-al doilea, doar utilizatorii ale c�ror semn�turi digitale sunt "
 "listate pot intra 樽n chat."
 
-#: ../libpurple/protocols/silc/chat.c:422
-#: ../libpurple/protocols/silc/chat.c:423
-#: ../libpurple/protocols/silc/chat.c:461
-#: ../libpurple/protocols/silc/chat.c:462
-#: ../libpurple/protocols/silc/chat.c:911
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Autentificare 樽n chat"
 
-#: ../libpurple/protocols/silc/chat.c:424
-#: ../libpurple/protocols/silc/chat.c:463
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Adaug�/�terge"
 
-#: ../libpurple/protocols/silc/chat.c:581
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Nume grup"
 
-#: ../libpurple/protocols/silc/chat.c:585
-#: ../libpurple/protocols/silc/ops.c:1910
-#: ../libpurple/protocols/silc/silc.c:935
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Fraz� secret�"
 
-#: ../libpurple/protocols/silc/chat.c:596
+#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Introduce釘i numele grupului chat-ului privat %s �i fraza secret�."
 
-#: ../libpurple/protocols/silc/chat.c:598
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Adaug� grupul chat-ului privat"
 
-#: ../libpurple/protocols/silc/chat.c:726
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Limit� utilizatori"
 
-#: ../libpurple/protocols/silc/chat.c:727
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
 msgstr ""
 "Seta釘i num�rul maxim de utilizatori 樽n chat. Zero pentru num�r nelimitat."
 
-#: ../libpurple/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "List� invita釘ii"
 
-#: ../libpurple/protocols/silc/chat.c:896
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "List� interdic釘ii"
 
-#: ../libpurple/protocols/silc/chat.c:904
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Adaug� grupul privat"
 
-#: ../libpurple/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Reseteaz� permanent"
 
-#: ../libpurple/protocols/silc/chat.c:922
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Seteaz� permanent"
 
-#: ../libpurple/protocols/silc/chat.c:930
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Setare limit� utilizatori"
 
-#: ../libpurple/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Reseteaz� blocarea topicului"
 
-#: ../libpurple/protocols/silc/chat.c:941
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Seteaz� blocarea topicului"
 
-#: ../libpurple/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Reseteaz� chat-ul privat"
 
-#: ../libpurple/protocols/silc/chat.c:953
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Seteaz� chat-ul privat"
 
-#: ../libpurple/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Reseteaz� chat-ul secret"
 
-#: ../libpurple/protocols/silc/chat.c:965
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Seteaz� chat-ul secret"
 
-#: ../libpurple/protocols/silc/chat.c:1039
-#, c-format
-msgid "You are channel founder on <I>%s</I>"
-msgstr "Sunte釘i ini釘iatorul chat-ului <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1043
-#, c-format
-msgid "Channel founder on <I>%s</I> is <I>%s</I>"
-msgstr "Ini釘iatorul chat-ului 樽n <I>%s</I> este <I>%s</I>"
-
-#: ../libpurple/protocols/silc/chat.c:1102
+#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc10/chat.c:1102
 #, c-format
 msgid ""
 "You have to join the %s channel before you are able to join the private group"
@@ -9299,227 +9582,322 @@
 "Trebuie s� intra釘i 樽n chat-ul %s 樽nainte de a v� putea al�tura grupului "
 "privat."
 
-#: ../libpurple/protocols/silc/chat.c:1104
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
 msgid "Join Private Group"
 msgstr "Intr� 樽n grupul privat"
 
-#: ../libpurple/protocols/silc/chat.c:1105
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Nu se poate intra 樽n grupul privat"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1144
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "Ini釘iaz� comanda"
 
-#: ../libpurple/protocols/silc/chat.c:1299
-#: ../libpurple/protocols/silc/silc.c:1144
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Cannot call command"
 msgstr "Nu se poate ini釘ia comanda"
 
-#: ../libpurple/protocols/silc/chat.c:1300
-#: ../libpurple/protocols/silc/silc.c:1145
+#: ../libpurple/protocols/silc/chat.c:1261
+#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1138
 msgid "Unknown command"
 msgstr "Comand� necunoscut�"
 
-#: ../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
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc10/ft.c:96
+#: ../libpurple/protocols/silc10/ft.c:100
+#: ../libpurple/protocols/silc10/ft.c:104
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
 msgid "Secure File Transfer"
 msgstr "Transfer securizat de fi�iere"
 
-#: ../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
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc10/ft.c:101
+#: ../libpurple/protocols/silc10/ft.c:105
 msgid "Error during file transfer"
 msgstr "Eroare la transferul fi�ierului"
 
-#: ../libpurple/protocols/silc/ft.c:94
+#: ../libpurple/protocols/silc/ft.c:87
+msgid "Remote disconnected"
+msgstr "Deconectat la distan釘�"
+
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
 msgid "Permission denied"
 msgstr "Cerere refuzat�"
 
-#: ../libpurple/protocols/silc/ft.c:98
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
 msgid "Key agreement failed"
 msgstr "Schimbul de chei a e�uat"
 
-#: ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:114
+msgid "Connection timed out"
+msgstr "Conexiunea a expirat"
+
+#: ../libpurple/protocols/silc/ft.c:118
+msgid "Creating connection failed"
+msgstr "Nu s-a putut deschide conexiunea"
+
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
 msgid "File transfer session does not exist"
 msgstr "Nu exist� sesiunea de transfer de fi�iere"
 
-#: ../libpurple/protocols/silc/ft.c:206
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
 msgid "No file transfer session active"
 msgstr "Nici o sesiune de transfer de fi�iere nu e activ�"
 
-#: ../libpurple/protocols/silc/ft.c:211
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
 msgid "File transfer already started"
 msgstr "Transferul fi�ierului a 樽nceput deja"
 
-#: ../libpurple/protocols/silc/ft.c:216
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
 msgstr "Nu s-au putut verifica cheile pentru transferul de fi�iere"
 
-#: ../libpurple/protocols/silc/ft.c:222
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
 msgstr "Nu s-a putut ini釘ia transferul de fi�iere"
 
-#: ../libpurple/protocols/silc/ft.c:341
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
 msgstr "Nu s-a putut trimite fi�ierul"
 
-#: ../libpurple/protocols/silc/ops.c:554 ../libpurple/protocols/silc/ops.c:563
-#: ../libpurple/protocols/silc/ops.c:572
+#: ../libpurple/protocols/silc/ops.c:57
+msgid "Error occurred"
+msgstr "A intervenit o eroare"
+
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc10/ops.c:554
+#: ../libpurple/protocols/silc10/ops.c:563
+#: ../libpurple/protocols/silc10/ops.c:572
 #, c-format
 msgid "%s has changed the topic of <I>%s</I> to: %s"
 msgstr "%s a schimbat topicul pentru <I>%s</I> 樽n: %s"
 
-#: ../libpurple/protocols/silc/ops.c:638
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
 #, c-format
 msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
 msgstr "<I>%s</I> a setat modurile chat-ului <I>%s</I> astfel: %s"
 
-#: ../libpurple/protocols/silc/ops.c:642
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
 #, c-format
 msgid "<I>%s</I> removed all channel <I>%s</I> modes"
 msgstr "<I>%s</I> a 樽nl�turat toate modurile chat-ului <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:675
+#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc10/ops.c:675
 #, c-format
 msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
 msgstr "<I>%s</I> a setat modurile pentru <I>%s</I> astfel: %s"
 
-#: ../libpurple/protocols/silc/ops.c:683
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
 #, c-format
 msgid "<I>%s</I> removed all <I>%s's</I> modes"
 msgstr "<I>%s</I> a 樽nl�turat toate modurile pentru <I>%s</I>"
 
-#: ../libpurple/protocols/silc/ops.c:712
+#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc10/ops.c:712
 #, c-format
 msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
 msgstr "A釘i fost dat afar� din <I>%s</I> de <I>%s</I> (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:742 ../libpurple/protocols/silc/ops.c:747
-#: ../libpurple/protocols/silc/ops.c:752
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
 #, c-format
 msgid "You have been killed by %s (%s)"
 msgstr "A釘i fost eliminat de %s: (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:773 ../libpurple/protocols/silc/ops.c:778
-#: ../libpurple/protocols/silc/ops.c:783
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
 #, c-format
 msgid "Killed by %s (%s)"
 msgstr "Eliminat de %s (%s)"
 
-#: ../libpurple/protocols/silc/ops.c:829
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
 msgid "Server signoff"
 msgstr "Deconectare server"
 
-#: ../libpurple/protocols/silc/ops.c:1017
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
 msgid "Personal Information"
 msgstr "Detalii personale"
 
-#: ../libpurple/protocols/silc/ops.c:1040
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
 msgid "Birth Day"
 msgstr "Zi de na�tere"
 
-#: ../libpurple/protocols/silc/ops.c:1048
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
 msgid "Job Role"
 msgstr "Func釘ie"
 
-#: ../libpurple/protocols/silc/ops.c:1052
-#: ../libpurple/protocols/silc/silc.c:928
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
 msgstr "Organiza釘ie"
 
-#: ../libpurple/protocols/silc/ops.c:1056
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
 msgid "Unit"
 msgstr "Unitate"
 
-#: ../libpurple/protocols/silc/ops.c:1080
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
 msgid "Note"
 msgstr "Not�"
 
-#: ../libpurple/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Join Chat"
 msgstr "Intr� 樽ntr-un chat"
 
-#: ../libpurple/protocols/silc/ops.c:1183
-#: ../libpurple/protocols/silc/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
+#, c-format
+msgid "You are channel founder on <I>%s</I>"
+msgstr "Sunte釘i ini釘iatorul chat-ului <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc10/chat.c:1043
+#, c-format
+msgid "Channel founder on <I>%s</I> is <I>%s</I>"
+msgstr "Ini釘iatorul chat-ului 樽n <I>%s</I> este <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "Nume real"
 
-#: ../libpurple/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Text status"
 
-#: ../libpurple/protocols/silc/ops.c:1285
-#: ../libpurple/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Amprent� cheie public�"
 
-#: ../libpurple/protocols/silc/ops.c:1286
-#: ../libpurple/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Amprent� silabic� cheie public�"
 
-#: ../libpurple/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Mai mult..."
 
-#: ../libpurple/protocols/silc/ops.c:1371
-#: ../libpurple/protocols/silc/silc.c:995
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "Deta�are de server"
 
-#: ../libpurple/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Deta�area nu a reu�it"
 
-#: ../libpurple/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Nu se poate schimba topicul"
 
-#: ../libpurple/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Schimbarea pseudonimului a e�uat"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "List� camere de chat"
 
-#: ../libpurple/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Nu se poate ob釘ine lista camerelor de chat"
 
-#: ../libpurple/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1468
+msgid "Network is empty"
+msgstr "Re釘eaua este goal�"
+
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Nu s-a primit nici o cheie public�"
 
-#: ../libpurple/protocols/silc/ops.c:1519
-#: ../libpurple/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1524
+#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Informa釘ii server"
 
-#: ../libpurple/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Nu s-au putut ob釘ine detalii despre server"
 
+#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
+msgid "Server Statistics"
+msgstr "Statistici server"
+
 #: ../libpurple/protocols/silc/ops.c:1549
-#: ../libpurple/protocols/silc/ops.c:1558
-msgid "Server Statistics"
-msgstr "Statistici server"
-
-#: ../libpurple/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Nu s-au putut ob釘ine statisticile serverului"
 
-#: ../libpurple/protocols/silc/ops.c:1559
-msgid "No server statistics available"
-msgstr "Nici o statistic� nu e disponibil� pentru server"
-
-#: ../libpurple/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -9554,108 +9932,66 @@
 "Total operatori servere: %d\n"
 "Total operatori routere: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Statistici re釘ea"
 
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping e�uat"
 
-#: ../libpurple/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Replic� ping primit� de la server"
 
-#: ../libpurple/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Utilizatorul nu a putut fi eliminat"
 
-#: ../libpurple/protocols/silc/ops.c:1709
-msgid "Error during connecting to SILC Server"
-msgstr "Eroare la conectarea la serverul SILC"
-
-#: ../libpurple/protocols/silc/ops.c:1714
-msgid "Key Exchange failed"
-msgstr "Schimbul de chei a e�uat"
-
-#: ../libpurple/protocols/silc/ops.c:1723
-msgid ""
-"Resuming detached session failed. Press Reconnect to create new connection."
-msgstr ""
-"Reluarea sesiunii deta�ate a e�uat. �ncerca釘i ��Reconectare�� pentru a crea o "
-"nou� conexiune."
-
-#: ../libpurple/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr "Deconectat(�) de server"
-
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/ops.c:1867
-#: ../libpurple/protocols/silc/silc.c:182
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
+msgstr "WATCH"
+
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "Cannot watch user"
+msgstr "Nu se poate face watch pentru acest utilizator"
+
+#: ../libpurple/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1775
+#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc10/ops.c:1811
+#: ../libpurple/protocols/silc10/ops.c:1858
+#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Se reia sesiunea"
 
-#: ../libpurple/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Se autentific� conexiunea"
 
-#: ../libpurple/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Se verific� cheia public� a serverului"
 
-#: ../libpurple/protocols/silc/ops.c:1911
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Se cere fraza secret�"
 
-#: ../libpurple/protocols/silc/ops.c:1940
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr ""
-"Eroare: Nepotrivire de versiune, 樽ncerca釘i o versiune mai nou� de client"
-
-#: ../libpurple/protocols/silc/ops.c:1943
-msgid "Failure: Remote does not trust/support your public key"
-msgstr ""
-"Eroare: Partenerul nu v� suport� tipul de cheie public� sau nu are 樽ncredere "
-"樽n ea."
-
-#: ../libpurple/protocols/silc/ops.c:1946
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "Eroare: Partenerul nu suport� grupul KE propus"
-
-#: ../libpurple/protocols/silc/ops.c:1949
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "Eroare: Partenerul nu suport� cifrul propus"
-
-#: ../libpurple/protocols/silc/ops.c:1952
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Eroare: Partenerul nu suport PKCS-ul propus"
-
-#: ../libpurple/protocols/silc/ops.c:1955
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "Eroare: Partenerul nu suport� func釘ia hash propus�"
-
-#: ../libpurple/protocols/silc/ops.c:1958
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Eroare: Partenerul nu suporta HMAC-ul propus"
-
-#: ../libpurple/protocols/silc/ops.c:1960
-msgid "Failure: Incorrect signature"
-msgstr "Eroare: Semn�tur� incorect�"
-
-#: ../libpurple/protocols/silc/ops.c:1962
-msgid "Failure: Invalid cookie"
-msgstr "Eroare: Cookie invalid"
-
-#: ../libpurple/protocols/silc/ops.c:1973
-msgid "Failure: Authentication failed"
-msgstr "Eroare: Autentificare e�uat�"
-
-#: ../libpurple/protocols/silc/pk.c:104
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
 #, c-format
 msgid ""
 "Received %s's public key. Your local copy does not match this key. Would you "
@@ -9664,13 +10000,13 @@
 "S-a primit o cheie public� de la %s. Copia local� a cheii sale nu se "
 "potrive�te cu aceasta. Dori釘i s� accepta釘i aceast� cheie public�?"
 
-#: ../libpurple/protocols/silc/pk.c:109
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr ""
 "S-a primit cheia public� de la %s. Dori釘i s� accepta釘i aceast� cheie public�?"
 
-#: ../libpurple/protocols/silc/pk.c:113
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -9683,73 +10019,100 @@
 "%s\n"
 "%s\n"
 
-#: ../libpurple/protocols/silc/pk.c:116 ../libpurple/protocols/silc/pk.c:142
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Verific� cheia public�"
 
-#: ../libpurple/protocols/silc/pk.c:121
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Arat�..."
 
-#: ../libpurple/protocols/silc/pk.c:143
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Tip nesuportat de cheie public�"
 
-#: ../libpurple/protocols/silc/silc.c:153
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr "Deconectat(�) de server"
+
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "Eroare la conectarea la serverul SILC"
+
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr "Schimbul de chei a e�uat"
+
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Reluarea sesiunii deta�ate a e�uat. �ncerca釘i ��Reconectare�� pentru a crea o "
+"nou� conexiune."
+
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Conexiunea a e�uat"
 
-#: ../libpurple/protocols/silc/silc.c:174
-msgid "Cannot initialize SILC Client connection"
-msgstr "Nu s-a putut ini釘ializa conexiunea ca client SILC"
-
-#: ../libpurple/protocols/silc/silc.c:185
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Se efectueaz� schimbul de chei"
 
-#: ../libpurple/protocols/silc/silc.c:271
+#. Progress
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
+msgid "Connecting to SILC Server"
+msgstr "Conectare 樽n progres la serverul SILC"
+
+#: ../libpurple/protocols/silc/silc.c:352
+msgid "Could not load SILC key pair"
+msgstr "Nu s-a putut 樽nc�rca perechea de chei SILC"
+
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
+msgid "Unable to create connection"
+msgstr "Nu se poate crea o nou� conexiune"
+
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Nu mai exist� memorie disponibil�"
 
-#: ../libpurple/protocols/silc/silc.c:294
-msgid "John Noname"
-msgstr "Ion F�r�nume"
-
-#: ../libpurple/protocols/silc/silc.c:317
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Nu s-a putut ini釘ializa protocolul SILC"
 
-#: ../libpurple/protocols/silc/silc.c:324
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Directorul ~/.silc nu a fost g�sit sau nu poate fi accesat."
-
-#. Progress
-#: ../libpurple/protocols/silc/silc.c:329
-msgid "Connecting to SILC Server"
-msgstr "Conectare 樽n progres la serverul SILC"
-
-#: ../libpurple/protocols/silc/silc.c:338
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Nu s-a putut 樽nc�rca perechea de chei SILC: %s"
-
-#: ../libpurple/protocols/silc/silc.c:359
-msgid "Unable to create connection"
-msgstr "Nu se poate crea o nou� conexiune"
-
-#: ../libpurple/protocols/silc/silc.c:654
+#: ../libpurple/protocols/silc/silc.c:445
+msgid "Error loading SILC key pair"
+msgstr "Eroare la 樽nc�rcarea perechii de chei SILC"
+
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Propria dispozi釘ie"
 
-#: ../libpurple/protocols/silc/silc.c:656 ../pidgin/gtkprefs.c:1566
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1636
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:670
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "�ndr�gostit(�)"
 
-#: ../libpurple/protocols/silc/silc.c:681
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -9757,46 +10120,63 @@
 "\n"
 "Metode de contactare preferate"
 
-#: ../libpurple/protocols/silc/silc.c:689
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:774
+#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:691
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:693
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Videoconferin釘�"
 
-#: ../libpurple/protocols/silc/silc.c:698
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Propriul status curent"
 
-#: ../libpurple/protocols/silc/silc.c:705
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Servicii de conectare"
 
-#: ../libpurple/protocols/silc/silc.c:708
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Permite altora s� vad� serviciile utilizate"
 
-#: ../libpurple/protocols/silc/silc.c:714
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Permite altora s� vad� calculatorul utilizat"
 
-#: ../libpurple/protocols/silc/silc.c:721
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Propriul fi�ier VCard"
 
-#: ../libpurple/protocols/silc/silc.c:733
-#: ../libpurple/protocols/silc/silc.c:734
+#: ../libpurple/protocols/silc/silc.c:812
+msgid "Timezone (UTC)"
+msgstr "Fus orar (UTC)"
+
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Atribute status utilizator"
 
-#: ../libpurple/protocols/silc/silc.c:735
+#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc10/silc.c:731
 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 "
@@ -9806,173 +10186,217 @@
 "informa釘iile personale. Completa釘i datele pe care dori釘i s� le face釘i "
 "accesibile."
 
-#: ../libpurple/protocols/silc/silc.c:776
-#: ../libpurple/protocols/silc/silc.c:782
-#: ../libpurple/protocols/silc/silc.c:1422
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "Mesajul zilei"
 
-#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Nu s-a g�sit un mesaj al zilei pe server"
 
-#: ../libpurple/protocols/silc/silc.c:777
-#: ../libpurple/protocols/silc/silc.c:1417
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Nu exist� un mesaj al zilei asociat acestei conexiuni."
 
-#: ../libpurple/protocols/silc/silc.c:828
-#: ../libpurple/protocols/silc/silc.c:872
-#: ../libpurple/protocols/silc/silc.c:943
-#: ../libpurple/protocols/silc/silc.c:944
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:939
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "Creeaz� o nou� pereche de chei SILC"
 
-#: ../libpurple/protocols/silc/silc.c:828
-msgid "Passphrases do not match"
-msgstr "Frazele secrete nu se potrivesc"
-
-#: ../libpurple/protocols/silc/silc.c:872
-msgid "Key Pair Generation failed"
-msgstr "Generarea perechii de chei a e�uat"
-
 #: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
+msgid "Passphrases do not match"
+msgstr "Frazele secrete nu se potrivesc"
+
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
+msgid "Key Pair Generation failed"
+msgstr "Generarea perechii de chei a e�uat"
+
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Lungime cheie"
 
-#: ../libpurple/protocols/silc/silc.c:913
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Fi�ier cheie public�"
 
-#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Fi�ier cheie privat�"
 
-#: ../libpurple/protocols/silc/silc.c:938
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Confirmare fraz�-parol�"
 
-#: ../libpurple/protocols/silc/silc.c:945
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Genereaz� pereche de chei"
 
-#: ../libpurple/protocols/silc/silc.c:990
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Status conectare"
 
-#: ../libpurple/protocols/silc/silc.c:999
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "Arat� mesajul zilei"
 
-#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "Creare pereche de chei SILC..."
 
-#: ../libpurple/protocols/silc/silc.c:1102
+#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Utilizatorul <I>%s</I> nu este prezent 樽n re釘ea"
 
-#: ../libpurple/protocols/silc/silc.c:1293
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "Topic prea lung"
 
-#: ../libpurple/protocols/silc/silc.c:1374
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "Trebuie s� specifica釘i un pseudonim"
 
-#: ../libpurple/protocols/silc/silc.c:1476
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "chat-ul %s nu a fost g�sit"
 
-#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "modurile de chat pentru %s sunt: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1483
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "chat-ul %s nu are setat nici un mod"
 
-#: ../libpurple/protocols/silc/silc.c:1496
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Nu s-au putut seta modurile chat-ului %s"
 
-#: ../libpurple/protocols/silc/silc.c:1526
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Comand� necunoscut�: %s (poate fi o problem� de client)"
 
-#: ../libpurple/protocols/silc/silc.c:1589
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [chat]:  P�r�se�te un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1593
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [chat]:  P�r�se�te un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nou topic&gt;]: Arat� sau schimb� topicul"
 
-#: ../libpurple/protocols/silc/silc.c:1602
+#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr ""
 "join &lt;chat&gt; [&lt;parol�&gt;]:  Intr� 樽ntr-un chat din aceast� re釘ea"
 
-#: ../libpurple/protocols/silc/silc.c:1606
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list:  Listeaz� chat-urile din aceast� re釘ea"
 
-#: ../libpurple/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;pseudonim&gt;:  Arat� detaliile utilizatorului"
 
-#: ../libpurple/protocols/silc/silc.c:1614
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1607
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr ""
 "msg &lt;pseudonim&gt; &lt;message&gt;:  Trimite un mesaj privat "
 "utilizatorului"
 
-#: ../libpurple/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr ""
 "query &lt;pseudonim&gt; [&lt;mesaj&gt;]:  Trimite un mesaj privat "
 "utilizatorului"
 
-#: ../libpurple/protocols/silc/silc.c:1622
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Arat� mesajul zilei de pe server"
 
-#: ../libpurple/protocols/silc/silc.c:1626
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:  Deta�eaz� aceast� sesiune"
 
-#: ../libpurple/protocols/silc/silc.c:1630
+#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [mesaj]:  Deconectare de la server cu mesajul precizat"
 
-#: ../libpurple/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;comand�&gt;:  Ini釘iaz� o comand� client SILC"
 
-#: ../libpurple/protocols/silc/silc.c:1640
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;pseudonim&gt;  [-cheie|&lt;motiv&gt;]:  Elimin� utilizatorul"
 
-#: ../libpurple/protocols/silc/silc.c:1644
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;pseudonim nou&gt;:  Schimbare pseudonim propriu"
 
-#: ../libpurple/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowah &lt;pseudonim&gt;:  Arat� detaliile utilizatorului"
 
-#: ../libpurple/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:1645
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -9980,7 +10404,8 @@
 "cmode &lt;chat&gt; [+|-&lt;moduri&gt;] [argumente]:   Schimb� sau arat� "
 "modurile chat-ului."
 
-#: ../libpurple/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc10/silc.c:1649
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -9988,15 +10413,18 @@
 "cumode &lt;chat&gt; +|-&lt;moduri&gt; &lt;pseudonim&gt;:  Schimb� modurile "
 "respectivului utilizator 樽n chat"
 
-#: ../libpurple/protocols/silc/silc.c:1660
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt:moduri_utilizator&gt;:  Seteaz� modurile 樽n re釘ea"
 
-#: ../libpurple/protocols/silc/silc.c:1664
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;pseudonim&gt; [-cheie]:  Cere privilegii de utilizator"
 
-#: ../libpurple/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:1661
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
@@ -10004,41 +10432,49 @@
 "invite &lt;chat&gt; [-|+]&lt;pseudonim&gt;:  invit� respectivul utilizator "
 "sau adaug�-l/�terge-l din lista invita釘ilor chat-ului"
 
-#: ../libpurple/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;chat&gt; &lt;pseudonim&gt; [comentariu]: D� afar� din chat un "
 "utilizator."
 
-#: ../libpurple/protocols/silc/silc.c:1676
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  Arat� detalii administrative despre server"
 
-#: ../libpurple/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr ""
 "ban [&lt;chat&gt; +|-&lt;pseudonim&gt]:  Interzice utilizatorului respectiv "
 "accesul la acest chat"
 
-#: ../libpurple/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;pseudonim|server&gt;:  Reg�se�te cheia public� a clientului sau a "
 "serverului"
 
-#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Arat� statisticile serverului �i ale re釘elei"
 
-#: ../libpurple/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  PING c�tre serverul curent"
 
-#: ../libpurple/protocols/silc/silc.c:1697
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "user &lt;chat&gt;:  Listeaz� utilizatorii dintr-un chat"
 
-#: ../libpurple/protocols/silc/silc.c:1701
+#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc10/silc.c:1694
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -10055,116 +10491,141 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1824
+#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "Modul de protocol SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1826
+#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Protocol SILC (Secure Internet Live Conferencing)"
 
-#: ../libpurple/protocols/silc/silc.c:1858 ../pidgin/gtkprefs.c:1959
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2029
 msgid "Network"
 msgstr "Re釘ea"
 
-#: ../libpurple/protocols/silc/silc.c:1869
+#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "Fi�ier cheie public�"
 
-#: ../libpurple/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "Fi�ier cheie privat�"
 
-#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "Cifru"
 
-#: ../libpurple/protocols/silc/silc.c:1893
+#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1896
+#: ../libpurple/protocols/silc/silc.c:1948
+msgid "Use Perfect Forward Secrecy"
+msgstr "Utilizeaz� ��Perfect Forward Secrecy��"
+
+#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "Autentificare cu cheie public�"
 
-#: ../libpurple/protocols/silc/silc.c:1899
-msgid "Reject watching by other users"
-msgstr "Nu permite altor utilizatori s� urm�reasc� discu釘iile"
-
-#: ../libpurple/protocols/silc/silc.c:1902
-msgid "Block invites"
-msgstr "Blocheaz� invita釘iile"
-
-#: ../libpurple/protocols/silc/silc.c:1905
+#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Blocheaz� mesajele f�r� schimb de chei"
 
-#: ../libpurple/protocols/silc/silc.c:1908
-msgid "Reject online status attribute requests"
-msgstr "Refuz� cererile pentru atributul st�rii de conectare"
-
-#: ../libpurple/protocols/silc/silc.c:1911
+#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "Blocheaz� mesajele c�tre ��whiteboard��"
 
-#: ../libpurple/protocols/silc/silc.c:1914
+#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "Deschide automat un ��whiteboard��"
 
-#: ../libpurple/protocols/silc/silc.c:1917
+#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "Semneaz� digital �i verific� toate mesajele"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Creez perechea de chei SILC..."
 
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+msgid "Cannot create SILC key pair\n"
+msgstr "Nu s-a putut crea perechea de chei SILC\n"
+
 #. 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)
-#: ../libpurple/protocols/silc/util.c:355
+#: ../libpurple/protocols/silc/util.c:358
+#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Nume real: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Nume utilizator: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "Adres� de mail: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Nume calculator: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organiza釘ie: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "鄭ar�: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritm: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Lungime cheie: \t%d octe釘i\n"
 
-#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:372
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "Versiune: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -10175,7 +10636,8 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -10184,38 +10646,45 @@
 "Cheie public� silabic�:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Detalii cheie public�"
 
-#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Pager"
 
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videoconferin釘�"
 
-#: ../libpurple/protocols/silc/util.c:579
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Calculator"
 
-#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr ""
 "%s a trimis un mesaj pentru ��whiteboard��. Dori釘i s� deschid un ��whiteboard��?"
 
-#: ../libpurple/protocols/silc/wb.c:288
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
 #, c-format
 msgid ""
 "%s sent message to whiteboard on %s channel. Would you like to open the "
@@ -10224,36 +10693,100 @@
 "%s a trimis un mesaj c�tre ��whiteboard�� 樽n chat-ul %s. Dori釘i s� deschid un "
 "whiteboard?"
 
-#: ../libpurple/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "��Whiteboard��"
 
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "Nici o statistic� nu e disponibil� pentru server"
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr ""
+"Eroare: Nepotrivire de versiune, 樽ncerca釘i o versiune mai nou� de client"
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr ""
+"Eroare: Partenerul nu v� suport� tipul de cheie public� sau nu are 樽ncredere "
+"樽n ea."
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Eroare: Partenerul nu suport� grupul KE propus"
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Eroare: Partenerul nu suport� cifrul propus"
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Eroare: Partenerul nu suport PKCS-ul propus"
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Eroare: Partenerul nu suport� func釘ia hash propus�"
+
+#: ../libpurple/protocols/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Eroare: Partenerul nu suporta HMAC-ul propus"
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr "Eroare: Semn�tur� incorect�"
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr "Eroare: Cookie invalid"
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr "Eroare: Autentificare e�uat�"
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "Nu s-a putut ini釘ializa conexiunea ca client SILC"
+
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr "Ion F�r�nume"
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr "Directorul ~/.silc nu a fost g�sit sau nu poate fi accesat."
+
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "Nu s-a putut 樽nc�rca perechea de chei SILC: %s"
+
 #. TODO: do we really want to disconnect on a failure to write?
 #: ../libpurple/protocols/simple/simple.c:416
 msgid "Could not write"
 msgstr "Nu s-a putut scrie"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1484
+#: ../libpurple/protocols/simple/simple.c:1489
 msgid "Could not connect"
 msgstr "Conectare e�uat�"
 
-#: ../libpurple/protocols/simple/simple.c:1518
-#: ../libpurple/protocols/simple/simple.c:1560
-#: ../libpurple/protocols/simple/simple.c:1573
-#: ../libpurple/protocols/simple/simple.c:1624
+#: ../libpurple/protocols/simple/simple.c:1523
+#: ../libpurple/protocols/simple/simple.c:1565
+#: ../libpurple/protocols/simple/simple.c:1578
+#: ../libpurple/protocols/simple/simple.c:1629
 msgid "Could not create listen socket"
 msgstr "Nu s-a putut crea un socket de ascultare"
 
-#: ../libpurple/protocols/simple/simple.c:1541
+#: ../libpurple/protocols/simple/simple.c:1546
 msgid "Couldn't resolve host"
 msgstr "Nu s-a putut rezolva numele calculatorului"
 
-#: ../libpurple/protocols/simple/simple.c:1632
+#: ../libpurple/protocols/simple/simple.c:1637
 msgid "Could not resolve hostname"
 msgstr "Nu s-a putut rezolva numele calculatorului"
 
-#: ../libpurple/protocols/simple/simple.c:1649
+#: ../libpurple/protocols/simple/simple.c:1654
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "Numele de identificare SIP nu pot con釘ine spa釘ii sau simbolul @"
 
@@ -10265,36 +10798,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1824
+#: ../libpurple/protocols/simple/simple.c:1829
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Modul de protocol SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1825
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Modulul de protocol SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1858
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Public� statusul (aten釘ie: oricine v� poate vedea)"
 
-#: ../libpurple/protocols/simple/simple.c:1859
+#: ../libpurple/protocols/simple/simple.c:1864
 msgid "Use UDP"
 msgstr "Utilizeaz� UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/simple/simple.c:1866
 msgid "Use proxy"
 msgstr "Utilizeaz� proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1863
+#: ../libpurple/protocols/simple/simple.c:1868
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1865
+#: ../libpurple/protocols/simple/simple.c:1870
 msgid "Auth User"
 msgstr "Autentificare utilizator"
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1872
 msgid "Auth Domain"
 msgstr "Autentificare domeniu"
 
@@ -10456,8 +10989,8 @@
 msgid "Password Change Successful"
 msgstr "Parola a fost schimbat� cu succes"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5462
-#: ../pidgin/gtkblist.c:5816
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5519
+#: ../pidgin/gtkblist.c:5873
 msgid "_Group:"
 msgstr "_Grup:"
 
@@ -10620,8 +11153,8 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:2684
 #: ../libpurple/protocols/yahoo/yahoo.c:2787
 #: ../libpurple/protocols/yahoo/yahoo.c:2797
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Probleme la conectare"
@@ -10812,37 +11345,37 @@
 msgid "Yahoo Chat port"
 msgstr "Port Yahoo Chat"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:203
+#: ../libpurple/protocols/yahoo/yahoochat.c:204
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 "%s a declinat invita釘ia la conferin釘a din camera de chat ��%s�� din urm�torul "
 "motiv: ��%s��."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:205
+#: ../libpurple/protocols/yahoo/yahoochat.c:206
 msgid "Invitation Rejected"
 msgstr "Invita釘ie respins�"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:361
+#: ../libpurple/protocols/yahoo/yahoochat.c:362
 msgid "Failed to join chat"
 msgstr "Intrarea 樽n chat a e�uat"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:364
+#: ../libpurple/protocols/yahoo/yahoochat.c:365
 msgid "Unknown room"
 msgstr "Camer� de chat necunoscut�"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:367
+#: ../libpurple/protocols/yahoo/yahoochat.c:368
 msgid "Maybe the room is full"
 msgstr "Camera de chat e probabil plin�"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:370
+#: ../libpurple/protocols/yahoo/yahoochat.c:371
 msgid "Not available"
 msgstr "Indisponibil(�)"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:374
+#: ../libpurple/protocols/yahoo/yahoochat.c:375
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
@@ -10850,38 +11383,38 @@
 "Eroare necunoscut�. S-ar putea s� trebuiasc� s� v� deconecta釘i pentru cinci "
 "minute 樽nainte de a reintra 樽n camera de chat."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
+#: ../libpurple/protocols/yahoo/yahoochat.c:453
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "A釘i intrat 樽n camera de chat %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:627
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
 msgid "Failed to join buddy in chat"
 msgstr "Intrarea 樽n chat al�turi de acest contact a e�uat"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:629
 msgid "Maybe they're not in a chat?"
 msgstr "Poate nu e sau nu sunt 樽n nici un chat?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Fetching the room list failed."
 msgstr "Ob釘inerea listei camerelor de chat a e�uat."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1441
+#: ../libpurple/protocols/yahoo/yahoochat.c:1404
 msgid "Voices"
 msgstr "Audio"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1444
+#: ../libpurple/protocols/yahoo/yahoochat.c:1407
 msgid "Webcams"
 msgstr "Video"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
 msgid "Unable to fetch room list."
 msgstr "Nu se poate ob釘ine lista camerelor de chat."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1518
+#: ../libpurple/protocols/yahoo/yahoochat.c:1481
 msgid "User Rooms"
 msgstr "Camere de chat utilizatori"
 
@@ -10892,26 +11425,26 @@
 msgid "Sent Doodle request."
 msgstr "S-a trimis o cerere de m但zg�leal�."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
 msgid "Unable to establish file descriptor."
 msgstr "Nu se poate evalua descriptorul fi�ierului."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:289
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
 msgid "Write Error"
 msgstr "Eroare la scriere"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Profil Yahoo! Japonia"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Profil Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
@@ -10919,7 +11452,7 @@
 "Ne cerem scuze, profilurile ce con釘in materiale pentru adul釘i nu sunt "
 "suportate deocamdat�."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
@@ -10927,47 +11460,47 @@
 "Dac� dori釘i s� vede釘i acest profil va trebui s� deschide釘i aceast� adres� 樽n "
 "navigator:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "Identitate Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "Hobbyuri"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "Nout�釘i"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "Pagin� personal�"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "Adres� interesant� 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "Adres� interesant� 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "Adres� interesant� 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "Ultima actualizare"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Detaliile utilizatorului %s nu sunt disponibile"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
@@ -10975,7 +11508,7 @@
 "Scuze, acest profil pare s� fie 樽ntr-o limb� sau 樽ntr-un format nesuportate "
 "deocamdat�."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
@@ -10983,7 +11516,7 @@
 "Nu s-a putut desc�rca profilul utilizatorului, probabil din cauza unei "
 "disfunc釘ionalit�釘i temporare a serverului. �ncerca釘i din nou mai t但rziu."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 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 "
@@ -10994,7 +11527,7 @@
 "profilul unui utilizator valid. Mai 樽ncerca釘i o dat� dac� �ti釘i sigur c� "
 "acest utilizator exist�."
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "Profilul utilizatorului este gol."
 
@@ -11236,11 +11769,11 @@
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:47
 msgid "I'm not here right now"
 msgstr "Lipsesc momentan"
 
-#: ../libpurple/savedstatuses.c:532
+#: ../libpurple/savedstatuses.c:534
 msgid "saved statuses"
 msgstr "statusuri salvate"
 
@@ -11249,7 +11782,7 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s este cunoscut acum ca %s.\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:680
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11258,12 +11791,12 @@
 "%s a invitat utilizatorul %s 樽n camera de chat %s\n"
 "%s"
 
-#: ../libpurple/server.c:684
+#: ../libpurple/server.c:685
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s a invitat utilizatorul %s 樽n camera de chat %s\n"
 
-#: ../libpurple/server.c:688
+#: ../libpurple/server.c:689
 msgid "Accept chat invitation?"
 msgstr "Accepta釘i invita釘ia la chat?"
 
@@ -11271,9 +11804,13 @@
 msgid "Unset"
 msgstr "Nesetat"
 
-#: ../libpurple/status.c:155
-msgid "Unavailable"
-msgstr "Indisponibil(�)"
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+msgid "Do not disturb"
+msgstr "Nu deranja釘i"
+
+#: ../libpurple/status.c:158
+msgid "Extended away"
+msgstr "Absen釘� prelungit�"
 
 #: ../libpurple/status.c:159
 msgid "Mobile"
@@ -11314,17 +11851,17 @@
 msgid "+++ %s became unidle"
 msgstr "+++ %s a revenit din inactivitate"
 
-#: ../libpurple/util.c:682
+#: ../libpurple/util.c:717
 #, c-format
 msgid "%x %X"
 msgstr "%x la %X"
 
-#: ../libpurple/util.c:2554
+#: ../libpurple/util.c:2692
 #, c-format
 msgid "Error Reading %s"
 msgstr "Eroare la citirea %s"
 
-#: ../libpurple/util.c:2555
+#: ../libpurple/util.c:2693
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11333,15 +11870,15 @@
 "A ap�rut o eroare la citirea fi�ierului %s. �nc�rcarea datelor a e�uat �i "
 "vechiul fi�ier a fost redenumit ��%s~��."
 
-#: ../libpurple/util.c:3025
+#: ../libpurple/util.c:3193
 msgid "Calculating..."
 msgstr "Se calculeaz�..."
 
-#: ../libpurple/util.c:3028
+#: ../libpurple/util.c:3196
 msgid "Unknown."
 msgstr "Necunoscut."
 
-#: ../libpurple/util.c:3054
+#: ../libpurple/util.c:3222
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -11349,7 +11886,7 @@
 msgstr[1] "%d secunde"
 msgstr[2] "%d de secunde"
 
-#: ../libpurple/util.c:3066
+#: ../libpurple/util.c:3234
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -11357,7 +11894,7 @@
 msgstr[1] "%d zile"
 msgstr[2] "%d de zile"
 
-#: ../libpurple/util.c:3074
+#: ../libpurple/util.c:3242
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
@@ -11365,7 +11902,7 @@
 msgstr[1] "%s, %d ore"
 msgstr[2] "%s, %d de ore"
 
-#: ../libpurple/util.c:3080
+#: ../libpurple/util.c:3248
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -11373,7 +11910,7 @@
 msgstr[1] "%d ore"
 msgstr[2] "%d de ore"
 
-#: ../libpurple/util.c:3088
+#: ../libpurple/util.c:3256
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
@@ -11381,7 +11918,7 @@
 msgstr[1] "%s, %d minute"
 msgstr[2] "%s, %d de minute"
 
-#: ../libpurple/util.c:3094
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -11389,17 +11926,17 @@
 msgstr[1] "%d minute"
 msgstr[2] "%d de minute"
 
-#: ../libpurple/util.c:3354
+#: ../libpurple/util.c:3522
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "Nu s-a putut deschide %s: prea multe redirect�ri"
 
-#: ../libpurple/util.c:3391 ../libpurple/util.c:3686
+#: ../libpurple/util.c:3559 ../libpurple/util.c:3854
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Conectarea la %s a e�uat"
 
-#: ../libpurple/util.c:3514
+#: ../libpurple/util.c:3682
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
@@ -11408,17 +11945,17 @@
 "Nu se poate aloca suficient� memorie pentru a p�stra datele de la %s. S-ar "
 "putea ca serverul web s� 樽ncerce ceva r�u inten釘ionat."
 
-#: ../libpurple/util.c:3549
+#: ../libpurple/util.c:3717
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Eroare la citirea din %s: %s"
 
-#: ../libpurple/util.c:3580
+#: ../libpurple/util.c:3748
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Eroare la scrierea %s: %s"
 
-#: ../libpurple/util.c:3605
+#: ../libpurple/util.c:3773
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Nu s-a reu�it conectarea la %s: %s"
@@ -11456,59 +11993,59 @@
 msgid "Screen _name:"
 msgstr "_Nume de identificare:"
 
-#: ../pidgin/gtkaccount.c:528
-msgid "Local _alias:"
+#: ../pidgin/gtkaccount.c:531
+msgid "_Local alias:"
 msgstr "_Alias local:"
 
-#: ../pidgin/gtkaccount.c:532
+#: ../pidgin/gtkaccount.c:535
 msgid "Remember pass_word"
 msgstr "_Salvare parol�"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:590
+#: ../pidgin/gtkaccount.c:593
 msgid "User Options"
 msgstr "Op釘iuni personale"
 
-#: ../pidgin/gtkaccount.c:603
+#: ../pidgin/gtkaccount.c:606
 msgid "New _mail notifications"
 msgstr "Notificare la _mail nou"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:608
+#: ../pidgin/gtkaccount.c:611
 msgid "Use this buddy _icon for this account:"
 msgstr "Utilizeaz� aceast� _iconi釘� pentru acest cont:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:728
+#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "Op釘iuni %s"
 
-#: ../pidgin/gtkaccount.c:933
+#: ../pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
 msgstr "Utilizeaz� set�rile GNOME"
 
-#: ../pidgin/gtkaccount.c:934
+#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "Utilizeaz� set�rile generice"
 
-#: ../pidgin/gtkaccount.c:940
+#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "F�r� proxy"
 
-#: ../pidgin/gtkaccount.c:946
+#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:952
+#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:958
+#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:964 ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1206
 msgid "Use Environmental Settings"
 msgstr "Utilizeaz� set�rile de mediu"
 
@@ -11517,60 +12054,60 @@
 #. 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:1003
+#: ../pidgin/gtkaccount.c:1006
 msgid "If you look real closely"
 msgstr "Dac� v� uita釘i cu aten釘ie"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1006
+#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "ve釘i pute釘i vedea cum se scurg secundele..."
 
-#: ../pidgin/gtkaccount.c:1027
-msgid "Pro_xy Options"
-msgstr "Op釘iuni pro_xy"
-
-#: ../pidgin/gtkaccount.c:1041 ../pidgin/gtkprefs.c:1131
+#: ../pidgin/gtkaccount.c:1030
+msgid "Proxy Options"
+msgstr "Op釘iuni proxy"
+
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1200
 msgid "Proxy _type:"
 msgstr "_Tip proxy:"
 
-#: ../pidgin/gtkaccount.c:1050 ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1221
 msgid "_Host:"
 msgstr "Ser_ver:"
 
-#: ../pidgin/gtkaccount.c:1054 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1239
 msgid "_Port:"
 msgstr "P_ort:"
 
-#: ../pidgin/gtkaccount.c:1062
+#: ../pidgin/gtkaccount.c:1065
 msgid "_Username:"
 msgstr "Nume _utilizator:"
 
-#: ../pidgin/gtkaccount.c:1069 ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1276
 msgid "Pa_ssword:"
 msgstr "Pa_rol�:"
 
-#: ../pidgin/gtkaccount.c:1475
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "Ad�ugare cont"
 
-#: ../pidgin/gtkaccount.c:1499
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "S_tandard"
 
-#: ../pidgin/gtkaccount.c:1510
+#: ../pidgin/gtkaccount.c:1503
 msgid "_Advanced"
 msgstr "_Avansate"
 
-#: ../pidgin/gtkaccount.c:1982 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1977 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "Activat"
 
-#: ../pidgin/gtkaccount.c:2010
+#: ../pidgin/gtkaccount.c:2005
 msgid "Protocol"
 msgstr "Protocol"
 
-#: ../pidgin/gtkaccount.c:2211
+#: ../pidgin/gtkaccount.c:2205
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11587,111 +12124,111 @@
 "\n"
 "Nu ave釘i configurat deocamdat� un cont de mesagerie instant. Pentru a v� "
 "conecta cu %s utiliza釘i butonul <b>Adaug�</b> pentru a defini un prim cont. "
-"Dac� dori釘i s� utiliza釘i multiple conturi 樽n %s utiliza釘i <b>Adaug�</b> "
-"de c但te dori釘i.\n"
+"Dac� dori釘i s� utiliza釘i multiple conturi 樽n %s utiliza釘i <b>Adaug�</b> de "
+"c但te dori釘i.\n"
 "\n"
 "Ve釘i putea reveni la aceast� fereastr� pentru a ad�uga, edita sau �terge "
 "conturi utiliz但nd <b>Conturi->Ad�ugare/Editare</b> 樽n fereastra listei de "
 "contacte."
 
-#: ../pidgin/gtkblist.c:719
+#: ../pidgin/gtkblist.c:763
 msgid "Join a Chat"
 msgstr "Intr� 樽ntr-un chat"
 
-#: ../pidgin/gtkblist.c:740
+#: ../pidgin/gtkblist.c:784
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Introduce釘i detaliile chat-ului 樽n care dori釘i s� intra釘i.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:751 ../pidgin/gtkblist.c:5410
-#: ../pidgin/gtkblist.c:5777 ../pidgin/gtkpounce.c:531
-#: ../pidgin/gtkroomlist.c:399
+#: ../pidgin/gtkblist.c:795 ../pidgin/gtkblist.c:5467
+#: ../pidgin/gtkblist.c:5834 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "C_ont:"
 
-#: ../pidgin/gtkblist.c:1040 ../pidgin/gtkprivacy.c:606
-#: ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkblist.c:1084 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_Blocheaz�"
 
-#: ../pidgin/gtkblist.c:1040
+#: ../pidgin/gtkblist.c:1084
 msgid "Un_block"
 msgstr "De_blocheaz�"
 
-#: ../pidgin/gtkblist.c:1091
+#: ../pidgin/gtkblist.c:1135
 msgid "Get _Info"
 msgstr "_Detalii"
 
-#: ../pidgin/gtkblist.c:1094 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1138 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "_Mesaj"
 
-#: ../pidgin/gtkblist.c:1100
+#: ../pidgin/gtkblist.c:1144
 msgid "_Send File"
 msgstr "_Trimitere fi�ier"
 
-#: ../pidgin/gtkblist.c:1107
+#: ../pidgin/gtkblist.c:1151
 msgid "Add Buddy _Pounce"
 msgstr "Adaug� 樽_nt但mpinare"
 
-#: ../pidgin/gtkblist.c:1111 ../pidgin/gtkblist.c:1115
-#: ../pidgin/gtkblist.c:1217 ../pidgin/gtkblist.c:1240
+#: ../pidgin/gtkblist.c:1155 ../pidgin/gtkblist.c:1159
+#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
 msgid "View _Log"
 msgstr "Arat� 樽n_registr�rile"
 
-#: ../pidgin/gtkblist.c:1127 ../pidgin/gtkblist.c:1136
-#: ../pidgin/gtkblist.c:1225 ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1171 ../pidgin/gtkblist.c:1180
+#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1130 ../pidgin/gtkblist.c:1138
-#: ../pidgin/gtkblist.c:1227 ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkblist.c:1174 ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
 msgid "_Remove"
 msgstr "�ter_ge"
 
-#: ../pidgin/gtkblist.c:1187
+#: ../pidgin/gtkblist.c:1232
 msgid "Add a _Buddy"
 msgstr "_Ad�ugare contact"
 
-#: ../pidgin/gtkblist.c:1190
+#: ../pidgin/gtkblist.c:1235
 msgid "Add a C_hat"
 msgstr "Ad�ugare c_hat"
 
-#: ../pidgin/gtkblist.c:1193
+#: ../pidgin/gtkblist.c:1238
 msgid "_Delete Group"
 msgstr "�ter_gere grup"
 
-#: ../pidgin/gtkblist.c:1195
+#: ../pidgin/gtkblist.c:1240
 msgid "_Rename"
 msgstr "_Redenumire"
 
 #. join button
-#: ../pidgin/gtkblist.c:1213 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "_Intr�"
 
-#: ../pidgin/gtkblist.c:1215
+#: ../pidgin/gtkblist.c:1260
 msgid "Auto-Join"
 msgstr "Intr� automat"
 
-#: ../pidgin/gtkblist.c:1253 ../pidgin/gtkblist.c:1276
+#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1321
 msgid "_Collapse"
 msgstr "_Str但nge"
 
-#: ../pidgin/gtkblist.c:1281
+#: ../pidgin/gtkblist.c:1326
 msgid "_Expand"
 msgstr "Des_f�"
 
-#: ../pidgin/gtkblist.c:1526 ../pidgin/gtkblist.c:1538
-#: ../pidgin/gtkblist.c:4524 ../pidgin/gtkblist.c:4534
+#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkblist.c:1583
+#: ../pidgin/gtkblist.c:4561 ../pidgin/gtkblist.c:4571
 msgid "/Tools/Mute Sounds"
 msgstr "/Unelte/F�r� sunete"
 
-#: ../pidgin/gtkblist.c:1998 ../pidgin/gtkconv.c:4539
-#: ../pidgin/gtkpounce.c:423
+#: ../pidgin/gtkblist.c:2043 ../pidgin/gtkconv.c:4619
+#: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
@@ -11752,64 +12289,73 @@
 msgstr "/Contacte/Adaug� un _grup..."
 
 #: ../pidgin/gtkblist.c:2854
-msgid "/Buddies/_About Pidgin"
-msgstr "/Contacte/_Despre Pidgin"
-
-#: ../pidgin/gtkblist.c:2855
 msgid "/Buddies/_Quit"
 msgstr "/Contacte/_Ie�ire"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2858
+#: ../pidgin/gtkblist.c:2857
 msgid "/_Accounts"
 msgstr "/_Conturi"
 
-#: ../pidgin/gtkblist.c:2859 ../pidgin/gtkblist.c:6475
+#: ../pidgin/gtkblist.c:2858 ../pidgin/gtkblist.c:6532
 msgid "/Accounts/Add\\/Edit"
 msgstr "/Conturi/Ad�ugare\\/Editare"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2861
 msgid "/_Tools"
 msgstr "/Unel_te"
 
-#: ../pidgin/gtkblist.c:2863
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Unelte/�_nt但mpin�ri contacte"
 
-#: ../pidgin/gtkblist.c:2864
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/Plu_gins"
 msgstr "/Unelte/_Module"
 
-#: ../pidgin/gtkblist.c:2865
+#: ../pidgin/gtkblist.c:2864
 msgid "/Tools/Pr_eferences"
 msgstr "/Unelte/_Preferin釘e"
 
-#: ../pidgin/gtkblist.c:2866
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Pr_ivacy"
 msgstr "/Unelte/S_ecuritate"
 
-#: ../pidgin/gtkblist.c:2868
+#: ../pidgin/gtkblist.c:2867
 msgid "/Tools/_File Transfers"
 msgstr "/Unelte/_Transfer de fi�iere"
 
-#: ../pidgin/gtkblist.c:2869
+#: ../pidgin/gtkblist.c:2868
 msgid "/Tools/R_oom List"
 msgstr "/Unelte/_List� camere de chat"
 
-#: ../pidgin/gtkblist.c:2870
+#: ../pidgin/gtkblist.c:2869
 msgid "/Tools/System _Log"
 msgstr "/Unelte/�n_registr�ri de sistem"
 
 #: ../pidgin/gtkblist.c:2871
-msgid "/Tools/_Debug Window"
-msgstr "/Unelte/_Fereastr� de depanare"
-
-#: ../pidgin/gtkblist.c:2873
 msgid "/Tools/Mute _Sounds"
 msgstr "/Unelte/F�r� _sunete"
 
-#: ../pidgin/gtkblist.c:2901
+#. Help
+#: ../pidgin/gtkblist.c:2873
+msgid "/_Help"
+msgstr "/_Ajutor"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Help/Online _Help"
+msgstr "/Ajutor/Ajutor _online"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Help/_Debug Window"
+msgstr "/Ajutor/_Fereastr� de depanare"
+
+#: ../pidgin/gtkblist.c:2877 ../pidgin/gtkblist.c:2879
+msgid "/Help/_About"
+msgstr "/Ajutor/_Despre"
+
+#: ../pidgin/gtkblist.c:2908
 #, c-format
 msgid ""
 "\n"
@@ -11818,73 +12364,78 @@
 "\n"
 "<b>Cont:</b> %s"
 
-#: ../pidgin/gtkblist.c:2979
+#: ../pidgin/gtkblist.c:2986
 msgid "Buddy Alias"
 msgstr "Alias contact"
 
-#: ../pidgin/gtkblist.c:3000
+#: ../pidgin/gtkblist.c:3015
 msgid "Logged In"
 msgstr "Autentificat(�)"
 
-#: ../pidgin/gtkblist.c:3046
+#: ../pidgin/gtkblist.c:3061
 msgid "Last Seen"
 msgstr "Ultima apari釘ie"
 
-#: ../pidgin/gtkblist.c:3066
+#: ../pidgin/gtkblist.c:3081
 msgid "Spooky"
 msgstr "Fantomatic"
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:3083
 msgid "Awesome"
 msgstr "Genial"
 
-#: ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3085
 msgid "Rockin'"
 msgstr "Beton"
 
-#: ../pidgin/gtkblist.c:3399
+#: ../pidgin/gtkblist.c:3428
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr "Inactiv(�) de: %dd %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3430
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inactiv(�) de: %do %02dm"
 
-#: ../pidgin/gtkblist.c:3401
+#: ../pidgin/gtkblist.c:3432
 #, c-format
 msgid "Idle %dm"
 msgstr "Inactiv(�) de: %dm"
 
-#: ../pidgin/gtkblist.c:3546
+#: ../pidgin/gtkblist.c:3577
 msgid "/Buddies/New Instant Message..."
 msgstr "/Contacte/Trimite un nou mesaj..."
 
-#: ../pidgin/gtkblist.c:3547 ../pidgin/gtkblist.c:3580
+#: ../pidgin/gtkblist.c:3578 ../pidgin/gtkblist.c:3611
 msgid "/Buddies/Join a Chat..."
 msgstr "/Contacte/Intr� 樽ntr-un chat..."
 
-#: ../pidgin/gtkblist.c:3548
+#: ../pidgin/gtkblist.c:3579
 msgid "/Buddies/Get User Info..."
 msgstr "/Contacte/Caut� detalii..."
 
-#: ../pidgin/gtkblist.c:3549
+#: ../pidgin/gtkblist.c:3580
 msgid "/Buddies/Add Buddy..."
 msgstr "/Contacte/Adaug� un contact..."
 
-#: ../pidgin/gtkblist.c:3550 ../pidgin/gtkblist.c:3583
+#: ../pidgin/gtkblist.c:3581 ../pidgin/gtkblist.c:3614
 msgid "/Buddies/Add Chat..."
 msgstr "/Contacte/Adaug� un chat..."
 
-#: ../pidgin/gtkblist.c:3551
+#: ../pidgin/gtkblist.c:3582
 msgid "/Buddies/Add Group..."
 msgstr "/Contacte/Adaug� un grup..."
 
-#: ../pidgin/gtkblist.c:3586
+#: ../pidgin/gtkblist.c:3617
 msgid "/Tools/Privacy"
 msgstr "/Unelte/Securitate"
 
-#: ../pidgin/gtkblist.c:3589
+#: ../pidgin/gtkblist.c:3620
 msgid "/Tools/Room List"
 msgstr "/Unelte/List� camere de chat"
 
-#: ../pidgin/gtkblist.c:3686 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3717 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -11892,54 +12443,54 @@
 msgstr[1] "%d mesaje necitite de la %s\n"
 msgstr[2] "%d de mesaje necitite de la %s\n"
 
-#: ../pidgin/gtkblist.c:3763
+#: ../pidgin/gtkblist.c:3797
 msgid "Manually"
 msgstr "Manual"
 
-#: ../pidgin/gtkblist.c:3765
+#: ../pidgin/gtkblist.c:3799
 msgid "Alphabetically"
 msgstr "Alfabetic"
 
-#: ../pidgin/gtkblist.c:3766
+#: ../pidgin/gtkblist.c:3800
 msgid "By status"
 msgstr "Dup� status"
 
-#: ../pidgin/gtkblist.c:3767
+#: ../pidgin/gtkblist.c:3801
 msgid "By log size"
 msgstr "Dup� m�rimea 樽nregistr�rilor"
 
-#: ../pidgin/gtkblist.c:3969 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4005 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "%s s-a deconectat"
 
-#: ../pidgin/gtkblist.c:3979
+#: ../pidgin/gtkblist.c:4015
 msgid "Re-enable Account"
 msgstr "Reactivare cont"
 
-#: ../pidgin/gtkblist.c:4003
+#: ../pidgin/gtkblist.c:4039
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">%s a fost deconectat(�): %s</span>"
 
-#: ../pidgin/gtkblist.c:4155
+#: ../pidgin/gtkblist.c:4191
 msgid "<b>Username:</b>"
 msgstr "<b>Nume utilizator:</b>"
 
-#: ../pidgin/gtkblist.c:4162
+#: ../pidgin/gtkblist.c:4198
 msgid "<b>Password:</b>"
 msgstr "<b>Parol�:</b>"
 
-#: ../pidgin/gtkblist.c:4173
+#: ../pidgin/gtkblist.c:4209
 msgid "_Login"
 msgstr "_Autentificare"
 
-#: ../pidgin/gtkblist.c:4258
+#: ../pidgin/gtkblist.c:4292
 msgid "/Accounts"
 msgstr "/Conturi"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4272
+#: ../pidgin/gtkblist.c:4306
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -11957,23 +12508,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4518
+#: ../pidgin/gtkblist.c:4555
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/Contacte/Arat� contactele deconectate"
 
-#: ../pidgin/gtkblist.c:4521
+#: ../pidgin/gtkblist.c:4558
 msgid "/Buddies/Show Empty Groups"
 msgstr "/Contacte/Arat� grupurile f�r� contacte"
 
-#: ../pidgin/gtkblist.c:4527
+#: ../pidgin/gtkblist.c:4564
 msgid "/Buddies/Show Buddy Details"
 msgstr "/Contacte/Arat� detaliile contactelor"
 
-#: ../pidgin/gtkblist.c:4530
+#: ../pidgin/gtkblist.c:4567
 msgid "/Buddies/Show Idle Times"
 msgstr "/Contacte/Arat� inactivitatea contactelor"
 
-#: ../pidgin/gtkblist.c:5387
+#: ../pidgin/gtkblist.c:5444
 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. "
@@ -11984,19 +12535,19 @@
 "Aliasul va fi afi�at 樽n locul numelui original de c但te ori este posibil.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5422
+#: ../pidgin/gtkblist.c:5479
 msgid "_Screen name:"
 msgstr "Nume de _identificare:"
 
-#: ../pidgin/gtkblist.c:5444 ../pidgin/gtkblist.c:5798
+#: ../pidgin/gtkblist.c:5501 ../pidgin/gtkblist.c:5855
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:5710
+#: ../pidgin/gtkblist.c:5767
 msgid "This protocol does not support chat rooms."
 msgstr "Acest protocol nu suport� camere de chat."
 
-#: ../pidgin/gtkblist.c:5726
+#: ../pidgin/gtkblist.c:5783
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -12004,7 +12555,7 @@
 "Nu sunte釘i autentificat(�) cu vreun protocol prin care s� pute釘i ini釘ia un "
 "chat."
 
-#: ../pidgin/gtkblist.c:5767
+#: ../pidgin/gtkblist.c:5824
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12012,39 +12563,39 @@
 "Introduce釘i un alias �i informa釘iile necesare pentru acel chat pe care "
 "dori釘i s�-l ad�uga釘i 樽n lista de contacte.\n"
 
-#: ../pidgin/gtkblist.c:5855
+#: ../pidgin/gtkblist.c:5912
 msgid "Please enter the name of the group to be added."
 msgstr "Introduce釘i numele grupului de ad�ugat."
 
-#: ../pidgin/gtkblist.c:6495
+#: ../pidgin/gtkblist.c:6552
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Conturi/"
 
-#: ../pidgin/gtkblist.c:6519
+#: ../pidgin/gtkblist.c:6576
 msgid "_Edit Account"
 msgstr "_Editare cont"
 
-#: ../pidgin/gtkblist.c:6532 ../pidgin/gtkconv.c:2927
+#: ../pidgin/gtkblist.c:6589 ../pidgin/gtkconv.c:2992
 msgid "No actions available"
 msgstr "Nici o ac釘iune nu e disponibil�"
 
-#: ../pidgin/gtkblist.c:6540
+#: ../pidgin/gtkblist.c:6597
 msgid "_Disable"
 msgstr "_Dezactivare"
 
-#: ../pidgin/gtkblist.c:6552
+#: ../pidgin/gtkblist.c:6609
 msgid "Enable Account"
 msgstr "Activare cont"
 
-#: ../pidgin/gtkblist.c:6558
+#: ../pidgin/gtkblist.c:6615
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Conturi/Activare cont"
 
-#: ../pidgin/gtkblist.c:6607
+#: ../pidgin/gtkblist.c:6664
 msgid "/Tools"
 msgstr "/Unelte"
 
-#: ../pidgin/gtkblist.c:6677
+#: ../pidgin/gtkblist.c:6734
 msgid "/Buddies/Sort Buddies"
 msgstr "/Contacte/Sorteaz� contactele"
 
@@ -12061,23 +12612,27 @@
 "Pentru a re樽ncerca reconectarea cu acest cont 樽n %s trebuie s� corecta釘i "
 "eroarea �i s� reactiva釘i contul."
 
-#: ../pidgin/gtkconv.c:792 ../pidgin/gtkconv.c:818
+#: ../pidgin/gtkconv.c:484
+msgid "Unknown command."
+msgstr "Comand� necunoscut�."
+
+#: ../pidgin/gtkconv.c:756 ../pidgin/gtkconv.c:782
 msgid "That buddy is not on the same protocol as this chat."
 msgstr "Contactul nu este 樽n acela�i protocol cu acest chat."
 
-#: ../pidgin/gtkconv.c:812
+#: ../pidgin/gtkconv.c:776
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "Nu sunte釘i autentificat(�) cu nici un protocol prin care care s� pute釘i "
 "invita acel contact."
 
-#: ../pidgin/gtkconv.c:865
+#: ../pidgin/gtkconv.c:829
 msgid "Invite Buddy Into Chat Room"
 msgstr "Invit� contactul 樽n camera de chat"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:895
+#: ../pidgin/gtkconv.c:859
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12085,284 +12640,304 @@
 "Introduce釘i numele utilizatorului pe care dori釘i s�-l invita釘i. Pute釘i "
 "ad�uga un mesaj de invitare op釘ional."
 
-#: ../pidgin/gtkconv.c:916
+#: ../pidgin/gtkconv.c:880
 msgid "_Buddy:"
 msgstr "_Contact:"
 
-#: ../pidgin/gtkconv.c:936 ../pidgin/gtksavedstatuses.c:1142
-#: ../pidgin/gtksavedstatuses.c:1478
+#: ../pidgin/gtkconv.c:900 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1525
 msgid "_Message:"
 msgstr "_Mesaj:"
 
-#: ../pidgin/gtkconv.c:993 ../pidgin/gtkconv.c:2503 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:957 ../pidgin/gtkconv.c:2516 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "Nu se poate deschide fi�ierul."
 
-#: ../pidgin/gtkconv.c:999
+#: ../pidgin/gtkconv.c:963
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Discu釘ie cu %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1035
+#: ../pidgin/gtkconv.c:999
 msgid "Save Conversation"
 msgstr "Salveaz� discu釘ia"
 
-#: ../pidgin/gtkconv.c:1184 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1148 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "Caut�"
 
-#: ../pidgin/gtkconv.c:1210 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1174 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "Cau_t�:"
 
-#: ../pidgin/gtkconv.c:1362
+#: ../pidgin/gtkconv.c:1357
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "�nregistrarea a fost activat�. Mesajele viitoare din aceast� discu釘ie vor fi "
 "樽nregistrate."
 
-#: ../pidgin/gtkconv.c:1370
+#: ../pidgin/gtkconv.c:1365
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "�nregistrarea a fost dezactivat�. Mesajele viitoare din aceast� discu釘ie nu "
 "vor fi 樽nregistrate."
 
-#: ../pidgin/gtkconv.c:1618
+#: ../pidgin/gtkconv.c:1613
 msgid "Un-Ignore"
 msgstr "Nu ignora"
 
-#: ../pidgin/gtkconv.c:1621
+#: ../pidgin/gtkconv.c:1616
 msgid "Ignore"
 msgstr "Ignor�"
 
-#: ../pidgin/gtkconv.c:1641
+#: ../pidgin/gtkconv.c:1636
 msgid "Get Away Message"
 msgstr "Ob釘ine mesajul 樽n absen釘�"
 
-#: ../pidgin/gtkconv.c:1664
+#: ../pidgin/gtkconv.c:1659
 msgid "Last said"
 msgstr "Ultima replic�"
 
-#: ../pidgin/gtkconv.c:2511
+#: ../pidgin/gtkconv.c:2524
 msgid "Unable to save icon file to disk."
 msgstr "Nu se poate salva pe disc avatarul."
 
-#: ../pidgin/gtkconv.c:2562
+#: ../pidgin/gtkconv.c:2575
 msgid "Save Icon"
 msgstr "Salvare avatar"
 
-#: ../pidgin/gtkconv.c:2614
+#: ../pidgin/gtkconv.c:2627
 msgid "Animate"
 msgstr "Animare"
 
-#: ../pidgin/gtkconv.c:2619
+#: ../pidgin/gtkconv.c:2632
 msgid "Hide Icon"
 msgstr "Ascundere avatar"
 
-#: ../pidgin/gtkconv.c:2622
+#: ../pidgin/gtkconv.c:2635
 msgid "Save Icon As..."
 msgstr "Salvare avatar ca..."
 
-#: ../pidgin/gtkconv.c:2626
+#: ../pidgin/gtkconv.c:2639
 msgid "Set Custom Icon..."
 msgstr "Iconi釘� personalizat�..."
 
-#: ../pidgin/gtkconv.c:2639
+#: ../pidgin/gtkconv.c:2652
 msgid "Remove Custom Icon"
 msgstr "Iconi釘� implicit�"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2781
+#: ../pidgin/gtkconv.c:2794
 msgid "/_Conversation"
 msgstr "/_Discu釘ie"
 
-#: ../pidgin/gtkconv.c:2783
+#: ../pidgin/gtkconv.c:2796
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Discu釘ie/_Mesaj nou..."
 
-#: ../pidgin/gtkconv.c:2788
+#: ../pidgin/gtkconv.c:2801
 msgid "/Conversation/_Find..."
 msgstr "/Discu釘ie/C_aut�..."
 
-#: ../pidgin/gtkconv.c:2790
+#: ../pidgin/gtkconv.c:2803
 msgid "/Conversation/View _Log"
 msgstr "/Discu釘ie/Arat� 樽n_registr�rile"
 
-#: ../pidgin/gtkconv.c:2791
+#: ../pidgin/gtkconv.c:2804
 msgid "/Conversation/_Save As..."
 msgstr "/Discu釘ie/_Salveaz� ca..."
 
-#: ../pidgin/gtkconv.c:2793
+#: ../pidgin/gtkconv.c:2806
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Discu釘ie/G_ole�te fereastra"
 
-#: ../pidgin/gtkconv.c:2797
+#: ../pidgin/gtkconv.c:2810
 msgid "/Conversation/Se_nd File..."
 msgstr "/Discu釘ie/_Trimite un fi�ier..."
 
-#: ../pidgin/gtkconv.c:2798
+#: ../pidgin/gtkconv.c:2811
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Discu釘ie/Adaug� 樽_nt但mpinare..."
 
-#: ../pidgin/gtkconv.c:2800
+#: ../pidgin/gtkconv.c:2813
 msgid "/Conversation/_Get Info"
 msgstr "/Discu釘ie/D_etalii"
 
-#: ../pidgin/gtkconv.c:2802
+#: ../pidgin/gtkconv.c:2815
 msgid "/Conversation/In_vite..."
 msgstr "/Discu釘ie/_Invit�..."
 
-#: ../pidgin/gtkconv.c:2804
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/M_ore"
 msgstr "/Discu釘ie/Mai m_ult"
 
-#: ../pidgin/gtkconv.c:2808
+#: ../pidgin/gtkconv.c:2821
 msgid "/Conversation/Al_ias..."
 msgstr "/Discu釘ie/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2810
+#: ../pidgin/gtkconv.c:2823
 msgid "/Conversation/_Block..."
 msgstr "/Discu釘ie/_Blocheaz�..."
 
-#: ../pidgin/gtkconv.c:2812
+#: ../pidgin/gtkconv.c:2825
 msgid "/Conversation/_Unblock..."
 msgstr "/Discu釘ie/Deblochea_z�..."
 
-#: ../pidgin/gtkconv.c:2814
+#: ../pidgin/gtkconv.c:2827
 msgid "/Conversation/_Add..."
 msgstr "/Discu釘ie/A_daug�..."
 
-#: ../pidgin/gtkconv.c:2816
+#: ../pidgin/gtkconv.c:2829
 msgid "/Conversation/_Remove..."
 msgstr "/Discu釘ie/�ter_ge..."
 
-#: ../pidgin/gtkconv.c:2821
+#: ../pidgin/gtkconv.c:2834
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Discu釘ie/Insereaz� o a_dres�..."
+
+#: ../pidgin/gtkconv.c:2836
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Discu釘ie/Inserea_z� o imagine..."
+
+#: ../pidgin/gtkconv.c:2842
 msgid "/Conversation/_Close"
 msgstr "/Discu釘ie/�n_chide"
 
 #. Options
-#: ../pidgin/gtkconv.c:2825
+#: ../pidgin/gtkconv.c:2846
 msgid "/_Options"
 msgstr "/_Op釘iuni"
 
-#: ../pidgin/gtkconv.c:2826
+#: ../pidgin/gtkconv.c:2847
 msgid "/Options/Enable _Logging"
 msgstr "/Op釘iuni/Activeaz� 樽n_registrarea"
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2848
 msgid "/Options/Enable _Sounds"
 msgstr "/Op釘iuni/Activeaz� _sunetul"
 
-#: ../pidgin/gtkconv.c:2828
+#: ../pidgin/gtkconv.c:2849
 msgid "/Options/Show Buddy _Icon"
 msgstr "/Op釘iuni/Arat� _avatarul contactului"
 
-#: ../pidgin/gtkconv.c:2830
+#: ../pidgin/gtkconv.c:2851
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/Op釘iuni/Arat� bara cu _unelte"
 
-#: ../pidgin/gtkconv.c:2831
+#: ../pidgin/gtkconv.c:2852
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Op釘iuni/Arat� _marcaje de timp"
 
-#: ../pidgin/gtkconv.c:2906
+#: ../pidgin/gtkconv.c:2928
 msgid "/Conversation/More"
 msgstr "/Discu釘ie/Mai mult"
 
+#: ../pidgin/gtkconv.c:3036
+msgid "/Options"
+msgstr "/Op釘iuni"
+
 #. 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:2951 ../pidgin/gtkconv.c:2983
+#: ../pidgin/gtkconv.c:3071 ../pidgin/gtkconv.c:3103
 msgid "/Conversation"
 msgstr "/Discu釘ie"
 
-#: ../pidgin/gtkconv.c:2991
+#: ../pidgin/gtkconv.c:3111
 msgid "/Conversation/View Log"
 msgstr "/Discu釘ie/Arat� 樽nregistr�rile"
 
-#: ../pidgin/gtkconv.c:2997
+#: ../pidgin/gtkconv.c:3117
 msgid "/Conversation/Send File..."
 msgstr "/Discu釘ie/Trimite un fi�ier..."
 
-#: ../pidgin/gtkconv.c:3001
+#: ../pidgin/gtkconv.c:3121
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Discu釘ie/Adaug� o 樽nt但mpinare..."
 
-#: ../pidgin/gtkconv.c:3007
+#: ../pidgin/gtkconv.c:3127
 msgid "/Conversation/Get Info"
 msgstr "/Discu釘ie/Caut� detalii"
 
-#: ../pidgin/gtkconv.c:3011
+#: ../pidgin/gtkconv.c:3131
 msgid "/Conversation/Invite..."
 msgstr "/Discu釘ie/Invit�..."
 
-#: ../pidgin/gtkconv.c:3017
+#: ../pidgin/gtkconv.c:3137
 msgid "/Conversation/Alias..."
 msgstr "/Discu釘ie/Alias..."
 
-#: ../pidgin/gtkconv.c:3021
+#: ../pidgin/gtkconv.c:3141
 msgid "/Conversation/Block..."
 msgstr "/Discu釘ie/Blocheaz�..."
 
-#: ../pidgin/gtkconv.c:3025
+#: ../pidgin/gtkconv.c:3145
 msgid "/Conversation/Unblock..."
 msgstr "/Discu釘ie/Deblocheaz�..."
 
-#: ../pidgin/gtkconv.c:3029
+#: ../pidgin/gtkconv.c:3149
 msgid "/Conversation/Add..."
 msgstr "/Discu釘ie/Adaug�..."
 
-#: ../pidgin/gtkconv.c:3033
+#: ../pidgin/gtkconv.c:3153
 msgid "/Conversation/Remove..."
 msgstr "/Discu釘ie/�terge..."
 
-#: ../pidgin/gtkconv.c:3037
+#: ../pidgin/gtkconv.c:3159
+msgid "/Conversation/Insert Link..."
+msgstr "/Discu釘ie/Insereaz� o adres�..."
+
+#: ../pidgin/gtkconv.c:3163
+msgid "/Conversation/Insert Image..."
+msgstr "/Discu釘ie/Insereaz� o imagine..."
+
+#: ../pidgin/gtkconv.c:3169
 msgid "/Options/Enable Logging"
 msgstr "/Op釘iuni/Activeaz� 樽nregistrarea"
 
-#: ../pidgin/gtkconv.c:3040
+#: ../pidgin/gtkconv.c:3172
 msgid "/Options/Enable Sounds"
 msgstr "/Op釘iuni/Activeaz� sunetul"
 
-#: ../pidgin/gtkconv.c:3053
+#: ../pidgin/gtkconv.c:3185
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Op釘iuni/Arat� bara cu unelte"
 
-#: ../pidgin/gtkconv.c:3056
+#: ../pidgin/gtkconv.c:3188
 msgid "/Options/Show Timestamps"
 msgstr "/Op釘iuni/Arat� marcaje de timp"
 
-#: ../pidgin/gtkconv.c:3059
+#: ../pidgin/gtkconv.c:3191
 msgid "/Options/Show Buddy Icon"
 msgstr "/Op釘iuni/Arat� avatarul contactului"
 
-#: ../pidgin/gtkconv.c:3143 ../pidgin/gtkconv.c:3185
+#: ../pidgin/gtkconv.c:3275 ../pidgin/gtkconv.c:3317
 msgid "User is typing..."
 msgstr "Utilizatorul v� scrie..."
 
-#: ../pidgin/gtkconv.c:3188
+#: ../pidgin/gtkconv.c:3320
 msgid "User has typed something and stopped"
 msgstr "Utilizatorul a scris ceva �i s-a oprit"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3370
+#: ../pidgin/gtkconv.c:3502
 msgid "_Send To"
 msgstr "_Interlocutor"
 
-#: ../pidgin/gtkconv.c:4084
+#: ../pidgin/gtkconv.c:4216
 msgid "_Send"
 msgstr "T_rimite"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4233
+#: ../pidgin/gtkconv.c:4320
 msgid "0 people in room"
 msgstr "Nici o persoan� 樽n chat"
 
-#: ../pidgin/gtkconv.c:5425 ../pidgin/gtkconv.c:5546
+#: ../pidgin/gtkconv.c:5518 ../pidgin/gtkconv.c:5639
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -12370,71 +12945,75 @@
 msgstr[1] "%d persoane 樽n chat"
 msgstr[2] "%d de persoane 樽n chat"
 
-#: ../pidgin/gtkconv.c:6112 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6238 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "Scriu"
 
-#: ../pidgin/gtkconv.c:6118
+#: ../pidgin/gtkconv.c:6244
 msgid "Stopped Typing"
 msgstr "M-am oprit din scris"
 
-#: ../pidgin/gtkconv.c:6123
+#: ../pidgin/gtkconv.c:6249
 msgid "Nick Said"
 msgstr "Pseudonim spus"
 
-#: ../pidgin/gtkconv.c:6128 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6254 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "Mesaje necitite"
 
-#: ../pidgin/gtkconv.c:6133
+#: ../pidgin/gtkconv.c:6259
 msgid "New Event"
 msgstr "Eveniment nou"
 
-#: ../pidgin/gtkconv.c:7265
+#: ../pidgin/gtkconv.c:7236
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "clear: Gole�te con釘inutul ferestrei de discu釘ii."
+
+#: ../pidgin/gtkconv.c:7400
 msgid "Confirm close"
 msgstr "Confirmare 樽nchidere"
 
-#: ../pidgin/gtkconv.c:7297
+#: ../pidgin/gtkconv.c:7432
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "Ave釘i mesaje necitite. Sigur dori釘i s� 樽nchide釘i fereastra?"
 
-#: ../pidgin/gtkconv.c:7819
+#: ../pidgin/gtkconv.c:8004
 msgid "Close other tabs"
 msgstr "�nchide celelalte taburi"
 
-#: ../pidgin/gtkconv.c:7825
+#: ../pidgin/gtkconv.c:8010
 msgid "Close all tabs"
 msgstr "�nchide toate taburile"
 
-#: ../pidgin/gtkconv.c:7833
+#: ../pidgin/gtkconv.c:8018
 msgid "Detach this tab"
 msgstr "Desprinde acest tab"
 
-#: ../pidgin/gtkconv.c:7839
+#: ../pidgin/gtkconv.c:8024
 msgid "Close this tab"
 msgstr "�nchide acest tab"
 
-#: ../pidgin/gtkconv.c:8225
+#: ../pidgin/gtkconv.c:8505
 msgid "Close conversation"
 msgstr "�ncheie discu釘ia"
 
-#: ../pidgin/gtkconv.c:8748
+#: ../pidgin/gtkconv.c:9037
 msgid "Last created window"
 msgstr "�n ultima fereastr� creat�"
 
-#: ../pidgin/gtkconv.c:8750
+#: ../pidgin/gtkconv.c:9039
 msgid "Separate IM and Chat windows"
 msgstr "Nu 樽n fereastra chat-urilor"
 
-#: ../pidgin/gtkconv.c:8752 ../pidgin/gtkprefs.c:1340
+#: ../pidgin/gtkconv.c:9041 ../pidgin/gtkprefs.c:1410
 msgid "New window"
 msgstr "�n fereastr� nou�"
 
-#: ../pidgin/gtkconv.c:8754
+#: ../pidgin/gtkconv.c:9043
 msgid "By group"
 msgstr "Dup� grup"
 
-#: ../pidgin/gtkconv.c:8756
+#: ../pidgin/gtkconv.c:9045
 msgid "By account"
 msgstr "Dup� cont"
 
@@ -12559,7 +13138,7 @@
 msgstr "Arab�"
 
 #: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:213
 msgid "Bulgarian"
 msgstr "Bulgar�"
 
@@ -12572,8 +13151,8 @@
 msgid "Bosnian"
 msgstr "Bosniac�"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
 msgid "Catalan"
 msgstr "Catalan�"
 
@@ -12581,7 +13160,7 @@
 msgid "Valencian-Catalan"
 msgstr "Valencian�"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:216
 msgid "Czech"
 msgstr "Ceh�"
 
@@ -12590,7 +13169,7 @@
 msgstr "Danez�"
 
 #: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:217
 msgid "German"
 msgstr "German�"
 
@@ -12619,9 +13198,9 @@
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Spanish"
 msgstr "Spaniol�"
 
@@ -12634,201 +13213,206 @@
 msgid "Persian"
 msgstr "Persan�"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
 msgid "Finnish"
 msgstr "Finlandez�"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227
 msgid "French"
 msgstr "Francez�"
 
-#: ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
 msgid "Galician"
 msgstr "Galician�"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:159 ../pidgin/gtkdialogs.c:160
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:160
 msgid "Gujarati Language Team"
 msgstr "Echipa de localizare Gujarati"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:228
 msgid "Hebrew"
 msgstr "Ebraic�"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:162
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:163
 msgid "Hungarian"
 msgstr "Maghiar�"
 
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Indonesian"
 msgstr "Indonezian�"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:229
 msgid "Italian"
 msgstr "Italian�"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:232
 msgid "Japanese"
 msgstr "Japonez�"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233
 msgid "Georgian"
 msgstr "Georgian�"
 
-#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:167
 msgid "Ubuntu Georgian Translators"
 msgstr "Traduc�torii Ubuntu din Georgia"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:168
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:168
 msgid "Kannada Translation team"
 msgstr "Echipa de localizare Kannada"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Korean"
 msgstr "Coreean�"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:172
 msgid "Kurdish"
 msgstr "Kurd�"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:233
-#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 msgid "Lithuanian"
 msgstr "Lituanian�"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:238
 msgid "Macedonian"
 msgstr "Macedonean�"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:176
 msgid "Bokm奪l Norwegian"
 msgstr "Norvegian� Bokm奪l"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Nepali"
 msgstr "Nepali"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
 msgid "Dutch, Flemish"
 msgstr "Flamand�"
 
-#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:179
 msgid "Norwegian"
 msgstr "Norvegian�"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:180
+msgid "Norwegian Nynorsk"
+msgstr "Norvegian� (Nynorsk)"
+
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:239
 msgid "Polish"
 msgstr "Polonez�"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:184
 msgid "Portuguese"
 msgstr "Portughez�"
 
-#: ../pidgin/gtkdialogs.c:183
-msgid "Portuguese-Brazil"
-msgstr "Portughez� Brazilian�"
-
-#: ../pidgin/gtkdialogs.c:184
-msgid "Pashto"
-msgstr "Pashto"
-
 #: ../pidgin/gtkdialogs.c:185
+msgid "Portuguese-Brazil"
+msgstr "Portughez� Brazilian�"
+
+#: ../pidgin/gtkdialogs.c:186
+msgid "Pashto"
+msgstr "Pashto"
+
+#: ../pidgin/gtkdialogs.c:187
 msgid "Romanian"
 msgstr "Rom但n�"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Russian"
 msgstr "Rus�"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:244
 msgid "Slovak"
 msgstr "Slovac�"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:245
 msgid "Slovenian"
 msgstr "Sloven�"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:192
 msgid "Albanian"
 msgstr "Albanez�"
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:194
 msgid "Serbian"
 msgstr "S但rb�"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:246
 msgid "Swedish"
 msgstr "Suedez�"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:196
 msgid "Tamil"
 msgstr "Tamil"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:198
 msgid "Thai"
 msgstr "Thailandez�"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:247
 msgid "Turkish"
 msgstr "Turc�"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:200
 msgid "Vietnamese"
 msgstr "Vietnamez�"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:200
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M. Thanh �i echipa ��Gnome Vi��"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:248
 msgid "Simplified Chinese"
 msgstr "Chinez� simplificat�"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:204
 msgid "Hong Kong Chinese"
 msgstr "Chinez� Hong Kong"
 
-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:249
 msgid "Traditional Chinese"
 msgstr "Chinez� tradi釘ional�"
 
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:212
 msgid "Amharic"
 msgstr "Amharic"
 
-#: ../pidgin/gtkdialogs.c:331
+#: ../pidgin/gtkdialogs.c:334
 #, c-format
 msgid "About %s"
 msgstr "Despre %s"
 
-#: ../pidgin/gtkdialogs.c:369
+#: ../pidgin/gtkdialogs.c:372
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -12850,43 +13434,43 @@
 "��COPYRIGHT�� pentru o list� complet� a celor ce au contribuit. Nu se ofer� "
 "nici un fel de garan釘ie pentru acest program.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:384
+#: ../pidgin/gtkdialogs.c:387
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin pe irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:389
+#: ../pidgin/gtkdialogs.c:392
 msgid "Current Developers"
 msgstr "Programatori activi"
 
-#: ../pidgin/gtkdialogs.c:404
+#: ../pidgin/gtkdialogs.c:407
 msgid "Crazy Patch Writers"
 msgstr "Autori de patch-uri"
 
-#: ../pidgin/gtkdialogs.c:419
+#: ../pidgin/gtkdialogs.c:422
 msgid "Retired Developers"
 msgstr "Programatori inactivi"
 
-#: ../pidgin/gtkdialogs.c:434
+#: ../pidgin/gtkdialogs.c:437
 msgid "Artists"
 msgstr "Arti�ti"
 
-#: ../pidgin/gtkdialogs.c:449
+#: ../pidgin/gtkdialogs.c:452
 msgid "Current Translators"
 msgstr "Traduc�tori activi"
 
-#: ../pidgin/gtkdialogs.c:469
+#: ../pidgin/gtkdialogs.c:472
 msgid "Past Translators"
 msgstr "Traduc�tori inactivi"
 
-#: ../pidgin/gtkdialogs.c:487
+#: ../pidgin/gtkdialogs.c:490
 msgid "Debugging Information"
 msgstr "Informa釘ii de depanare"
 
-#: ../pidgin/gtkdialogs.c:856
+#: ../pidgin/gtkdialogs.c:859
 msgid "Get User Info"
 msgstr "Caut� detalii"
 
-#: ../pidgin/gtkdialogs.c:858
+#: ../pidgin/gtkdialogs.c:861
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -12894,11 +13478,11 @@
 "Introduce釘i numele de identificare sau aliasul persoanei c�reia vre釘i s�-i "
 "vede釘i detaliile personale."
 
-#: ../pidgin/gtkdialogs.c:948
+#: ../pidgin/gtkdialogs.c:951
 msgid "View User Log"
 msgstr "Arat� 樽nregistr�rile unui utilizator"
 
-#: ../pidgin/gtkdialogs.c:950
+#: ../pidgin/gtkdialogs.c:953
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -12906,32 +13490,32 @@
 "Introduce釘i numele de identificare sau aliasul persoanei c�reia vre釘i s�-i "
 "vede釘i 樽nregistr�rile."
 
-#: ../pidgin/gtkdialogs.c:970
+#: ../pidgin/gtkdialogs.c:973
 msgid "Alias Contact"
 msgstr "Alias contact"
 
-#: ../pidgin/gtkdialogs.c:971
+#: ../pidgin/gtkdialogs.c:974
 msgid "Enter an alias for this contact."
 msgstr "Introduce釘i un alias pentru acest contact."
 
-#: ../pidgin/gtkdialogs.c:993
+#: ../pidgin/gtkdialogs.c:996
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Introduce釘i un alias pentru %s."
 
-#: ../pidgin/gtkdialogs.c:995
+#: ../pidgin/gtkdialogs.c:998
 msgid "Alias Buddy"
 msgstr "Alias contact"
 
-#: ../pidgin/gtkdialogs.c:1016
+#: ../pidgin/gtkdialogs.c:1019
 msgid "Alias Chat"
 msgstr "Alias chat"
 
-#: ../pidgin/gtkdialogs.c:1017
+#: ../pidgin/gtkdialogs.c:1020
 msgid "Enter an alias for this chat."
 msgstr "Introduce釘i un nou alias pentru acest chat."
 
-#: ../pidgin/gtkdialogs.c:1056
+#: ../pidgin/gtkdialogs.c:1059
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -12949,15 +13533,15 @@
 "Sunte釘i pe cale s� �terge釘i din list� contactul con釘in但nd %s �i %d de alte "
 "contacte. Dori釘i s� continua釘i?"
 
-#: ../pidgin/gtkdialogs.c:1064
+#: ../pidgin/gtkdialogs.c:1067
 msgid "Remove Contact"
 msgstr "�tergere contact"
 
-#: ../pidgin/gtkdialogs.c:1067
+#: ../pidgin/gtkdialogs.c:1070
 msgid "_Remove Contact"
 msgstr "�ter_gere contact"
 
-#: ../pidgin/gtkdialogs.c:1098
+#: ../pidgin/gtkdialogs.c:1101
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -12966,15 +13550,15 @@
 "Sunte釘i pe cale s� muta釘i membrii grupului %s 樽n grupul %s. Dori釘i s� "
 "continua釘i?"
 
-#: ../pidgin/gtkdialogs.c:1105
+#: ../pidgin/gtkdialogs.c:1108
 msgid "Merge Groups"
 msgstr "Unire grupuri"
 
-#: ../pidgin/gtkdialogs.c:1108
+#: ../pidgin/gtkdialogs.c:1111
 msgid "_Merge Groups"
 msgstr "_Unire grupuri"
 
-#: ../pidgin/gtkdialogs.c:1158
+#: ../pidgin/gtkdialogs.c:1161
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -12983,15 +13567,15 @@
 "Sunte釘i pe cale s� �terge釘i grupul %s �i to釘i membrii s�i din lista de "
 "contacte. Dori釘i s� continua釘i?"
 
-#: ../pidgin/gtkdialogs.c:1161
+#: ../pidgin/gtkdialogs.c:1164
 msgid "Remove Group"
 msgstr "�tergere grup"
 
-#: ../pidgin/gtkdialogs.c:1164
+#: ../pidgin/gtkdialogs.c:1167
 msgid "_Remove Group"
 msgstr "�ter_gere grup"
 
-#: ../pidgin/gtkdialogs.c:1197
+#: ../pidgin/gtkdialogs.c:1200
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
@@ -12999,15 +13583,15 @@
 "Sunte釘i pe cale s� 樽l/o �terge釘i pe %s din lista de contacte. Dori釘i s� "
 "continua釘i?"
 
-#: ../pidgin/gtkdialogs.c:1200
+#: ../pidgin/gtkdialogs.c:1203
 msgid "Remove Buddy"
 msgstr "�tergere contact"
 
-#: ../pidgin/gtkdialogs.c:1203
+#: ../pidgin/gtkdialogs.c:1206
 msgid "_Remove Buddy"
 msgstr "�ter_ge contactul"
 
-#: ../pidgin/gtkdialogs.c:1224
+#: ../pidgin/gtkdialogs.c:1227
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
@@ -13016,11 +13600,11 @@
 "Sunte釘i pe cale s� �terge釘i un chat cu numele %s din lista de contacte. "
 "Dori釘i s� continua釘i?"
 
-#: ../pidgin/gtkdialogs.c:1227
+#: ../pidgin/gtkdialogs.c:1230
 msgid "Remove Chat"
 msgstr "�tergere chat"
 
-#: ../pidgin/gtkdialogs.c:1230
+#: ../pidgin/gtkdialogs.c:1233
 msgid "_Remove Chat"
 msgstr "�ter_gere chat"
 
@@ -13034,7 +13618,7 @@
 
 #: ../pidgin/gtkdocklet.c:487
 msgid "Show Buddy List"
-msgstr "List� contacte vizibil�"
+msgstr "List� de contacte vizibil�"
 
 #: ../pidgin/gtkdocklet.c:513
 msgid "New Message..."
@@ -13115,66 +13699,66 @@
 msgid "Time Remaining:"
 msgstr "Timp r�mas:"
 
-#: ../pidgin/gtkft.c:786
+#: ../pidgin/gtkft.c:783
 msgid "Close this window when all transfers _finish"
 msgstr "�nchide fereastra la _terminarea tuturor transferurilor"
 
-#: ../pidgin/gtkft.c:796
+#: ../pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
 msgstr "�ter_ge transferurile terminate"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:805
+#: ../pidgin/gtkft.c:802
 msgid "File transfer _details"
 msgstr "Ascunde _detaliile transferului"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "_Pauz�"
 
 #. Resume button
-#: ../pidgin/gtkft.c:845
+#: ../pidgin/gtkft.c:842
 msgid "_Resume"
 msgstr "_Reluare"
 
-#: ../pidgin/gtkimhtml.c:796
+#: ../pidgin/gtkimhtml.c:795
 msgid "Paste as Plain _Text"
 msgstr "Lipe�te ca text _simplu"
 
-#: ../pidgin/gtkimhtml.c:813
+#: ../pidgin/gtkimhtml.c:812
 msgid "_Reset formatting"
 msgstr "_F�r� formatare"
 
-#: ../pidgin/gtkimhtml.c:1309
+#: ../pidgin/gtkimhtml.c:1349
 msgid "Hyperlink color"
 msgstr "Culoare adres�"
 
-#: ../pidgin/gtkimhtml.c:1310
+#: ../pidgin/gtkimhtml.c:1350
 msgid "Color to draw hyperlinks."
 msgstr "Culoare pentru afi�area adreselor."
 
-#: ../pidgin/gtkimhtml.c:1313
+#: ../pidgin/gtkimhtml.c:1353
 msgid "Hyperlink prelight color"
 msgstr "Culoare eviden釘iere adres�"
 
-#: ../pidgin/gtkimhtml.c:1314
+#: ../pidgin/gtkimhtml.c:1354
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Culoare pentru afi�area adreselor sub cursorul de maus."
 
-#: ../pidgin/gtkimhtml.c:1530
+#: ../pidgin/gtkimhtml.c:1575
 msgid "_Copy E-Mail Address"
 msgstr "C_opiaz� adresa de mail"
 
-#: ../pidgin/gtkimhtml.c:1542
+#: ../pidgin/gtkimhtml.c:1587
 msgid "_Open Link in Browser"
 msgstr "_Deschide adresa 樽n navigator"
 
-#: ../pidgin/gtkimhtml.c:1552
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy Link Location"
 msgstr "_Copiaz� loca釘ia adresei"
 
-#: ../pidgin/gtkimhtml.c:3225
+#: ../pidgin/gtkimhtml.c:3341
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13184,7 +13768,7 @@
 "\n"
 "Se utilizeaz� tipul implicit: PNG."
 
-#: ../pidgin/gtkimhtml.c:3228
+#: ../pidgin/gtkimhtml.c:3344
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13194,7 +13778,7 @@
 "\n"
 "Se utilizeaz� tipul implicit: PNG."
 
-#: ../pidgin/gtkimhtml.c:3241
+#: ../pidgin/gtkimhtml.c:3373
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13205,7 +13789,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3244
+#: ../pidgin/gtkimhtml.c:3376
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13216,35 +13800,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3324 ../pidgin/gtkimhtml.c:3336
+#: ../pidgin/gtkimhtml.c:3454 ../pidgin/gtkimhtml.c:3466
 msgid "Save Image"
 msgstr "Salveaz� imaginea"
 
-#: ../pidgin/gtkimhtml.c:3364
+#: ../pidgin/gtkimhtml.c:3494
 msgid "_Save Image..."
 msgstr "_Salveaz� imaginea..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:151
+#: ../pidgin/gtkimhtmltoolbar.c:153
 msgid "Select Font"
 msgstr "Alege釘i un font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:230
+#: ../pidgin/gtkimhtmltoolbar.c:232
 msgid "Select Text Color"
 msgstr "Selecta釘i culoarea textului"
 
-#: ../pidgin/gtkimhtmltoolbar.c:309
+#: ../pidgin/gtkimhtmltoolbar.c:311
 msgid "Select Background Color"
 msgstr "Selecta釘i culoarea fundalului"
 
-#: ../pidgin/gtkimhtmltoolbar.c:398
+#: ../pidgin/gtkimhtmltoolbar.c:400
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:406
+#: ../pidgin/gtkimhtmltoolbar.c:408
 msgid "_Description"
 msgstr "_Descriere"
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:411
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13252,102 +13836,102 @@
 "Introduce釘i adresa pe care dori釘i s� o insera釘i �i descrierea ei. Descrierea "
 "este op釘ional�."
 
-#: ../pidgin/gtkimhtmltoolbar.c:413
+#: ../pidgin/gtkimhtmltoolbar.c:415
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Introduce釘i adresa pe care dori釘i s� o insera釘i."
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "Insert Link"
 msgstr "Inserare adres�"
 
-#: ../pidgin/gtkimhtmltoolbar.c:422 ../pidgin/gtkimhtmltoolbar.c:1145
+#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1155
 msgid "_Insert"
 msgstr "_Insereaz�"
 
-#: ../pidgin/gtkimhtmltoolbar.c:491
+#: ../pidgin/gtkimhtmltoolbar.c:493
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Nu s-a putut stoca imaginea: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
+#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
 msgid "Insert Image"
 msgstr "Inserare imagine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:725
+#: ../pidgin/gtkimhtmltoolbar.c:740
 msgid "This theme has no available smileys."
 msgstr "Aceast� tem� nu are iconi釘e disponibile."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:739
+#: ../pidgin/gtkimhtmltoolbar.c:757
 msgid "Smile!"
 msgstr "Iconi釘e simbolice"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1067
-msgid "_Font"
-msgstr "_Font"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1074
+#: ../pidgin/gtkimhtmltoolbar.c:1064
 msgid "_Bold"
 msgstr "_Aldin"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1078
+#: ../pidgin/gtkimhtmltoolbar.c:1065
 msgid "_Italic"
 msgstr "_Cursiv"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1082
+#: ../pidgin/gtkimhtmltoolbar.c:1066
 msgid "_Underline"
 msgstr "_Subliniat"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1086
+#: ../pidgin/gtkimhtmltoolbar.c:1067
 msgid "_Larger"
 msgstr "_M�rit"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090
+#: ../pidgin/gtkimhtmltoolbar.c:1069
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
+#: ../pidgin/gtkimhtmltoolbar.c:1071
 msgid "_Smaller"
 msgstr "M_ic�orat"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
+#: ../pidgin/gtkimhtmltoolbar.c:1072
 msgid "_Font face"
 msgstr "_Nume font"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:1073
 msgid "_Foreground color"
 msgstr "Culoare te_xt"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1106
+#: ../pidgin/gtkimhtmltoolbar.c:1074
 msgid "_Background color"
 msgstr "Culoare _fundal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1125
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "_Font"
+msgstr "_Font"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1135
 msgid "_Reset font"
 msgstr "F�r� f_ormatare"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1152
+#: ../pidgin/gtkimhtmltoolbar.c:1162
 msgid "_Smiley"
 msgstr "Ico_ni釘e simbolice"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1156
+#: ../pidgin/gtkimhtmltoolbar.c:1168
 msgid "_Image"
 msgstr "Im_agine"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1160
+#: ../pidgin/gtkimhtmltoolbar.c:1174
 msgid "_Link"
 msgstr "_Link"
 
-#: ../pidgin/gtklog.c:267
+#: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
 "%s which started at %s?"
 msgstr ""
-"Sigur dori釘i s� �terge釘i definitiv 樽nregistrarea conversa釘iei cu %s "
-"樽nceput� la %s?"
-
-#: ../pidgin/gtklog.c:278
+"Sigur dori釘i s� �terge釘i definitiv 樽nregistrarea conversa釘iei cu %s 樽nceput� "
+"la %s?"
+
+#: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -13356,30 +13940,30 @@
 "Sigur dori釘i s� �terge釘i definitiv 樽nregistrarea conversa釘iei din %s "
 "樽nceput� la %s?"
 
-#: ../pidgin/gtklog.c:283
+#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
 "s?"
 msgstr ""
-"Sigur dori釘i s� �terge釘i permanent 樽nt但mpinarea 樽nregistrarea sistem "
-"ce a 樽nceput la %s?"
-
-#: ../pidgin/gtklog.c:427
+"Sigur dori釘i s� �terge釘i permanent 樽nt但mpinarea 樽nregistrarea sistem ce a "
+"樽nceput la %s?"
+
+#: ../pidgin/gtklog.c:452
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Discu釘ie 樽n %s pe %s</span>"
 
-#: ../pidgin/gtklog.c:430
+#: ../pidgin/gtklog.c:455
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>Discu釘ie cu %s 樽n data de %s</span>"
 
-#: ../pidgin/gtklog.c:477
+#: ../pidgin/gtklog.c:502
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:524
+#: ../pidgin/gtklog.c:549
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
@@ -13387,7 +13971,7 @@
 "Evenimentele de sistem vor fi 樽nregistrate doar dac� op釘iunea ���nregistreaz� "
 "toate schimb�rile de status 樽n 樽nregistr�rile sistem�� este activat�."
 
-#: ../pidgin/gtklog.c:528
+#: ../pidgin/gtklog.c:553
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
@@ -13395,46 +13979,46 @@
 "Mesajele vor fi 樽nregistrate doar dac� op釘iunea ���nregistreaz� toate "
 "mesajele�� este activat�."
 
-#: ../pidgin/gtklog.c:531
+#: ../pidgin/gtklog.c:556
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 "Chat-urile vor fi 樽nregistrate doar dac� op釘iunea ���nregistreaz� toate chat-"
 "urile�� este activat�."
 
-#: ../pidgin/gtklog.c:535
+#: ../pidgin/gtklog.c:560
 msgid "No logs were found"
 msgstr "Nu s-au g�sit nici un fel de 樽nregistr�ri."
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:550
+#: ../pidgin/gtklog.c:575
 msgid "_Browse logs folder"
 msgstr "_Navigare director 樽nregistr�ri"
 
-#: ../pidgin/gtklog.c:614
+#: ../pidgin/gtklog.c:639
 msgid "Total log size:"
 msgstr "M�rime total� 樽nregistr�ri:"
 
-#: ../pidgin/gtklog.c:683
+#: ../pidgin/gtklog.c:708
 #, c-format
 msgid "Conversations in %s"
 msgstr "Discu釘ii 樽n %s"
 
-#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
+#: ../pidgin/gtklog.c:716 ../pidgin/gtklog.c:778
 #, c-format
 msgid "Conversations with %s"
 msgstr "Discu釘ii cu %s"
 
-#: ../pidgin/gtklog.c:778
+#: ../pidgin/gtklog.c:803
 msgid "System Log"
 msgstr "�nregistr�ri sistem"
 
-#: ../pidgin/gtkmain.c:373
+#: ../pidgin/gtkmain.c:385
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. �ncerca釘i ��%s -h�� pentru mai multe informa釘ii.\n"
 
-#: ../pidgin/gtkmain.c:375
+#: ../pidgin/gtkmain.c:387
 #, c-format
 msgid ""
 "%s %s\n"
@@ -13443,6 +14027,7 @@
 "  -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"
+"  -m, --multiple      do not ensure single instance\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"
@@ -13454,12 +14039,13 @@
 "  -c, --config=DIR    utilizeaz� calea DIR pentru fi�ierele de configurare\n"
 "  -d, --debug         arat� mesaje de depanare 樽n ie�irea standard (stdout)\n"
 "  -h, --help          arat� acest mesaj de ajutor\n"
+"  -m, --multiple      permite instan釘e multiple\n"
 "  -n, --nologin       f�r� autentificare automat�\n"
 "  -l, --login[=NUME]  autentificare automat� (argumentul NUME specific�\n"
-"                      contul/conturile de utilizat, desp�r釘ite prin virgul�)\n"
+"                      conturile de utilizat, desp�r釘ite prin virgul�)\n"
 "  -v, --version       arat� versiunea curent�\n"
 
-#: ../pidgin/gtkmain.c:496
+#: ../pidgin/gtkmain.c:511
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13468,7 +14054,7 @@
 "\n"
 "If you can reproduce the crash, please notify the developers\n"
 "by reporting a bug at:\n"
-"%snewticket/\n"
+"%ssimpleticket/\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"
@@ -13480,13 +14066,13 @@
 "on other protocols is at\n"
 "%swiki/DeveloperPages\n"
 msgstr ""
-"%s s-a blocat (segfault) �i a 樽ncercat s� scrie un \n"
-"fi�ier core. Aceasta este o problem� de programare �i nu e\n"
-"produs� din cauza utilizatorului.\n"
+"%s s-a blocat (segfault) �i a 樽ncercat s� scrie un fi�ier.\n"
+"core. Aceasta este o problem� de programare �i nu e din vina\n"
+"utilizatorului.\n"
 "\n"
 "Dac� problema e reproductibil�, notifica釘i dezvoltatorii\n"
 "raport但nd detalii la:\n"
-"%snewticket/\n"
+"%ssimpleticket/\n"
 "\n"
 "Nu uita釘i s� specifica釘i ce anume f�cea釘i 樽n acel moment �i s�\n"
 "include釘i un backtrace din fi�ierul core. Dac� nu �ti釘i cum s�\n"
@@ -13498,19 +14084,21 @@
 "conturi ale lui Sean �i Luke la:\n"
 "%swiki/DeveloperPages\n"
 
-#: ../pidgin/gtknotify.c:337
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/gtkmain.c:697 ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/gtknotify.c:343
 msgid "Open All Messages"
 msgstr "Deschide toate mesajele"
 
-#: ../pidgin/gtknotify.c:389
+#: ../pidgin/gtknotify.c:395
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Ave釘i mail nou!</span>"
 
-#: ../pidgin/gtknotify.c:483
-msgid "Sender"
-msgstr "Expeditor"
-
-#: ../pidgin/gtknotify.c:509
+#: ../pidgin/gtknotify.c:515
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -13518,7 +14106,7 @@
 msgstr[1] "%s are %d mesaje noi."
 msgstr[2] "%s are %d de mesaje noi."
 
-#: ../pidgin/gtknotify.c:520
+#: ../pidgin/gtknotify.c:526
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
@@ -13526,22 +14114,22 @@
 msgstr[1] "<b>Ave釘i %d mailuri noi.</b>"
 msgstr[2] "<b>Ave釘i %d de mailuri noi.</b>"
 
-#: ../pidgin/gtknotify.c:951
+#: ../pidgin/gtknotify.c:964
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Navigatorul ��%s�� este invalid."
 
-#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
-#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
+#: ../pidgin/gtknotify.c:966 ../pidgin/gtknotify.c:978
+#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1119
 msgid "Unable to open URL"
 msgstr "Nu se poate deschide acest URL"
 
-#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
+#: ../pidgin/gtknotify.c:976 ../pidgin/gtknotify.c:989
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Eroare la pornirea ��%s��: %s"
 
-#: ../pidgin/gtknotify.c:1107
+#: ../pidgin/gtknotify.c:1120
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr ""
@@ -13590,108 +14178,117 @@
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detalii modul</b>"
 
-#: ../pidgin/gtkpounce.c:155
+#: ../pidgin/gtkpounce.c:156
 msgid "Select a file"
 msgstr "Selecta釘i un fi�ier"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:524
+#: ../pidgin/gtkpounce.c:533
 msgid "Pounce on Whom"
 msgstr "�nt但mpinare pentru"
 
-#: ../pidgin/gtkpounce.c:551
+#: ../pidgin/gtkpounce.c:560
 msgid "_Buddy name:"
 msgstr "Nu_me contact:"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:594
 msgid "Si_gns on"
 msgstr "_Autentificare"
 
-#: ../pidgin/gtkpounce.c:587
+#: ../pidgin/gtkpounce.c:596
 msgid "Signs o_ff"
 msgstr "_Deconectare"
 
-#: ../pidgin/gtkpounce.c:589
+#: ../pidgin/gtkpounce.c:598
 msgid "Goes a_way"
 msgstr "Intrarea 樽n a_bsen釘�"
 
-#: ../pidgin/gtkpounce.c:591
+#: ../pidgin/gtkpounce.c:600
 msgid "Ret_urns from away"
 msgstr "�ntoarcerea din abs_en釘�"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:602
 msgid "Becomes _idle"
 msgstr "Intrarea 樽n inacti_vitate"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:604
 msgid "Is no longer i_dle"
 msgstr "Revenirea din inac_tivitate"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:606
 msgid "Starts _typing"
 msgstr "Tastarea unui mesaj _nou"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:608
 msgid "P_auses while typing"
 msgstr "Pau_z� 樽n timpul tast�rii"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:610
 msgid "Stops t_yping"
 msgstr "O_prirea din tastare"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:612
 msgid "Sends a _message"
 msgstr "Trimiterea unui _mesaj"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:655
 msgid "Ope_n an IM window"
 msgstr "Desc_hide o discu釘ie"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:657
 msgid "_Pop up a notification"
 msgstr "Deschide _o fereastr� de notificare"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:659
 msgid "Send a _message"
 msgstr "Trimite un mesa_j"
 
-#: ../pidgin/gtkpounce.c:652
-msgid "E_xecute a command"
-msgstr "E_xecut� o comand�"
-
-#: ../pidgin/gtkpounce.c:654
-msgid "P_lay a sound"
-msgstr "Red� _un sunet"
-
-#: ../pidgin/gtkpounce.c:659
-msgid "Brows_e..."
-msgstr "Na_vigare..."
-
 #: ../pidgin/gtkpounce.c:661
+msgid "E_xecute a command"
+msgstr "E_xecut� o comand�"
+
+#: ../pidgin/gtkpounce.c:663
+msgid "P_lay a sound"
+msgstr "Red� _un sunet"
+
+#: ../pidgin/gtkpounce.c:669
+msgid "Brows_e..."
+msgstr "Na_vigare..."
+
+#: ../pidgin/gtkpounce.c:671
 msgid "Br_owse..."
 msgstr "Navi_gare..."
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:672
 msgid "Pre_view"
 msgstr "_Testare"
 
-#: ../pidgin/gtkpounce.c:786
-msgid "P_ounce only when my status is not available"
+#: ../pidgin/gtkpounce.c:799
+msgid "P_ounce only when my status is not Available"
 msgstr "�nt但mpinare doar 樽n starea de _indisponibilitate"
 
-#: ../pidgin/gtkpounce.c:791
+#: ../pidgin/gtkpounce.c:804
 msgid "_Recurring"
 msgstr "Re_curent�"
 
-#: ../pidgin/gtkpounce.c:1247
+#: ../pidgin/gtkpounce.c:1260
 msgid "Pounce Target"
 msgstr "鄭int� 樽nt但mpinare"
 
-#: ../pidgin/gtkprefs.c:509
+#: ../pidgin/gtkprefs.c:385
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "Implicit�"
+
+#: ../pidgin/gtkprefs.c:516
 msgid "Smiley theme failed to unpack."
 msgstr "Tema de iconi釘e simbolice nu a putut fi dezarhivat�."
 
-#: ../pidgin/gtkprefs.c:638
+#: ../pidgin/gtkprefs.c:643
+msgid "Install Theme"
+msgstr "Instalare tem�"
+
+#: ../pidgin/gtkprefs.c:696
 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."
@@ -13700,255 +14297,259 @@
 "utiliza釘i. Prin tragere �i plasare cu mausul pute釘i ad�uga teme noi 樽n "
 "aceast� list�."
 
-#: ../pidgin/gtkprefs.c:673
+#: ../pidgin/gtkprefs.c:731
 msgid "Icon"
 msgstr "Iconi釘�"
 
-#: ../pidgin/gtkprefs.c:816
+#: ../pidgin/gtkprefs.c:893
 msgid "System Tray Icon"
 msgstr "Iconi釘� 樽n zona de notificare"
 
-#: ../pidgin/gtkprefs.c:817
+#: ../pidgin/gtkprefs.c:894
 msgid "_Show system tray icon:"
 msgstr "Arat� iconi釘a din _zona de notificare:"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1686
+#: ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1756
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
 msgid "Always"
 msgstr "�ntotdeauna"
 
-#: ../pidgin/gtkprefs.c:821
+#: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "Pentru mesajele necitite"
 
-#: ../pidgin/gtkprefs.c:826
+#: ../pidgin/gtkprefs.c:903
 msgid "Conversation Window Hiding"
 msgstr "Ascundere ferestre de discu釘ii"
 
-#: ../pidgin/gtkprefs.c:827
+#: ../pidgin/gtkprefs.c:904
 msgid "_Hide new IM conversations:"
 msgstr "Ascunde discu釘iile _noi:"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1867
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1937
 msgid "When away"
 msgstr "�n absen釘�"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:838
+#: ../pidgin/gtkprefs.c:915
 msgid "Tabs"
 msgstr "Taburi"
 
-#: ../pidgin/gtkprefs.c:840
+#: ../pidgin/gtkprefs.c:917
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Arat� _discu釘iile �i chat-urile 樽n taburi"
 
-#: ../pidgin/gtkprefs.c:854
+#: ../pidgin/gtkprefs.c:931
 msgid "Show close b_utton on tabs"
 msgstr "Arat� _butoanele de 樽nchidere a taburilor"
 
-#: ../pidgin/gtkprefs.c:857
+#: ../pidgin/gtkprefs.c:934
 msgid "_Placement:"
 msgstr "_Plasament:"
 
-#: ../pidgin/gtkprefs.c:859
+#: ../pidgin/gtkprefs.c:936
 msgid "Top"
 msgstr "Sus"
 
-#: ../pidgin/gtkprefs.c:860
+#: ../pidgin/gtkprefs.c:937
 msgid "Bottom"
 msgstr "Jos"
 
-#: ../pidgin/gtkprefs.c:861
+#: ../pidgin/gtkprefs.c:938
 msgid "Left"
 msgstr "�n st但nga"
 
-#: ../pidgin/gtkprefs.c:862
+#: ../pidgin/gtkprefs.c:939
 msgid "Right"
 msgstr "�n dreapta"
 
-#: ../pidgin/gtkprefs.c:864
+#: ../pidgin/gtkprefs.c:941
 msgid "Left Vertical"
 msgstr "Vertical 樽n st但nga"
 
-#: ../pidgin/gtkprefs.c:865
+#: ../pidgin/gtkprefs.c:942
 msgid "Right Vertical"
 msgstr "Vertical in dreapta"
 
-#: ../pidgin/gtkprefs.c:872
+#: ../pidgin/gtkprefs.c:949
 msgid "N_ew conversations:"
 msgstr "D_iscu釘ii noi:"
 
-#: ../pidgin/gtkprefs.c:917
+#: ../pidgin/gtkprefs.c:994
 msgid "Show _formatting on incoming messages"
 msgstr "P�streaz� _formatarea mesajelor primite"
 
-#: ../pidgin/gtkprefs.c:920
-msgid "Show buddy _icons"
-msgstr "Arat� avatarurile c_ontactelor"
-
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:997
+msgid "Show Buddy _Details"
+msgstr "Arat� _detaliile contactelor"
+
+#: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
 msgstr "Activea_z� anima釘iile avatarurilor"
 
-#: ../pidgin/gtkprefs.c:929
+#: ../pidgin/gtkprefs.c:1006
 msgid "_Notify buddies that you are typing to them"
 msgstr "Notific� contactele c但nd le scri_u"
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:1009
 msgid "Highlight _misspelled words"
 msgstr "_Eviden釘iaz� gre�elile de ortografie"
 
-#: ../pidgin/gtkprefs.c:936
+#: ../pidgin/gtkprefs.c:1013
 msgid "Use smooth-scrolling"
 msgstr "Derulare cu efect"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:1016
 msgid "F_lash window when IMs are received"
 msgstr "_Eviden釘iaz� fereastra la primirea de mesaje"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:1018
+msgid "Minimi_ze new conversation windows"
+msgstr "Minimi_zeaz� noile ferestre de discu釘ii"
+
+#: ../pidgin/gtkprefs.c:1022
 msgid "Font"
 msgstr "Font"
 
-#: ../pidgin/gtkprefs.c:945
+#: ../pidgin/gtkprefs.c:1024
 msgid "Use document font from _theme"
 msgstr "Utilizeaz� fontul precizat 樽n _tem� pentru documente"
 
-#: ../pidgin/gtkprefs.c:947
+#: ../pidgin/gtkprefs.c:1026
 msgid "Use font from _theme"
 msgstr "Utilizeaz� fontul din _tem�"
 
-#: ../pidgin/gtkprefs.c:949
+#: ../pidgin/gtkprefs.c:1028
 msgid "Conversation _font:"
 msgstr "_Font discu釘ii:"
 
-#: ../pidgin/gtkprefs.c:962
+#: ../pidgin/gtkprefs.c:1041
 msgid "Default Formatting"
 msgstr "Formatare implicit�"
 
-#: ../pidgin/gtkprefs.c:978
+#: ../pidgin/gtkprefs.c:1057
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
+"that support formatting."
 msgstr ""
 "A�a vor ar�ta mesajele trimise utiliz但nd protocoalele ce suport� formatarea "
 "mesajelor."
 
-#: ../pidgin/gtkprefs.c:1054
+#: ../pidgin/gtkprefs.c:1123
 msgid "ST_UN server:"
 msgstr "Server ST_UN:"
 
-#: ../pidgin/gtkprefs.c:1066
+#: ../pidgin/gtkprefs.c:1135
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exemplu: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1070
+#: ../pidgin/gtkprefs.c:1139
 msgid "_Autodetect IP address"
 msgstr "_Autodetectare adres� IP"
 
-#: ../pidgin/gtkprefs.c:1079
+#: ../pidgin/gtkprefs.c:1148
 msgid "Public _IP:"
 msgstr "_IP public:"
 
-#: ../pidgin/gtkprefs.c:1108
+#: ../pidgin/gtkprefs.c:1177
 msgid "Ports"
 msgstr "Porturi"
 
-#: ../pidgin/gtkprefs.c:1111
+#: ../pidgin/gtkprefs.c:1180
 msgid "_Manually specify range of ports to listen on"
 msgstr "P_orturi de utilizat"
 
-#: ../pidgin/gtkprefs.c:1114
+#: ../pidgin/gtkprefs.c:1183
 msgid "_Start port:"
 msgstr "_De la:"
 
-#: ../pidgin/gtkprefs.c:1121
+#: ../pidgin/gtkprefs.c:1190
 msgid "_End port:"
 msgstr "_P但n� la:"
 
-#: ../pidgin/gtkprefs.c:1129
+#: ../pidgin/gtkprefs.c:1198
 msgid "Proxy Server"
 msgstr "Server proxy"
 
-#: ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkprefs.c:1202
 msgid "No proxy"
 msgstr "F�r� proxy"
 
-#: ../pidgin/gtkprefs.c:1189
+#: ../pidgin/gtkprefs.c:1258
 msgid "_User:"
 msgstr "Utili_zator:"
 
-#: ../pidgin/gtkprefs.c:1253
+#: ../pidgin/gtkprefs.c:1323
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1254
+#: ../pidgin/gtkprefs.c:1324
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1255
+#: ../pidgin/gtkprefs.c:1325
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1256
+#: ../pidgin/gtkprefs.c:1326
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1257
+#: ../pidgin/gtkprefs.c:1327
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1258
+#: ../pidgin/gtkprefs.c:1328
 msgid "GNOME Default"
 msgstr "Navigatorul Gnome"
 
-#: ../pidgin/gtkprefs.c:1259
+#: ../pidgin/gtkprefs.c:1329
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1330
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1261
+#: ../pidgin/gtkprefs.c:1331
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1262
+#: ../pidgin/gtkprefs.c:1332
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1271
+#: ../pidgin/gtkprefs.c:1341
 msgid "Manual"
 msgstr "Manual"
 
-#: ../pidgin/gtkprefs.c:1324
+#: ../pidgin/gtkprefs.c:1394
 msgid "Browser Selection"
 msgstr "Navigator preferat"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1398
 msgid "_Browser:"
 msgstr "_Navigator:"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1406
 msgid "_Open link in:"
 msgstr "_Deschide adresa:"
 
-#: ../pidgin/gtkprefs.c:1338
+#: ../pidgin/gtkprefs.c:1408
 msgid "Browser default"
 msgstr "Dup� cum e setat navigatorul"
 
-#: ../pidgin/gtkprefs.c:1339
+#: ../pidgin/gtkprefs.c:1409
 msgid "Existing window"
 msgstr "�ntr-o fereastr� existent�"
 
-#: ../pidgin/gtkprefs.c:1341
+#: ../pidgin/gtkprefs.c:1411
 msgid "New tab"
 msgstr "�ntr-un tab nou"
 
-#: ../pidgin/gtkprefs.c:1355
+#: ../pidgin/gtkprefs.c:1425
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -13957,80 +14558,80 @@
 "_Manual:\n"
 "(%s pentru adres�)"
 
-#: ../pidgin/gtkprefs.c:1395
+#: ../pidgin/gtkprefs.c:1465
 msgid "Log _format:"
 msgstr "_Format 樽nregistr�ri:"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1470
 msgid "Log all _instant messages"
 msgstr "�nregistreaz� toate _mesajele"
 
-#: ../pidgin/gtkprefs.c:1402
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log all c_hats"
 msgstr "�nregistreaz� _toate chat-urile"
 
-#: ../pidgin/gtkprefs.c:1404
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _status changes to system log"
 msgstr "�nregistreaz� toate schimb�rile de _status 樽n 樽nregistr�rile sistem"
 
-#: ../pidgin/gtkprefs.c:1512 ../pidgin/gtkprefs.c:1601
-#: ../pidgin/gtkprefs.c:1795
+#: ../pidgin/gtkprefs.c:1582 ../pidgin/gtkprefs.c:1671
+#: ../pidgin/gtkprefs.c:1865
 msgid "(default)"
 msgstr "(implicit)"
 
-#: ../pidgin/gtkprefs.c:1550
+#: ../pidgin/gtkprefs.c:1620
 msgid "Sound Selection"
 msgstr "Selecta釘i un sunet"
 
-#: ../pidgin/gtkprefs.c:1560
+#: ../pidgin/gtkprefs.c:1630
 msgid "Quietest"
 msgstr "Foarte 樽ncet"
 
-#: ../pidgin/gtkprefs.c:1562
+#: ../pidgin/gtkprefs.c:1632
 msgid "Quieter"
 msgstr "Mai 樽ncet"
 
-#: ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quiet"
 msgstr "�ncet"
 
-#: ../pidgin/gtkprefs.c:1568
+#: ../pidgin/gtkprefs.c:1638
 msgid "Loud"
 msgstr "Tare"
 
-#: ../pidgin/gtkprefs.c:1570
+#: ../pidgin/gtkprefs.c:1640
 msgid "Louder"
 msgstr "Mai tare"
 
-#: ../pidgin/gtkprefs.c:1572
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loudest"
 msgstr "Foarte tare"
 
-#: ../pidgin/gtkprefs.c:1635
+#: ../pidgin/gtkprefs.c:1705
 msgid "Sound Method"
 msgstr "Sistemul de sunet"
 
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1706
 msgid "_Method:"
 msgstr "_Sistem:"
 
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1708
 msgid "Console beep"
 msgstr "Bip"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1710
 msgid "Automatic"
 msgstr "Automat"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1714
 msgid "Command"
 msgstr "Comand�"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1715
 msgid "No sounds"
 msgstr "F�r� sunete"
 
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1723
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14039,117 +14640,117 @@
 "Comand� de _redare sunet\n"
 "(%s pentru numele fi�ierului)"
 
-#: ../pidgin/gtkprefs.c:1679
+#: ../pidgin/gtkprefs.c:1749
 msgid "Sound Options"
 msgstr "Op釘iuni sunet"
 
-#: ../pidgin/gtkprefs.c:1680
+#: ../pidgin/gtkprefs.c:1750
 msgid "Sounds when conversation has _focus"
 msgstr "Utilizeaz� sunete c但nd fereastra de discu釘ii are _focus"
 
-#: ../pidgin/gtkprefs.c:1682
+#: ../pidgin/gtkprefs.c:1752
 msgid "Enable sounds:"
 msgstr "Activare sunete:"
 
-#: ../pidgin/gtkprefs.c:1684
+#: ../pidgin/gtkprefs.c:1754
 msgid "Only when available"
 msgstr "Doar c但nd sunt disponibil(�)"
 
-#: ../pidgin/gtkprefs.c:1685
+#: ../pidgin/gtkprefs.c:1755
 msgid "Only when not available"
 msgstr "Doar c但nd nu sunt disponibil(�)"
 
-#: ../pidgin/gtkprefs.c:1693
+#: ../pidgin/gtkprefs.c:1763
 msgid "Volume:"
 msgstr "Volum:"
 
-#: ../pidgin/gtkprefs.c:1721
+#: ../pidgin/gtkprefs.c:1791
 msgid "Sound Events"
 msgstr "Evenimente sonore"
 
-#: ../pidgin/gtkprefs.c:1773
+#: ../pidgin/gtkprefs.c:1843
 msgid "Play"
 msgstr "Redare"
 
-#: ../pidgin/gtkprefs.c:1780
+#: ../pidgin/gtkprefs.c:1850
 msgid "Event"
 msgstr "Eveniment"
 
-#: ../pidgin/gtkprefs.c:1799
+#: ../pidgin/gtkprefs.c:1869
 msgid "Test"
 msgstr "Testare"
 
-#: ../pidgin/gtkprefs.c:1803
+#: ../pidgin/gtkprefs.c:1873
 msgid "Reset"
 msgstr "Resetare"
 
-#: ../pidgin/gtkprefs.c:1807
+#: ../pidgin/gtkprefs.c:1877
 msgid "Choose..."
 msgstr "Alege釘i..."
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1920
 msgid "_Report idle time:"
 msgstr "_Raporteaz� inactivitatea:"
 
-#: ../pidgin/gtkprefs.c:1855
+#: ../pidgin/gtkprefs.c:1925
 msgid "Based on keyboard or mouse use"
 msgstr "�n func釘ie de activitatea utilizatorului"
 
-#: ../pidgin/gtkprefs.c:1864
+#: ../pidgin/gtkprefs.c:1934
 msgid "_Auto-reply:"
 msgstr "R�spunsuri _automate:"
 
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1938
 msgid "When both away and idle"
 msgstr "�n absen釘� �i inactivitate"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1874
+#: ../pidgin/gtkprefs.c:1944
 msgid "Auto-away"
 msgstr "Absen釘e automate"
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1946
 msgid "Change status when _idle"
 msgstr "Schimb� statusul 樽n _inactivitate"
 
-#: ../pidgin/gtkprefs.c:1880
+#: ../pidgin/gtkprefs.c:1950
 msgid "_Minutes before changing status:"
 msgstr "_Minute 樽naintea schimb�rii statusului:"
 
-#: ../pidgin/gtkprefs.c:1888
+#: ../pidgin/gtkprefs.c:1958
 msgid "Change _status to:"
 msgstr "Schimb� _statusul 樽n:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1909
+#: ../pidgin/gtkprefs.c:1979
 msgid "Status at Startup"
 msgstr "Status la pornire"
 
-#: ../pidgin/gtkprefs.c:1911
+#: ../pidgin/gtkprefs.c:1981
 msgid "Use status from last _exit at startup"
 msgstr "Utilizeaz� _ultimul status"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1987
 msgid "Status to a_pply at startup:"
 msgstr "Status de setat la _pornire:"
 
-#: ../pidgin/gtkprefs.c:1955
+#: ../pidgin/gtkprefs.c:2025
 msgid "Interface"
 msgstr "Interfa釘�"
 
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:2027
 msgid "Smiley Themes"
 msgstr "Teme iconi釘e"
 
-#: ../pidgin/gtkprefs.c:1958
+#: ../pidgin/gtkprefs.c:2028
 msgid "Sounds"
 msgstr "Sunete"
 
-#: ../pidgin/gtkprefs.c:1964
+#: ../pidgin/gtkprefs.c:2034
 msgid "Browser"
 msgstr "Navigator"
 
-#: ../pidgin/gtkprefs.c:1968
+#: ../pidgin/gtkprefs.c:2038
 msgid "Status / Idle"
 msgstr "Statusuri"
 
@@ -14173,63 +14774,63 @@
 msgid "Block only the users below"
 msgstr "Blocheaz� doar utilizatorii de mai jos"
 
-#: ../pidgin/gtkprivacy.c:372
+#: ../pidgin/gtkprivacy.c:369
 msgid "Privacy"
 msgstr "Securitate"
 
-#: ../pidgin/gtkprivacy.c:385
+#: ../pidgin/gtkprivacy.c:381
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Set�rile de securitate intr� 樽n ac釘iune instantaneu."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:397
+#: ../pidgin/gtkprivacy.c:393
 msgid "Set privacy for:"
 msgstr "Set�ri de securitate pentru:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
+#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
 msgid "Permit User"
 msgstr "Permite utilizatorul"
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:557
 msgid "Type a user you permit to contact you."
 msgstr "Introduce釘i un utilizator care s� v� poat� contacta."
 
-#: ../pidgin/gtkprivacy.c:562
+#: ../pidgin/gtkprivacy.c:558
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Introduce釘i numele utilizatorului care dori釘i s� v� poat� contacta."
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
 msgid "_Permit"
 msgstr "_Permite"
 
-#: ../pidgin/gtkprivacy.c:571
+#: ../pidgin/gtkprivacy.c:567
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Are voie %s s� v� contacteze?"
 
-#: ../pidgin/gtkprivacy.c:573
+#: ../pidgin/gtkprivacy.c:569
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sigur dori釘i ca %s s� v� poat� contacta?"
 
-#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
 msgid "Block User"
 msgstr "Blocare utilizator"
 
-#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:599
 msgid "Type a user to block."
 msgstr "Introduce釘i un utilizator pe care s�-l bloca釘i."
 
-#: ../pidgin/gtkprivacy.c:604
+#: ../pidgin/gtkprivacy.c:600
 msgid "Please enter the name of the user you wish to block."
 msgstr "Introduce釘i numele utilizatorului pe care dori釘i s�-l bloca釘i."
 
-#: ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "Dori釘i s� bloca釘i utilizatorul %s?"
 
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Sigur dori釘i ca %s s� nu v� poat� contacta?"
@@ -14238,76 +14839,77 @@
 msgid "Apply"
 msgstr "Aplic�"
 
-#: ../pidgin/gtkrequest.c:1481
+#: ../pidgin/gtkrequest.c:1483
 msgid "That file already exists"
 msgstr "Acest fi�ier exist� deja."
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1484
 msgid "Would you like to overwrite it?"
 msgstr "Dori釘i s� 樽l suprascrie釘i?"
 
-#: ../pidgin/gtkrequest.c:1485
+#: ../pidgin/gtkrequest.c:1487
 msgid "Overwrite"
 msgstr "Suprascriere"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1488
 msgid "Choose New Name"
 msgstr "Nume nou"
 
-#: ../pidgin/gtkrequest.c:1624 ../pidgin/gtkrequest.c:1638
+#: ../pidgin/gtkrequest.c:1626 ../pidgin/gtkrequest.c:1640
 msgid "Select Folder..."
 msgstr "Alege釘i un director..."
 
-#: ../pidgin/gtkroomlist.c:376
+#. Create the window.
+#: ../pidgin/gtkroomlist.c:374
 msgid "Room List"
 msgstr "List� camere de chat"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:446
+#: ../pidgin/gtkroomlist.c:442
 msgid "_Get List"
 msgstr "_Ob釘ine lista"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:454
+#: ../pidgin/gtkroomlist.c:450
 msgid "_Add Chat"
 msgstr "_Adaug� un chat"
 
-#: ../pidgin/gtksavedstatuses.c:331
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "Sigur dori釘i s� �terge釘i 樽nt但mpinarea la %s pentru %s?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1214
+#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
 msgid "_Use"
 msgstr "_Utilizeaz�"
 
-#: ../pidgin/gtksavedstatuses.c:726
+#: ../pidgin/gtksavedstatuses.c:779
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Titlu utilizat deja. E necesar� alegerea unui titlu unic."
 
-#: ../pidgin/gtksavedstatuses.c:914
+#: ../pidgin/gtksavedstatuses.c:969
 msgid "Different"
 msgstr "Diferit"
 
-#: ../pidgin/gtksavedstatuses.c:1107
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "_Title:"
 msgstr "_Titlu:"
 
-#: ../pidgin/gtksavedstatuses.c:1126 ../pidgin/gtksavedstatuses.c:1447
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
 msgid "_Status:"
 msgstr "St_atus:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1158
+#: ../pidgin/gtksavedstatuses.c:1209
 msgid "Use a _different status for some accounts"
 msgstr "Utilizeaz� un status _diferit pentru unele conturi"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1222
+#: ../pidgin/gtksavedstatuses.c:1273
 msgid "Sa_ve & Use"
 msgstr "Sal_veaz� �i utilizeaz�"
 
-#: ../pidgin/gtksavedstatuses.c:1428
+#: ../pidgin/gtksavedstatuses.c:1477
 #, c-format
 msgid "Status for %s"
 msgstr "Status pentru %s"
@@ -14360,29 +14962,29 @@
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer nu s-a putut ini釘ializa."
 
-#: ../pidgin/gtkstatusbox.c:661
+#: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "Se a�teapt� revenirea conexiunii de re釘ea"
 
-#: ../pidgin/gtkutils.c:593
+#: ../pidgin/gtkutils.c:631
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1309 ../pidgin/gtkutils.c:1332
+#: ../pidgin/gtkutils.c:1388 ../pidgin/gtkutils.c:1411
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Urm�toarea eroare a ap�rut la 樽nc�rcarea %s: %s"
 
-#: ../pidgin/gtkutils.c:1312 ../pidgin/gtkutils.c:1334
+#: ../pidgin/gtkutils.c:1391 ../pidgin/gtkutils.c:1413
 msgid "Failed to load image"
 msgstr "�nc�rcarea imaginii a e�uat"
 
-#: ../pidgin/gtkutils.c:1408
+#: ../pidgin/gtkutils.c:1487
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Nu se poate trimite directorul %s."
 
-#: ../pidgin/gtkutils.c:1409
+#: ../pidgin/gtkutils.c:1488
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -14391,12 +14993,12 @@
 "�n %s nu se pot transfera directoare. Va trebui s� trimite釘i fi�ierele "
 "individual."
 
-#: ../pidgin/gtkutils.c:1441 ../pidgin/gtkutils.c:1453
-#: ../pidgin/gtkutils.c:1460
+#: ../pidgin/gtkutils.c:1520 ../pidgin/gtkutils.c:1532
+#: ../pidgin/gtkutils.c:1539
 msgid "You have dragged an image"
 msgstr "A釘i tras �i plasat o imagine"
 
-#: ../pidgin/gtkutils.c:1442
+#: ../pidgin/gtkutils.c:1521
 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."
@@ -14404,23 +15006,23 @@
 "Pute釘i trimite aceast� imagine printr-un transfer de fi�iere, o pute釘i "
 "insera 樽n acest mesaj sau o pute釘i seta ca avatar pentru acest contact."
 
-#: ../pidgin/gtkutils.c:1448 ../pidgin/gtkutils.c:1468
+#: ../pidgin/gtkutils.c:1527 ../pidgin/gtkutils.c:1547
 msgid "Set as buddy icon"
 msgstr "Seteaz� ca avatar"
 
-#: ../pidgin/gtkutils.c:1449 ../pidgin/gtkutils.c:1469
+#: ../pidgin/gtkutils.c:1528 ../pidgin/gtkutils.c:1548
 msgid "Send image file"
 msgstr "Transfer� fi�ierul"
 
-#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1469
+#: ../pidgin/gtkutils.c:1529 ../pidgin/gtkutils.c:1548
 msgid "Insert in message"
 msgstr "Insereaz� 樽n mesaj"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1533
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Dori釘i s� o seta釘i ca avatar pentru acest contact?"
 
-#: ../pidgin/gtkutils.c:1461
+#: ../pidgin/gtkutils.c:1540
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -14428,7 +15030,7 @@
 "Pute釘i trimite aceast� imagine printr-un transfer de fi�iere sau o pute釘i "
 "seta ca avatar pentru acest contact."
 
-#: ../pidgin/gtkutils.c:1462
+#: ../pidgin/gtkutils.c:1541
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14441,11 +15043,11 @@
 #. * 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:1520
+#: ../pidgin/gtkutils.c:1599
 msgid "Cannot send launcher"
 msgstr "Lansatorul nu a putut fi trimis"
 
-#: ../pidgin/gtkutils.c:1520
+#: ../pidgin/gtkutils.c:1599
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -14453,7 +15055,7 @@
 "A釘i tras �i plasat un lansator pentru desktop. Probabil dori釘i sa trimite釘i "
 "nu lansatorul 樽n sine, ci fi�ierul la care face referire."
 
-#: ../pidgin/gtkutils.c:2267
+#: ../pidgin/gtkutils.c:2321
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14464,25 +15066,25 @@
 "<b>M�rime fi�ier:</b> %s\n"
 "<b>M�rime imagine:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2563
+#: ../pidgin/gtkutils.c:2617
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "Fi�ierul ��%s�� este prea mare pentru %s. �ncerca釘i un fi�ier mai mic.\n"
 
-#: ../pidgin/gtkutils.c:2565
+#: ../pidgin/gtkutils.c:2619
 msgid "Icon Error"
 msgstr "Eroare iconi釘�"
 
-#: ../pidgin/gtkutils.c:2566
+#: ../pidgin/gtkutils.c:2620
 msgid "Could not set icon"
 msgstr "Nu s-a putut utiliza iconi釘a"
 
-#: ../pidgin/gtkutils.c:2666
+#: ../pidgin/gtkutils.c:2720
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Nu s-a putut deschide fi�ierul ��%s��: %s"
 
-#: ../pidgin/gtkutils.c:2715
+#: ../pidgin/gtkutils.c:2769
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
@@ -14490,20 +15092,14 @@
 "Dintr-un motiv necunoscut nu s-a putut 樽nc�rca imaginea ��%s��, probabil este "
 "un fi�ier imagine corupt"
 
-#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "Salvare fi�ier"
 
-#: ../pidgin/gtkwhiteboard.c:867
+#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Selectare culoare"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../pidgin/pidgin.h:50
-msgid "Pidgin"
-msgstr "Pidgin"
-
 #: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "_Alias"
@@ -14528,10 +15124,6 @@
 msgid "_Open Mail"
 msgstr "_Arat� mailul"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
-msgid "Default"
-msgstr "Implicit�"
-
 #: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "Iconi釘e simbolice Pidgin"
@@ -14548,35 +15140,35 @@
 msgid "none"
 msgstr "nimic"
 
-#: ../pidgin/plugins/cap/cap.c:449
+#: ../pidgin/plugins/cap/cap.c:450
 msgid "Display Statistics"
 msgstr "Afi�are statistici"
 
-#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr "Probabilitate r�spunsuri:"
 
-#: ../pidgin/plugins/cap/cap.c:810
+#: ../pidgin/plugins/cap/cap.c:811
 msgid "Statistics Configuration"
 msgstr "Configurare statistici"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:813
+#: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
 msgstr "Timp maxim de r�spuns:"
 
-#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
-#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
+#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "minute"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:820
+#: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
 msgstr "Diferen釘a maxim� 樽nregistrat�:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:827
+#: ../pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
 msgstr "Prag:"
 
@@ -14586,18 +15178,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:934
+#: ../pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
 msgstr "Predic釘ii pentru disponibilitatea contactelor"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
 msgstr "Modul pentru disponibilitatea contactelor"
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:939
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -14701,7 +15293,7 @@
 msgid "Received Messages"
 msgstr "Mesaje primite"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "Alege釘i culoarea pentru %s"
@@ -14744,7 +15336,8 @@
 "Note: The preference for \"New conversations\" must be set to \"By "
 "conversation count\"."
 msgstr ""
-"Not�: Op釘iunea pentru ��Noi conversa釘ii�� trebuie s� fie ��Dup� num�rul discu釘iilor��."
+"Not�: Op釘iunea pentru ��Noi conversa釘ii�� trebuie s� fie ��Dup� num�rul "
+"discu釘iilor��."
 
 #: ../pidgin/plugins/extplacement.c:111
 msgid "Number of conversations per window"
@@ -14838,30 +15431,30 @@
 msgstr "Mesagerie instant"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr ""
 "Selecta釘i o persoan� din agenda de mai jos sau ad�uga釘i o nou� persoan�."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
 msgid "Group:"
 msgstr "Grup:"
 
 #. "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
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
 msgid "New Person"
 msgstr "Persoan� nou�"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
 msgid "Select Buddy"
 msgstr "Selectare contact"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -14870,43 +15463,43 @@
 "nou� intrare."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "_Detalii utilizator"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "_Asociere contact"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
-#: ../pidgin/plugins/gevolution/gevolution.c:245
-msgid "Unable to send e-mail"
-msgstr "Trimiterea mailului a e�uat."
-
 #: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:246
+msgid "Unable to send e-mail"
+msgstr "Trimiterea mailului a e�uat."
+
+#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "Executabilul ��evolution�� nu a fost g�sit 樽n PATH."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:246
+#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
 msgstr "Nu s-a g�sit o adres� de mail pentru acest contact."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:272
+#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "Adaug� 樽n agend�"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:284
+#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send E-Mail"
 msgstr "Trimite mail"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:411
+#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "Configurare integrare cu Evolution"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:414
+#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "Selecta釘i toate conturile 樽n care contactele ar trebui ad�ugate automat."
@@ -14917,7 +15510,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:526
+#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Integrare cu Evolution"
 
@@ -14925,37 +15518,37 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:529
-#: ../pidgin/plugins/gevolution/gevolution.c:531
+#: ../pidgin/plugins/gevolution/gevolution.c:530
+#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "Ofer� integrare cu aplica釘ia Evolution."
 
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
+msgid "Please enter the person's information below."
+msgstr "Introduce釘i mai jos detaliile persoanei."
+
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:267
-msgid "Please enter the person's information below."
-msgstr "Introduce釘i mai jos detaliile persoanei."
-
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
 msgid "Please enter the buddy's screen name and account type below."
 msgstr "Ad�uga釘i numele de identificare al contactului �i tipul contului."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
 msgid "Account type:"
 msgstr "Tip cont:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
 msgid "Optional information:"
 msgstr "Detalii op釘ionale:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
 msgid "First name:"
 msgstr "Prenume:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
 msgid "Last name:"
 msgstr "Nume de familie:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
 msgid "E-mail:"
 msgstr "Mail:"
 
@@ -15252,24 +15845,24 @@
 msgid "Notify Dialog"
 msgstr "Dialog notificare"
 
-#: ../pidgin/plugins/pidginrc.c:322
+#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "Alege釘i o culoare"
 
-#: ../pidgin/plugins/pidginrc.c:361
+#: ../pidgin/plugins/pidginrc.c:300
+msgid "Select Interface Font"
+msgstr "Alege釘i fontul interfe釘ei"
+
+#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "Alege釘i un font pentru %s"
 
-#: ../pidgin/plugins/pidginrc.c:398
-msgid "Select Interface Font"
-msgstr "Alege釘i fontul interfe釘ei"
-
-#: ../pidgin/plugins/pidginrc.c:453
+#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "Font interfa釘� GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr "Tem� combina釘ii de taste GTK+ Text"
 
@@ -15293,36 +15886,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:510
+#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "Culori interfa釘�"
 
-#: ../pidgin/plugins/pidginrc.c:534
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "M�rimi widget-uri"
 
-#: ../pidgin/plugins/pidginrc.c:555
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "Fonturi"
 
-#: ../pidgin/plugins/pidginrc.c:578
-msgid "Tools"
-msgstr "Unelte"
-
-#: ../pidgin/plugins/pidginrc.c:583
+#: ../pidgin/plugins/pidginrc.c:497
+msgid "Gtkrc File Tools"
+msgstr "Unelte fi�iere Gtkrc"
+
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Scrie set�rile 樽n %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:591
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "Recite�te fi�ierele gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:624
+#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Control tem� GTK+ Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "Permite accesul la cele mai uzuale set�ri gtkrc."
 
@@ -15339,24 +15932,25 @@
 "Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
 "'Enter' in the entry box to send. Watch the debug window."
 msgstr ""
-"Permite introducerea brut� a comenzilor 樽n protocoalele tip text (XMPP, "
-"MSN, IRC, TOC). Comenzile se trimit cu ENTER. Urm�ri釘i rezultatul comenzilor "
-"樽n fereastra de depanare."
+"Permite introducerea brut� a comenzilor 樽n protocoalele tip text (XMPP, MSN, "
+"IRC, TOC). Comenzile se trimit cu ENTER. Urm�ri釘i rezultatul comenzilor 樽n "
+"fereastra de depanare."
 
 #: ../pidgin/plugins/relnot.c:71
 #, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\""
-msgstr "Versiunea %s este %s. Ultima versiune este %s. O pute釘i ob釘ine de la "
-"<a href=\""
-
-#: ../pidgin/plugins/relnot.c:78
+"from <a href=\"%s\">%s</a><hr>"
+msgstr ""
+"Versiunea utilizat� este %s versiunea %s. Ultima versiune este %s. O "
+"pute釘i ob釘ine de la <a href=\"%s\">%s</a><hr>"
+
+#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>Nout�釘i:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:83 ../pidgin/plugins/relnot.c:84
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "A ap�rut o nou� versiune"
 
@@ -15366,19 +15960,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:142
+#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "Notific�ri versiuni noi"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "Verific� dac� exist� versiuni noi Gaim."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:147
+#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -15386,68 +15980,68 @@
 "Verific� periodic dac� exist� versiuni noi �i notific� utilizatorul cu "
 "privire la nout�釘ile ultimei versiuni."
 
-#: ../pidgin/plugins/spellchk.c:1965
+#: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
 msgstr "Corec釘ie duplicat�"
 
-#: ../pidgin/plugins/spellchk.c:1966
+#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "Cuv但ntul specificat exist� deja 樽n lista de corec釘ii."
 
-#: ../pidgin/plugins/spellchk.c:2180
+#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "Cuvinte de 樽nlocuit:"
 
-#: ../pidgin/plugins/spellchk.c:2203
+#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "Dac� scrie釘i"
 
-#: ../pidgin/plugins/spellchk.c:2217
+#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "Se va trimite"
 
-#: ../pidgin/plugins/spellchk.c:2231
+#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "Doar cuvinte 樽ntregi"
 
-#: ../pidgin/plugins/spellchk.c:2243
+#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "Majuscule semnificative"
 
-#: ../pidgin/plugins/spellchk.c:2269
+#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "Ad�uga釘i un alt cuv但nt de 樽nlocuit"
 
-#: ../pidgin/plugins/spellchk.c:2285
+#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "_Dac� scrie釘i:"
 
-#: ../pidgin/plugins/spellchk.c:2302
+#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "_Se va trimite:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2314
+#: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "Potrivire _exact� majuscule (dezactiva釘i pentru procesare automat�)"
 
-#: ../pidgin/plugins/spellchk.c:2316
+#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "�nlocuie�te doar cuvintele 樽_ntregi"
 
-#: ../pidgin/plugins/spellchk.c:2341
+#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "Op釘iuni generale de corectare a textului"
 
-#: ../pidgin/plugins/spellchk.c:2342
+#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "Activeaz� corectarea ultimului cuv但nt la trimitere"
 
-#: ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "Corecturi text"
 
-#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
+#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Schimb� mesajele trimise dup� reguli predefinite de utilizator."
 
@@ -15457,15 +16051,15 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
-msgstr "List� glisant� contacte"
+msgstr "List� glisant� de contacte"
 
 #. *< name
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "O versiune glisant� pe orizontal� a listei de contacte."
 
@@ -15551,44 +16145,44 @@
 "Acest modul v� permite s� personaliza釘i formatarea marcajelor de timp 樽n "
 "discu釘ii �i 樽nregistr�ri."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:589
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636
 msgid "Opacity:"
 msgstr "Opacitate:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
 msgid "IM Conversation Windows"
 msgstr "Ferestre de discu釘ii"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554
 msgid "_IM window transparency"
 msgstr "Transparen釘a ferestrelor de _discu釘ii"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568
 msgid "_Show slider bar in IM window"
 msgstr "Arat� _bara de derulare 樽n fereastra de discu釘ii"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575
 msgid "Remove IM window transparency on focus"
 msgstr "Dezactiveaz� transparen釘a ferestrei de discu釘ii 樽n prim plan"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:578
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626
 msgid "Always on top"
 msgstr "�ntotdeauna deasupra"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
 msgid "Buddy List Window"
 msgstr "Fereastra listei de contacte"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611
 msgid "_Buddy List window transparency"
 msgstr "_Transparen釘a ferestrei listei de contacte"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Dezactiveaz� transparen釘a listei de contacte 樽n prim plan"
 
@@ -15598,19 +16192,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684
 msgid "Transparency"
 msgstr "Transparen釘�"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Transparen釘� variabil� pentru lista contactelor �i discu釘ii."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:689
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -15666,10 +16260,10 @@
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
-"Permite alegerea unor op釘iuni Pidgin pentru Windows, precum ata�area "
-"listei de contacte."
-
-#: ../pidgin/plugins/xmppconsole.c:666
+"Permite alegerea unor op釘iuni Pidgin pentru Windows, precum ata�area listei "
+"de contacte."
+
+#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Deconectat(�).</font>"
 
@@ -15679,44 +16273,88 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:842
-#: ../pidgin/plugins/xmppconsole.c:861
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "Consol� XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:754
+#: ../pidgin/plugins/xmppconsole.c:753
 msgid "Account: "
 msgstr "Cont: "
 
-#: ../pidgin/plugins/xmppconsole.c:781
+#: ../pidgin/plugins/xmppconsole.c:780
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Neconectat(�) la XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:791
+#: ../pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
 msgstr "Insereaz� un bloc brut <iq/>."
 
-#: ../pidgin/plugins/xmppconsole.c:800
+#: ../pidgin/plugins/xmppconsole.c:799
 msgid "Insert a <presence/> stanza."
 msgstr "Insereaz� un bloc brut <presence/>."
 
-#: ../pidgin/plugins/xmppconsole.c:809
+#: ../pidgin/plugins/xmppconsole.c:808
 msgid "Insert a <message/> stanza."
 msgstr "Insereaz� un bloc brut <message/>."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:864
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Trimitere �i primire blocuri XMPP brute"
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:866
+#: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
 "Acest modul poate fi utilizat pentru depanarea serverelor �i clien釘ilor XMPP."
 
+#~ msgid "Commands are not supported yet. Message was NOT sent."
+#~ msgstr "Comenzile nu au fost 樽nc� implementate. Mesajul NU a fost trimis."
+
+#~ msgid "User information for %s unavailable:"
+#~ msgstr "Detaliile utilizatorului %s nu sunt disponibile:"
+
+#~ msgid "You have been signed off for an unknown reason."
+#~ msgstr "A釘i fost deconectat(�) din motive necunoscute."
+
+#~ 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 ""
+#~ "Nu s-a putut ad�uga contactul %s dintr-un motiv necunoscut. Cel mai "
+#~ "probabil a釘i atins num�rul maxim permis de contacte 樽n lista de contacte."
+
+#~ msgid "_Connect"
+#~ msgstr "_Conectare"
+
+#~ msgid "Send IM fail\n"
+#~ msgstr "Trimiterea mesajului a e�uat\n"
+
+#~ msgid "Reject watching by other users"
+#~ msgstr "Nu permite altor utilizatori s� urm�reasc� discu釘iile"
+
+#~ msgid "Block invites"
+#~ msgstr "Blocheaz� invita釘iile"
+
+#~ msgid "Reject online status attribute requests"
+#~ msgstr "Refuz� cererile pentru atributul st�rii de conectare"
+
+#~ msgid "Unavailable"
+#~ msgstr "Indisponibil(�)"
+
+#~ msgid "/Buddies/_About Pidgin"
+#~ msgstr "/Contacte/_Despre Pidgin"
+
+#~ msgid "Show buddy _icons"
+#~ msgstr "Arat� avatarurile c_ontactelor"
+
+#~ msgid "Tools"
+#~ msgstr "Unelte"
+
 #~ msgid "Gaim Internet Messenger"
 #~ msgstr "Mesagerul Gaim"
 
@@ -15742,30 +16380,9 @@
 #~ msgid "Alias..."
 #~ msgstr "Alias..."
 
-#~ msgid "/_Help"
-#~ msgstr "/_Ajutor"
-
-#~ msgid "/Help/Online _Help"
-#~ msgstr "/Ajutor/Ajutor _online"
-
-#~ msgid "/Help/_About"
-#~ msgstr "/Ajutor/_Despre"
-
 #~ msgid "/Tools/Buddy Pounces"
 #~ msgstr "/Unelte/�nt但mpinare contacte"
 
-#~ msgid "/Conversation/Insert Lin_k..."
-#~ msgstr "/Discu釘ie/Insereaz� o a_dres�..."
-
-#~ msgid "/Conversation/Insert Imag_e..."
-#~ msgstr "/Discu釘ie/Inserea_z� o imagine..."
-
-#~ msgid "/Conversation/Insert Link..."
-#~ msgstr "/Discu釘ie/Insereaz� o adres�..."
-
-#~ msgid "/Conversation/Insert Image..."
-#~ msgstr "/Discu釘ie/Insereaz� o imagine..."
-
 #~ msgid "Jabber developer"
 #~ msgstr "programator Jabber"
 
--- a/po/ru.po	Thu Aug 02 04:12:57 2007 +0000
+++ b/po/ru.po	Thu Aug 02 04:16:37 2007 +0000
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: ru\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-06-11 12:34+0400\n"
-"PO-Revision-Date: 2007-06-12 12:00+0400\n"
+"POT-Creation-Date: 2007-07-24 12:42+0400\n"
+"PO-Revision-Date: 2007-07-24 16:00+0400\n"
 "Last-Translator: Dmitry Beloglazov <dmaa@users.sf.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -19,12 +19,19 @@
 "Plural-Forms: nplurals=3; plural=n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
 
-#: ../finch/finch.c:180
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:70 ../finch/finch.c:298 ../finch/finch.c:327
+#: ../finch/finch.c:404
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:204
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. �舒弍亠�亳�亠 `%s -h' 亟仍� 仗仂仍��亠仆亳� 亟仂仗仂仍仆亳�亠仍�仆仂亶 亳仆�仂�仄舒�亳亳.\n"
 
-#: ../finch/finch.c:182
+#: ../finch/finch.c:206
 #, c-format
 msgid ""
 "%s\n"
@@ -45,13 +52,7 @@
 "  -n, --nologin       仆亠 于�仂亟亳�� 舒于�仂仄舒�亳�亠�从亳\n"
 "  -v, --version       仗仂从舒亰舒�� �亠从���� 于亠��亳� 亳 于�亶�亳\n"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../finch/finch.c:274 ../finch/finch.c:303
-msgid "Finch"
-msgstr "Finch"
-
-#: ../finch/finch.c:301 ../pidgin/gtkmain.c:688
+#: ../finch/finch.c:325 ../pidgin/gtkmain.c:708
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -59,104 +60,112 @@
 "http://developer.pidgin.im"
 msgstr ""
 
-#: ../finch/gntaccount.c:119 ../finch/gntblist.c:290 ../finch/gntblist.c:415
-#: ../finch/gntblist.c:428 ../finch/gntplugin.c:181 ../finch/gntplugin.c:225
-#: ../finch/gntstatus.c:294 ../finch/gntstatus.c:302
-#: ../libpurple/protocols/jabber/buddy.c:1426
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308
+#: ../libpurple/protocols/jabber/buddy.c:1464
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1235
-#: ../libpurple/protocols/qq/group_join.c:326
+#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error"
 msgstr "��亳弍从舒"
 
-#: ../finch/gntaccount.c:119
+#: ../finch/gntaccount.c:123
 msgid "Account was not added"
 msgstr "丕���仆舒� 亰舒仗亳�� 仆亠 弍�仍舒 亟仂弍舒于仍亠仆舒"
 
-#: ../finch/gntaccount.c:120
+#: ../finch/gntaccount.c:124
 msgid "Screenname of an account must be non-empty."
 msgstr "�亟亠仆�亳�亳从舒�仂� ����仆仂亶 亰舒仗亳�亳 亟仂仍亢亠仆 弍��� 仆亠仗����仄."
 
-#: ../finch/gntaccount.c:423
+#: ../finch/gntaccount.c:431
 msgid "New mail notifications"
 msgstr "丕于亠亟仂仄仍亠仆亳� 仂 仆仂于仂亶 仗仂��亠"
 
-#: ../finch/gntaccount.c:433
+#: ../finch/gntaccount.c:441
 msgid "Remember password"
 msgstr "�舒仗仂仄仆亳�� 仗舒�仂仍�"
 
-#: ../finch/gntaccount.c:474 ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:3976
+#: ../finch/gntaccount.c:479
+msgid "There's no protocol plugins installed."
+msgstr ""
+
+#: ../finch/gntaccount.c:480
+msgid "(You probably forgot to 'make install'.)"
+msgstr ""
+
+#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4014
 msgid "Modify Account"
 msgstr "�亰仄亠仆亳�� ����仆�� 亰舒仗亳��"
 
-#: ../finch/gntaccount.c:474
+#: ../finch/gntaccount.c:490
 msgid "New Account"
 msgstr "�仂于舒� ����仆舒� 亰舒仗亳��"
 
-#: ../finch/gntaccount.c:500 ../pidgin/gtkft.c:695
+#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695
 msgid "Protocol:"
 msgstr "��仂�仂从仂仍:"
 
-#: ../finch/gntaccount.c:508
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:295
+#: ../finch/gntaccount.c:523
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
 msgid "Screen name:"
 msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�:"
 
-#: ../finch/gntaccount.c:521
+#: ../finch/gntaccount.c:536
 msgid "Password:"
 msgstr "�舒�仂仍�:"
 
-#: ../finch/gntaccount.c:531
+#: ../finch/gntaccount.c:546
 msgid "Alias:"
 msgstr "��亠于亟仂仆亳仄:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:554 ../finch/gntaccount.c:617
-#: ../finch/gntaccount.c:853 ../finch/gntblist.c:334 ../finch/gntblist.c:403
-#: ../finch/gntblist.c:438 ../finch/gntblist.c:770 ../finch/gntblist.c:967
-#: ../finch/gntblist.c:1063 ../finch/gntblist.c:2160 ../finch/gntplugin.c:360
-#: ../finch/gntpounce.c:456 ../finch/gntpounce.c:654 ../finch/gntprefs.c:246
-#: ../finch/gntstatus.c:142 ../finch/gntstatus.c:475 ../finch/gntstatus.c:600
+#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632
+#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2207 ../finch/gntplugin.c:378
+#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264
+#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:481 ../finch/gntstatus.c:606
 #: ../libpurple/account.c:984 ../libpurple/account.c:1234
-#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1168
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1173
 #: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
 #: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
 #: ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/jabber/buddy.c:584
-#: ../libpurple/protocols/jabber/buddy.c:1788
-#: ../libpurple/protocols/jabber/buddy.c:1824
+#: ../libpurple/protocols/jabber/buddy.c:588
+#: ../libpurple/protocols/jabber/buddy.c:1826
+#: ../libpurple/protocols/jabber/buddy.c:1862
 #: ../libpurple/protocols/jabber/chat.c:786
 #: ../libpurple/protocols/jabber/jabber.c:882
-#: ../libpurple/protocols/jabber/jabber.c:1390
+#: ../libpurple/protocols/jabber/jabber.c:1384
 #: ../libpurple/protocols/jabber/si.c:868
 #: ../libpurple/protocols/jabber/xdata.c:337
 #: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
 #: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
 #: ../libpurple/protocols/msn/msn.c:331
-#: ../libpurple/protocols/oscar/oscar.c:6047
+#: ../libpurple/protocols/oscar/oscar.c:6073
 #: ../libpurple/protocols/oscar/peer.c:1023
 #: ../libpurple/protocols/qq/buddy_info.c:484
 #: ../libpurple/protocols/qq/buddy_opt.c:214
 #: ../libpurple/protocols/qq/buddy_opt.c:409
 #: ../libpurple/protocols/qq/group.c:124
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_join.c:363
-#: ../libpurple/protocols/qq/group_opt.c:143
-#: ../libpurple/protocols/qq/group_opt.c:398
+#: ../libpurple/protocols/qq/group_join.c:140
+#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_opt.c:144
+#: ../libpurple/protocols/qq/group_opt.c:399
 #: ../libpurple/protocols/qq/sys_msg.c:115
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:269
-#: ../libpurple/protocols/sametime/sametime.c:3388
-#: ../libpurple/protocols/sametime/sametime.c:3474
-#: ../libpurple/protocols/sametime/sametime.c:3645
-#: ../libpurple/protocols/sametime/sametime.c:5397
-#: ../libpurple/protocols/sametime/sametime.c:5487
-#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/sametime/sametime.c:3475
+#: ../libpurple/protocols/sametime/sametime.c:3646
+#: ../libpurple/protocols/sametime/sametime.c:5398
+#: ../libpurple/protocols/sametime/sametime.c:5488
+#: ../libpurple/protocols/sametime/sametime.c:5613
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1076
 #: ../libpurple/protocols/silc/buddy.c:1191
@@ -175,158 +184,160 @@
 #: ../libpurple/protocols/silc10/silc.c:942
 #: ../libpurple/protocols/yahoo/yahoo.c:989
 #: ../libpurple/protocols/yahoo/yahoo.c:3248
-#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1916
-#: ../pidgin/gtkaccount.c:2514 ../pidgin/gtkblist.c:5856
-#: ../pidgin/gtkdialogs.c:724 ../pidgin/gtkdialogs.c:871
-#: ../pidgin/gtkdialogs.c:963 ../pidgin/gtkdialogs.c:983
-#: ../pidgin/gtkdialogs.c:1007 ../pidgin/gtkdialogs.c:1029
-#: ../pidgin/gtkdialogs.c:1077 ../pidgin/gtkdialogs.c:1118
-#: ../pidgin/gtkdialogs.c:1174 ../pidgin/gtkdialogs.c:1213
-#: ../pidgin/gtkdialogs.c:1240 ../pidgin/gtkimhtmltoolbar.c:423
-#: ../pidgin/gtklog.c:302 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1102
-#: ../pidgin/gtkprivacy.c:566 ../pidgin/gtkprivacy.c:582
-#: ../pidgin/gtkprivacy.c:607 ../pidgin/gtkprivacy.c:621
-#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:337
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1912
+#: ../pidgin/gtkaccount.c:2506 ../pidgin/gtkblist.c:5915
+#: ../pidgin/gtkdialogs.c:727 ../pidgin/gtkdialogs.c:865
+#: ../pidgin/gtkdialogs.c:957 ../pidgin/gtkdialogs.c:977
+#: ../pidgin/gtkdialogs.c:1001 ../pidgin/gtkdialogs.c:1023
+#: ../pidgin/gtkdialogs.c:1071 ../pidgin/gtkdialogs.c:1112
+#: ../pidgin/gtkdialogs.c:1168 ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1234 ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
+#: ../pidgin/gtkstatusbox.c:1582
 msgid "Cancel"
 msgstr "��仄亠仆亳��"
 
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:558 ../finch/gntplugin.c:360 ../finch/gntpounce.c:462
-#: ../finch/gntprefs.c:246 ../finch/gntstatus.c:478 ../finch/gntstatus.c:588
+#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
+#: ../finch/gntprefs.c:264 ../finch/gntstatus.c:484 ../finch/gntstatus.c:594
 #: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:583 ../pidgin/gtkdebug.c:748
+#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
 #: ../pidgin/gtkrequest.c:276
 msgid "Save"
 msgstr "弌仂��舒仆亳��"
 
-#: ../finch/gntaccount.c:611 ../pidgin/gtkaccount.c:1908
-#: ../pidgin/gtksavedstatuses.c:328
+#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1904
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1576
 #, c-format
 msgid "Are you sure you want to delete %s?"
 msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 �亟舒仍亳�� %s?"
 
-#: ../finch/gntaccount.c:614
+#: ../finch/gntaccount.c:629
 msgid "Delete Account"
 msgstr "丕亟舒仍亳�� ����仆�� 亰舒仗亳��"
 
 #. Delete button
-#: ../finch/gntaccount.c:616 ../finch/gntaccount.c:683
-#: ../finch/gntpounce.c:653 ../finch/gntpounce.c:714 ../finch/gntstatus.c:141
-#: ../finch/gntstatus.c:204 ../pidgin/gtkaccount.c:1915 ../pidgin/gtklog.c:301
-#: ../pidgin/gtkpounce.c:1101 ../pidgin/gtkrequest.c:273
-#: ../pidgin/gtksavedstatuses.c:336
+#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701
+#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143
+#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1911 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1581
 msgid "Delete"
 msgstr "丕亟舒仍亳��"
 
-#: ../finch/gntaccount.c:646 ../finch/gntblist.c:2065 ../finch/gntui.c:76
-#: ../pidgin/gtkaccount.c:2340 ../pidgin/gtkdocklet.c:522
+#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2113 ../finch/gntui.c:77
+#: ../pidgin/gtkaccount.c:2329 ../pidgin/gtkdocklet.c:522
 msgid "Accounts"
 msgstr "丕���仆�亠 亰舒仗亳�亳"
 
-#: ../finch/gntaccount.c:652
+#: ../finch/gntaccount.c:669
 msgid "You can enable/disable accounts from the following list."
 msgstr "�� 仄仂亢亠�亠 于从仍��舒��/于�从仍��舒�� ����仆�亠 亰舒仗亳�亳 亳亰 �仍亠亟���亠亞仂 �仗亳�从舒."
 
 #. Add button
-#: ../finch/gntaccount.c:675 ../finch/gntaccount.c:852 ../finch/gntblist.c:333
-#: ../finch/gntblist.c:403 ../finch/gntblist.c:438 ../finch/gntnotify.c:369
-#: ../finch/gntpounce.c:699 ../finch/gntstatus.c:194
+#: ../finch/gntaccount.c:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntnotify.c:379
+#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198
 #: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
 #: ../libpurple/protocols/qq/sys_msg.c:175
 #: ../libpurple/protocols/qq/sys_msg.c:270
-#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/sametime/sametime.c:5487
 #: ../libpurple/protocols/silc/chat.c:615
-#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2513
-#: ../pidgin/gtkblist.c:5855 ../pidgin/gtkconv.c:1686
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2505
+#: ../pidgin/gtkblist.c:5914 ../pidgin/gtkconv.c:1652
 #: ../pidgin/gtkrequest.c:274
 msgid "Add"
 msgstr "�仂弍舒于亳��"
 
 #. Modify button
-#: ../finch/gntaccount.c:679 ../finch/gntpounce.c:706
+#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710
 msgid "Modify"
 msgstr "�亰仄亠仆亳��"
 
-#: ../finch/gntaccount.c:775 ../pidgin/gtkaccount.c:2460
+#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2452
 #, c-format
 msgid "%s%s%s%s has made %s his or her buddy%s%s"
 msgstr "%s%s%s%s 亟仂弍舒于亳仍 %s 于 �于仂亶 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于%s%s"
 
-#: ../finch/gntaccount.c:848 ../pidgin/gtkaccount.c:2512
+#: ../finch/gntaccount.c:873 ../pidgin/gtkaccount.c:2504
 msgid "Add buddy to your list?"
 msgstr "�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒 于 �仗亳�仂从?"
 
-#: ../finch/gntaccount.c:902 ../pidgin/gtkaccount.c:2564
+#: ../finch/gntaccount.c:927 ../pidgin/gtkaccount.c:2556
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
 msgstr "%s%s%s%s �仂�亠� 亟仂弍舒于亳�� %s 于 �于仂亶 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于%s%s"
 
-#: ../finch/gntaccount.c:922 ../finch/gntaccount.c:929
-#: ../pidgin/gtkaccount.c:2587 ../pidgin/gtkaccount.c:2593
+#: ../finch/gntaccount.c:952 ../finch/gntaccount.c:955
+#: ../finch/gntaccount.c:982 ../pidgin/gtkaccount.c:2579
+#: ../pidgin/gtkaccount.c:2585
 msgid "Authorize buddy?"
 msgstr "�于�仂�亳亰仂于舒�� �仂弍亠�亠亟仆亳从舒?"
 
-#: ../finch/gntaccount.c:926 ../finch/gntaccount.c:933
-#: ../pidgin/gtkaccount.c:2588 ../pidgin/gtkaccount.c:2594
+#: ../finch/gntaccount.c:959 ../finch/gntaccount.c:986
+#: ../pidgin/gtkaccount.c:2580 ../pidgin/gtkaccount.c:2586
 msgid "Authorize"
 msgstr "�于�仂�亳亰仂于舒��"
 
-#: ../finch/gntaccount.c:927 ../finch/gntaccount.c:934
-#: ../pidgin/gtkaccount.c:2589 ../pidgin/gtkaccount.c:2595
+#: ../finch/gntaccount.c:960 ../finch/gntaccount.c:987
+#: ../pidgin/gtkaccount.c:2581 ../pidgin/gtkaccount.c:2587
 msgid "Deny"
 msgstr "��从舒亰舒��"
 
-#: ../finch/gntblist.c:279
+#: ../finch/gntblist.c:288
 msgid "You must provide a screename for the buddy."
 msgstr "�� 亟仂仍亢仆� 亰舒亟舒�� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 亟仍� �仂弍亠�亠亟仆亳从舒."
 
-#: ../finch/gntblist.c:281
+#: ../finch/gntblist.c:290
 msgid "You must provide a group."
 msgstr "�� 亟仂仍亢仆� 亰舒亟舒�� 亞��仗仗�."
 
-#: ../finch/gntblist.c:283
+#: ../finch/gntblist.c:292
 msgid "You must select an account."
 msgstr "�� 亟仂仍亢仆� 于�弍�舒�� ����仆�� 亰舒仗亳��."
 
-#: ../finch/gntblist.c:285
+#: ../finch/gntblist.c:294
 msgid "The selected account is not online."
 msgstr ""
 
-#: ../finch/gntblist.c:290
+#: ../finch/gntblist.c:299
 msgid "Error adding buddy"
 msgstr "��亳弍从舒 亟仂弍舒于仍亠仆亳� �仂弍亠�亠亟仆亳从舒"
 
-#: ../finch/gntblist.c:315 ../libpurple/protocols/oscar/oscar.c:2845
-#: ../pidgin/gtkaccount.c:1991 ../pidgin/gtksavedstatuses.c:924
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2860
+#: ../pidgin/gtkaccount.c:1985 ../pidgin/gtksavedstatuses.c:979
 msgid "Screen Name"
 msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../finch/gntblist.c:318 ../finch/gntblist.c:395 ../finch/gntblist.c:1211
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
 #: ../libpurple/protocols/msn/msn.c:1364
 #: ../libpurple/protocols/silc/chat.c:606
 #: ../libpurple/protocols/silc10/chat.c:590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:680
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
 #: ../libpurple/protocols/zephyr/zephyr.c:788
-#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:982
-#: ../pidgin/gtkdialogs.c:1006 ../pidgin/gtkdialogs.c:1028
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:976
+#: ../pidgin/gtkdialogs.c:1000 ../pidgin/gtkdialogs.c:1022
 #: ../pidgin/gtkrequest.c:277
 msgid "Alias"
 msgstr "��亠于亟仂仆亳仄"
 
-#: ../finch/gntblist.c:321 ../finch/gntblist.c:398
+#: ../finch/gntblist.c:330 ../finch/gntblist.c:412
 msgid "Group"
 msgstr "���仗仗舒"
 
-#: ../finch/gntblist.c:325 ../finch/gntblist.c:386 ../finch/gntblist.c:1261
-#: ../finch/gntnotify.c:171 ../finch/gntstatus.c:566
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1301
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
 #: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:2965 ../pidgin/gtknotify.c:476
-#: ../pidgin/gtkpounce.c:1269 ../pidgin/plugins/gevolution/gevolution.c:443
+#: ../pidgin/gtkblist.c:2974 ../pidgin/gtknotify.c:482
+#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "丕���仆舒� 亰舒仗亳��"
 
-#: ../finch/gntblist.c:331 ../finch/gntblist.c:819
+#: ../finch/gntblist.c:340 ../finch/gntblist.c:851
 #: ../libpurple/protocols/silc/buddy.c:725
 #: ../libpurple/protocols/silc/buddy.c:1027
 #: ../libpurple/protocols/silc/buddy.c:1072
@@ -335,178 +346,176 @@
 #: ../libpurple/protocols/silc10/buddy.c:1033
 #: ../libpurple/protocols/silc10/buddy.c:1080
 #: ../libpurple/protocols/silc10/buddy.c:1180
-#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5361
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:447
+#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5420
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒"
 
-#: ../finch/gntblist.c:331
+#: ../finch/gntblist.c:340
 msgid "Please enter buddy information."
 msgstr "�于亠亟亳�亠 亳仆�仂�仄舒�亳� 仂 �仂弍亠�亠亟仆亳从亠."
 
-#: ../finch/gntblist.c:358 ../libpurple/blist.c:1192
+#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190
 msgid "Chats"
 msgstr "丼舒��"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:392 ../libpurple/protocols/jabber/jabber.c:813
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:813
 #: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
 #: ../libpurple/protocols/msn/msn.c:1645
 #: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
-#: ../pidgin/gtkroomlist.c:621
+#: ../pidgin/gtkroomlist.c:617
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "�仄�"
 
-#: ../finch/gntblist.c:401 ../finch/gntblist.c:821 ../pidgin/gtkblist.c:5741
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:818
+msgid "Auto-join"
+msgstr "��亳�仂亠亟亳仆����� 舒于�仂仄舒�亳�亠�从亳"
+
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5800
 msgid "Add Chat"
 msgstr "�仂弍舒于亳�� �舒�"
 
-#: ../finch/gntblist.c:402
+#: ../finch/gntblist.c:419
 msgid "You can edit more information from the context menu later."
 msgstr "�� 仄仂亢亠�亠 亳亰仄亠仆亳�� 弍仂仍��亠 亳仆�仂�仄舒�亳亳 仗仂亰亢亠 亳亰 从仂仆�亠从��仆仂亞仂 仄亠仆�."
 
-#: ../finch/gntblist.c:415 ../finch/gntblist.c:428
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445
 msgid "Error adding group"
 msgstr "��亳弍从舒 亟仂弍舒于仍亠仆亳� 亞��仗仗�"
 
-#: ../finch/gntblist.c:416
+#: ../finch/gntblist.c:433
 msgid "You must give a name for the group to add."
 msgstr "�� 亟仂仍亢仆� 亟舒�� 亳仄� 亟仂弍舒于仍�亠仄仂亶 亞��仗仗亠."
 
-#: ../finch/gntblist.c:429
+#: ../finch/gntblist.c:446
 msgid "A group with the name already exists."
 msgstr "���仗仗舒 � �舒从亳仄 亳仄亠仆亠仄 �亢亠 ���亠��于�亠�."
 
-#: ../finch/gntblist.c:436 ../finch/gntblist.c:823
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:5852
+#: ../finch/gntblist.c:453 ../finch/gntblist.c:855
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5485 ../pidgin/gtkblist.c:5911
 msgid "Add Group"
 msgstr "�仂弍舒于亳�� 亞��仗仗�"
 
-#: ../finch/gntblist.c:436
+#: ../finch/gntblist.c:453
 msgid "Enter the name of the group"
 msgstr "�于亠亟亳�亠 亳仄� 亞��仗仗�"
 
-#: ../finch/gntblist.c:769
+#: ../finch/gntblist.c:801
 msgid "Edit Chat"
 msgstr "�亰仄亠仆亳�� �舒�"
 
-#: ../finch/gntblist.c:769
+#: ../finch/gntblist.c:801
 msgid "Please Update the necessary fields."
 msgstr "�弍仆仂于亳�亠 仆�亢仆�亠 仗仂仍�."
 
-#: ../finch/gntblist.c:770 ../finch/gntstatus.c:199
+#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
 msgid "Edit"
 msgstr "�亰仄亠仆亳��"
 
-#: ../finch/gntblist.c:786
-msgid "Auto-join"
-msgstr "��亳�仂亠亟亳仆����� 舒于�仂仄舒�亳�亠�从亳"
-
-#: ../finch/gntblist.c:795
+#: ../finch/gntblist.c:827
 msgid "Edit Settings"
 msgstr "�亰仄亠仆亳�� 仆舒���仂亶从亳"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:276
-#: ../pidgin/gtkconv.c:681 ../pidgin/gtkdialogs.c:830
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:926
 msgid "Information"
 msgstr "�仆�仂�仄舒�亳�"
 
-#: ../finch/gntblist.c:833 ../finch/gntconv.c:317 ../pidgin/gtkblist.c:276
-#: ../pidgin/gtkconv.c:681 ../pidgin/gtkdialogs.c:830
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:926
 msgid "Retrieving..."
 msgstr "�舒亞��亰从舒..."
 
-#: ../finch/gntblist.c:866 ../finch/gntconv.c:418
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:407
 #: ../libpurple/protocols/silc/chat.c:899
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "�仂仍��亳�� 亳仆�仂�仄舒�亳�"
 
-#: ../finch/gntblist.c:870
+#: ../finch/gntblist.c:907
 msgid "Add Buddy Pounce"
 msgstr "�仂弍舒于亳�� 仗�舒于亳仍仂"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:877 ../finch/gntconv.c:430
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:419
 #: ../libpurple/protocols/jabber/si.c:868
-#: ../libpurple/protocols/oscar/oscar.c:636 ../libpurple/protocols/qq/qq.c:585
-#: ../pidgin/gtkconv.c:1634
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585
+#: ../pidgin/gtkconv.c:1600
 msgid "Send File"
 msgstr "��仗�舒于亳�� �舒亶仍"
 
-#: ../finch/gntblist.c:881
+#: ../finch/gntblist.c:918
 msgid "View Log"
 msgstr "��仂�仄仂��亠�� 亢��仆舒仍"
 
-#: ../finch/gntblist.c:962
+#: ../finch/gntblist.c:999
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "�于亠亟亳�亠 仆仂于仂亠 亳仄� 亟仍� %s"
 
-#: ../finch/gntblist.c:964 ../finch/gntblist.c:1211
+#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249
 msgid "Rename"
 msgstr "�亠�亠亳仄亠仆仂于舒��"
 
-#: ../finch/gntblist.c:964
+#: ../finch/gntblist.c:1001
 msgid "Set Alias"
 msgstr "�舒亟舒�� 仗�亠于亟仂仆亳仄"
 
-#: ../finch/gntblist.c:965
+#: ../finch/gntblist.c:1002
 msgid "Enter empty string to reset the name."
 msgstr "�于亠亟亳�亠 仗����� ���仂从� 亟仍� �弍�仂�舒 亳仄亠仆亳."
 
-#: ../finch/gntblist.c:1041
+#: ../finch/gntblist.c:1078
 msgid "Removing this contact will also remove all the buddies in the contact"
 msgstr ""
 "丕亟舒仍亠仆亳亠 ��仂亞仂 从仂仆�舒从�舒 仗�亳于亠亟�� 从 �亟舒仍亠仆亳� 于�亠� 于�仂亟��亳� 于 仆亠亞仂 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../finch/gntblist.c:1049
+#: ../finch/gntblist.c:1086
 msgid "Removing this group will also remove all the buddies in the group"
 msgstr ""
 "丕亟舒仍亠仆亳亠 ��仂亶 亞��仗仗� 仗�亳于亠亟�� 从 �亟舒仍亠仆亳� 于�亠� 于�仂亟��亳� 于 仆亠� �仂弍亠�亠亟仆亳从仂于"
 
-#: ../finch/gntblist.c:1054
+#: ../finch/gntblist.c:1091
 #, c-format
 msgid "Are you sure you want to remove %s?"
 msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 �亟舒仍亳�� %s?"
 
 #. XXX: anything to do with the returned ui-handle?
-#: ../finch/gntblist.c:1057
+#: ../finch/gntblist.c:1094
 msgid "Confirm Remove"
 msgstr "�仂亟�于亠�亟亳�� �亟舒仍亠仆亳亠"
 
-#: ../finch/gntblist.c:1062 ../finch/gntblist.c:1213 ../finch/gntft.c:223
-#: ../pidgin/gtkconv.c:1683 ../pidgin/gtkrequest.c:275
-#: ../pidgin/gtkstatusbox.c:261
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:224
+#: ../pidgin/gtkconv.c:1649 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:263
 msgid "Remove"
 msgstr "丕亟舒仍亳��"
 
 #. Buddy List
-#: ../finch/gntblist.c:1187 ../finch/gntblist.c:2237 ../finch/gntprefs.c:240
-#: ../finch/gntui.c:77 ../pidgin/gtkblist.c:4220
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2292 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:78 ../pidgin/gtkblist.c:4256
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:330
 msgid "Buddy List"
 msgstr "弌仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../finch/gntblist.c:1218
+#: ../finch/gntblist.c:1256
 msgid "Place tagged"
 msgstr "�亠��仂 仗仂仄亠�亠仆仂"
 
-#: ../finch/gntblist.c:1223
+#: ../finch/gntblist.c:1261
 msgid "Toggle Tag"
 msgstr "�弍�舒�亳�� 仗仂仄亠�从�"
 
 #. General
-#: ../finch/gntblist.c:1256 ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/gg/gg.c:2204
+#: ../finch/gntblist.c:1296 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
+#: ../libpurple/protocols/gg/gg.c:2202
 #: ../libpurple/protocols/jabber/buddy.c:274
-#: ../libpurple/protocols/jabber/buddy.c:818
-#: ../libpurple/protocols/jabber/buddy.c:1589
-#: ../libpurple/protocols/jabber/buddy.c:1771
+#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:1627
+#: ../libpurple/protocols/jabber/buddy.c:1809
 #: ../libpurple/protocols/jabber/jabber.c:823
 #: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
 #: ../libpurple/protocols/qq/buddy_info.c:43
@@ -518,25 +527,29 @@
 #: ../libpurple/protocols/silc10/ops.c:1036
 #: ../libpurple/protocols/silc10/ops.c:1179
 #: ../libpurple/protocols/silc10/ops.c:1328
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1042 ../pidgin/gtkblist.c:2989
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:2998
 msgid "Nickname"
 msgstr "��亠于亟仂仆亳仄"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1276 ../finch/gntprefs.c:243
+#: ../finch/gntblist.c:1316 ../finch/gntprefs.c:260
 #: ../libpurple/protocols/bonjour/bonjour.c:314
-#: ../libpurple/protocols/jabber/buddy.c:643
-#: ../libpurple/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/jabber/buddy.c:647
+#: ../libpurple/protocols/jabber/buddy.c:687
 #: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
 #: ../libpurple/protocols/novell/novell.c:2825
-#: ../libpurple/protocols/oscar/oscar.c:2869
+#: ../libpurple/protocols/oscar/oscar.c:2884
 #: ../libpurple/protocols/yahoo/yahoo.c:2915
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:686 ../pidgin/gtkblist.c:3009
-#: ../pidgin/gtkblist.c:3402 ../pidgin/gtkprefs.c:1848
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3026
+#: ../pidgin/gtkblist.c:3435 ../pidgin/gtkprefs.c:1918
 msgid "Idle"
 msgstr "�亠亰亟亠亶��于亳亠"
 
-#: ../finch/gntblist.c:1365
+#: ../finch/gntblist.c:1329
+msgid "On Mobile"
+msgstr ""
+
+#: ../finch/gntblist.c:1409
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -545,12 +558,12 @@
 "� �亠�亳: %d\n"
 "��亠亞仂: %d"
 
-#: ../finch/gntblist.c:1374
+#: ../finch/gntblist.c:1418
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "丕���仆舒� 亰舒仗亳��: %s (%s)"
 
-#: ../finch/gntblist.c:1386
+#: ../finch/gntblist.c:1430
 #, c-format
 msgid ""
 "\n"
@@ -559,50 +572,50 @@
 "\n"
 "�仂�仍亠亟仆亠亠 仗仂�于仍亠仆亳亠: %s 仆舒亰舒亟"
 
-#: ../finch/gntblist.c:1651 ../pidgin/gtkdocklet.c:470
-#: ../pidgin/gtkstatusbox.c:1064
+#: ../finch/gntblist.c:1696 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1070
 msgid "New..."
 msgstr "�仂于�亶..."
 
-#: ../finch/gntblist.c:1658 ../pidgin/gtkdocklet.c:471
-#: ../pidgin/gtkstatusbox.c:1065
+#: ../finch/gntblist.c:1703 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1071
 msgid "Saved..."
 msgstr "弌仂��舒仆�仆仆�亶..."
 
-#: ../finch/gntblist.c:2033 ../finch/gntplugin.c:244 ../finch/gntui.c:81
+#: ../finch/gntblist.c:2081 ../finch/gntplugin.c:254 ../finch/gntui.c:82
 #: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
 msgid "Plugins"
 msgstr "�仂亟�仍亳"
 
-#: ../finch/gntblist.c:2141 ../pidgin/gtkdialogs.c:705
-#: ../pidgin/gtkdialogs.c:852 ../pidgin/gtkdialogs.c:933
+#: ../finch/gntblist.c:2188 ../pidgin/gtkdialogs.c:708
+#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
 msgid "_Name"
 msgstr "_�仄�"
 
-#: ../finch/gntblist.c:2146 ../pidgin/gtkdialogs.c:710
-#: ../pidgin/gtkdialogs.c:857 ../pidgin/gtkdialogs.c:938
+#: ../finch/gntblist.c:2193 ../pidgin/gtkdialogs.c:713
+#: ../pidgin/gtkdialogs.c:851 ../pidgin/gtkdialogs.c:932
 msgid "_Account"
 msgstr "_丕���仆舒� 亰舒仗亳��"
 
-#: ../finch/gntblist.c:2154 ../pidgin/gtkdialogs.c:718
+#: ../finch/gntblist.c:2201 ../pidgin/gtkdialogs.c:721
 msgid "New Instant Message"
 msgstr "�仂于仂亠 仄亞仆仂于亠仆仆仂亠 �仂仂弍�亠仆亳亠"
 
-#: ../finch/gntblist.c:2156 ../pidgin/gtkdialogs.c:720
+#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:723
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
 "�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗�亠于亟仂仆亳仄 仗亠��仂仆�, 从仂�仂�仂亶 于� �仂�亠仍亳 "
 "弍� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠."
 
-#: ../finch/gntblist.c:2159 ../finch/gntnotify.c:77 ../libpurple/account.c:983
+#: ../finch/gntblist.c:2206 ../finch/gntnotify.c:79 ../libpurple/account.c:983
 #: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
 #: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
-#: ../libpurple/protocols/jabber/jabber.c:1389
+#: ../libpurple/protocols/jabber/jabber.c:1383
 #: ../libpurple/protocols/jabber/xdata.c:336
 #: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
 #: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
-#: ../libpurple/protocols/oscar/oscar.c:6046
+#: ../libpurple/protocols/oscar/oscar.c:6072
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc/chat.c:447
@@ -621,48 +634,52 @@
 #: ../libpurple/protocols/silc10/silc.c:735
 #: ../libpurple/protocols/yahoo/yahoo.c:988
 #: ../libpurple/protocols/yahoo/yahoo.c:3247
-#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:3975
-#: ../pidgin/gtkdialogs.c:723 ../pidgin/gtkdialogs.c:870
-#: ../pidgin/gtkdialogs.c:962 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:4013
+#: ../pidgin/gtkdialogs.c:726 ../pidgin/gtkdialogs.c:864
+#: ../pidgin/gtkdialogs.c:956 ../pidgin/gtkrequest.c:269
 msgid "OK"
 msgstr "OK"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2179 ../finch/gntpounce.c:444 ../pidgin/gtkpounce.c:778
+#: ../finch/gntblist.c:2226 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
 msgid "Options"
 msgstr "�舒�舒仄亠���"
 
-#: ../finch/gntblist.c:2185
+#: ../finch/gntblist.c:2232
 msgid "Send IM..."
 msgstr "��仗�舒于亳�� 仄亞仆仂于亠仆仆仂亠 �仂仂弍�亠仆亳亠..."
 
-#: ../finch/gntblist.c:2189
+#: ../finch/gntblist.c:2236
+msgid "Show empty groups"
+msgstr "�仂从舒亰�于舒�� 仗����亠 亞��仗仗�"
+
+#: ../finch/gntblist.c:2242
 msgid "Show offline buddies"
 msgstr "�仂从舒亰�于舒�� �仂弍亠�亠亟仆亳从仂于 仆亠 于 �亠�亳"
 
-#: ../finch/gntblist.c:2195
+#: ../finch/gntblist.c:2248
 msgid "Sort by status"
 msgstr "弌仂��亳�仂于舒�� 仗仂 ��舒����"
 
-#: ../finch/gntblist.c:2199
+#: ../finch/gntblist.c:2252
 msgid "Sort alphabetically"
 msgstr "弌仂��亳�仂于舒�� 仗仂 舒仍�舒于亳��"
 
-#: ../finch/gntblist.c:2203
+#: ../finch/gntblist.c:2256
 msgid "Sort by log size"
 msgstr "弌仂��亳�仂于舒�� 仗仂 �舒亰仄亠�� 亢��仆舒仍舒"
 
-#: ../finch/gntconn.c:109
+#: ../finch/gntconn.c:110
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:112
+#: ../finch/gntconn.c:113
 #, c-format
 msgid "%s disconnected."
 msgstr "弌仂亠亟亳仆亠仆亳亠 � %s �舒亰仂�于舒仆仂."
 
-#: ../finch/gntconn.c:113
+#: ../finch/gntconn.c:114
 #, c-format
 msgid ""
 "%s\n"
@@ -671,47 +688,43 @@
 "and re-enable the account."
 msgstr ""
 
-#: ../finch/gntconv.c:116
+#: ../finch/gntconv.c:117
 msgid "No such command."
 msgstr "�亠� �舒从仂亶 从仂仄舒仆亟�."
 
-#: ../finch/gntconv.c:120 ../pidgin/gtkconv.c:512
+#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:493
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "弌亳仆�舒从�亳�亠�从舒� 仂�亳弍从舒:  �� 于于亠仍亳 仆亠于亠�仆仂亠 从仂仍亳�亠��于仂 舒�亞�仄亠仆�仂于 亟仍� ��仂亶 "
 "从仂仄舒仆亟�."
 
-#: ../finch/gntconv.c:125 ../pidgin/gtkconv.c:517
+#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:499
 msgid "Your command failed for an unknown reason."
 msgstr "�舒�舒 从仂仄舒仆亟舒 仆亠 弍�仍舒 于�仗仂仍仆亠仆舒 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."
 
-#: ../finch/gntconv.c:130 ../pidgin/gtkconv.c:523
+#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:506
 msgid "That command only works in chats, not IMs."
 msgstr "亅�舒 从仂仄舒仆亟舒 �舒弍仂�舒亠� �仂仍�从仂 于 �舒�舒�, 仆亠 于 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳��."
 
-#: ../finch/gntconv.c:133 ../pidgin/gtkconv.c:526
+#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:509
 msgid "That command only works in IMs, not chats."
 msgstr "亅�舒 从仂仄舒仆亟舒 �舒弍仂�舒亠� �仂仍�从仂 于 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳��, 仆亠 于 �舒�舒�."
 
-#: ../finch/gntconv.c:137 ../pidgin/gtkconv.c:530
+#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:514
 msgid "That command doesn't work on this protocol."
 msgstr "亅�舒 从仂仄舒仆亟舒 仆亠 �舒弍仂�舒亠� � ��亳仄 仗�仂�仂从仂仍仂仄."
 
-#: ../finch/gntconv.c:144
-msgid "Commands are not supported yet. Message was NOT sent."
-msgstr "�仂仄舒仆亟� 仗仂从舒 仆亠 仗仂亟亟亠�亢亳于舒����. 弌仂仂弍�亠仆亳亠 �� 弍�仍仂 仂�仗�舒于仍亠仆仂."
-
-#: ../finch/gntconv.c:230
+#: ../finch/gntconv.c:224
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:253
+#: ../finch/gntconv.c:247
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:258 ../finch/gntconv.c:619
+#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
 #, c-format
 msgid ""
 "\n"
@@ -720,48 +733,48 @@
 "\n"
 "%s 仆舒弍亳�舒亠� �仂仂弍�亠仆亳亠..."
 
-#: ../finch/gntconv.c:277
+#: ../finch/gntconv.c:271
 msgid "You have left this chat."
 msgstr "�� 仗仂从亳仆�仍亳 ��仂� �舒�."
 
-#: ../finch/gntconv.c:353
+#: ../finch/gntconv.c:342
 msgid "Send To"
 msgstr "�亟�亠�舒�"
 
-#: ../finch/gntconv.c:397
+#: ../finch/gntconv.c:386
 msgid "Conversation"
 msgstr "�亠�亠亟舒"
 
-#: ../finch/gntconv.c:403
+#: ../finch/gntconv.c:392
 msgid "Clear Scrollback"
 msgstr "��亳��亳��"
 
-#: ../finch/gntconv.c:407 ../finch/gntprefs.c:178
+#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
 msgid "Show Timestamps"
 msgstr "�仂从舒亰�于舒�� 于�亠仄� �仂仂弍�亠仆亳亶"
 
-#: ../finch/gntconv.c:423
+#: ../finch/gntconv.c:412
 msgid "Add Buddy Pounce..."
 msgstr "�仂弍舒于亳�� 仗�舒于亳仍仂..."
 
-#: ../finch/gntconv.c:586
+#: ../finch/gntconv.c:614
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-REPLY> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:702
+#: ../finch/gntconv.c:735
 msgid "List of users:\n"
 msgstr "弌仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶:\n"
 
-#: ../finch/gntconv.c:847 ../pidgin/gtkconv.c:393
+#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:336
 msgid "Supported debug options are:  version"
 msgstr "�仂亟亟亠�亢亳于舒亠仄�亠 仗舒�舒仄亠��� 仂�仍舒亟从亳:  version"
 
-#: ../finch/gntconv.c:882 ../pidgin/gtkconv.c:429
+#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:385
 msgid "No such command (in this context)."
 msgstr "�亠� �舒从仂亶 从仂仄舒仆亟� (于 ��仂仄 从仂仆�亠从��亠)."
 
-#: ../finch/gntconv.c:885 ../pidgin/gtkconv.c:432
+#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:388
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -769,7 +782,7 @@
 "��仗仂仍�亰�亶�亠 \"/help &lt;从仂仄舒仆亟舒&gt;\" 亟仍� 仗仂仄仂�亳 仗仂 从仂仆从�亠�仆仂亶 从仂仄舒仆亟亠.\n"
 "弌仍亠亟���亳亠 从仂仄舒仆亟� 亟仂���仗仆� 于 ��仂仄 从仂仆�亠从��亠:\n"
 
-#: ../finch/gntconv.c:943 ../pidgin/gtkconv.c:7171
+#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7225
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -777,12 +790,12 @@
 "say &lt;�仂仂弍�亠仆亳亠&gt;:  ��仗�舒于亳�� 仂弍��仆仂亠 �仂仂弍�亠仆亳亠, 从舒从 亠�仍亳 弍� 于� 仆亠 "
 "亳�仗仂仍�亰仂于舒仍亳 从仂仄舒仆亟�."
 
-#: ../finch/gntconv.c:946 ../pidgin/gtkconv.c:7174
+#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7228
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;亟亠亶��于亳亠&gt;:  ��仗�舒于亳�� 亟亠亶��于亳亠 于 ��亳仍亠 IRC �仂弍亠�亠亟仆亳从� 亳仍亳 于 �舒�."
 
-#: ../finch/gntconv.c:949 ../pidgin/gtkconv.c:7177
+#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7231
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
@@ -790,43 +803,43 @@
 "debug &lt;仗舒�舒仄亠��&gt;:  ��仗�舒于亳�� �舒亰仍亳�仆�� 仂�仍舒亟仂�仆�� 亳仆�仂�仄舒�亳� 于 �亠从���� "
 "弍亠�亠亟�."
 
-#: ../finch/gntconv.c:952 ../pidgin/gtkconv.c:7180
+#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7234
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: ��亳��亳�� 仂从仆仂 弍亠�亠亟�."
 
-#: ../finch/gntconv.c:955 ../pidgin/gtkconv.c:7183
+#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7240
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;从仂仄舒仆亟舒&gt;:  �仂仍��亳�� 仗仂仄仂�� 仗仂 从仂仆从�亠�仆仂亶 从仂仄舒仆亟亠."
 
-#: ../finch/gntconv.c:958
+#: ../finch/gntconv.c:991
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  ��于亠��亳 �仗亳�仂从 仗仂仍�亰仂于舒�亠仍亠亶 于 �舒�亠."
 
-#: ../finch/gntconv.c:963
+#: ../finch/gntconv.c:996
 msgid "plugins: Show the plugins window."
 msgstr "plugins: ��于亠��亳 仂从仆仂 仄仂亟�仍亠亶."
 
-#: ../finch/gntconv.c:966
+#: ../finch/gntconv.c:999
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: ��于亠��亳 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于."
 
-#: ../finch/gntconv.c:969
+#: ../finch/gntconv.c:1002
 msgid "accounts: Show the accounts window."
 msgstr "accounts: ��于亠��亳 仂从仆仂 ����仆�� 亰舒仗亳�亠亶."
 
-#: ../finch/gntconv.c:972
+#: ../finch/gntconv.c:1005
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: ��于亠��亳 仂从仆仂 仂�仍舒亟从亳."
 
-#: ../finch/gntconv.c:975
+#: ../finch/gntconv.c:1008
 msgid "prefs: Show the preference window."
 msgstr "prefs: ��于亠��亳 仂从仆仂 仆舒���仂亠从."
 
-#: ../finch/gntconv.c:978
+#: ../finch/gntconv.c:1011
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: ��于亠��亳 仂从仆仂 �仂��舒仆�仆仆�� ��舒���仂于."
 
-#: ../finch/gntdebug.c:230 ../finch/gntui.c:79 ../pidgin/gtkdebug.c:694
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:80 ../pidgin/gtkdebug.c:694
 msgid "Debug Window"
 msgstr "�从仆仂 仂�仍舒亟从亳"
 
@@ -834,15 +847,15 @@
 #. * 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:251 ../pidgin/gtkdebug.c:753
+#: ../finch/gntdebug.c:255 ../pidgin/gtkdebug.c:753
 msgid "Clear"
 msgstr "��亳��亳��"
 
-#: ../finch/gntdebug.c:257
+#: ../finch/gntdebug.c:261
 msgid "Filter: "
 msgstr "个亳仍���: "
 
-#: ../finch/gntdebug.c:261 ../pidgin/gtkdebug.c:762
+#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
 msgid "Pause"
 msgstr "�舒�亰舒"
 
@@ -851,119 +864,120 @@
 msgid "File Transfers - %d%% of %d files"
 msgstr "�亠�亠亟舒�舒 �舒亶仍仂于 - %d%% 亳亰 %d �舒亶仍仂于"
 
-#: ../finch/gntft.c:122 ../finch/gntft.c:194 ../finch/gntui.c:80
-#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:763
+#. Create the window.
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:81
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
 msgid "File Transfers"
 msgstr "�亠�亠亟舒�舒 �舒亶仍仂于"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:644
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
 msgid "Progress"
 msgstr "��仂亞�亠��"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:651
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
 msgid "Filename"
 msgstr "�仄� �舒亶仍舒"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:658
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
 msgid "Size"
 msgstr "�舒亰仄亠�"
 
-#: ../finch/gntft.c:197
+#: ../finch/gntft.c:198
 msgid "Speed"
 msgstr "弌从仂�仂���"
 
-#: ../finch/gntft.c:197 ../pidgin/gtkft.c:665
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
 msgid "Remaining"
 msgstr "���舒仍仂��"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:197 ../finch/gntstatus.c:537 ../finch/gntstatus.c:566
+#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572
 #: ../libpurple/protocols/bonjour/bonjour.c:318
-#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1573
-#: ../libpurple/protocols/gg/gg.c:1581
-#: ../libpurple/protocols/jabber/buddy.c:634
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
+#: ../libpurple/protocols/gg/gg.c:1579
 #: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:673
-#: ../libpurple/protocols/jabber/jabber.c:1220
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:677
+#: ../libpurple/protocols/jabber/jabber.c:1212
 #: ../libpurple/protocols/msn/msn.c:515
 #: ../libpurple/protocols/novell/novell.c:2835
-#: ../libpurple/protocols/oscar/oscar.c:803
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:2658
-#: ../libpurple/protocols/oscar/oscar.c:3769
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3053
-#: ../pidgin/gtkblist.c:3066 ../pidgin/gtkblist.c:3068
-#: ../pidgin/gtksavedstatuses.c:943 ../pidgin/gtksavedstatuses.c:1090
+#: ../libpurple/protocols/oscar/oscar.c:821
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:2672
+#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/sametime/sametime.c:3264
+#: ../libpurple/protocols/sametime/sametime.c:4151
+#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3083 ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
 msgid "Status"
 msgstr "弌�舒���"
 
-#: ../finch/gntft.c:207
+#: ../finch/gntft.c:208
 msgid "Close this window when all transfers finish"
 msgstr "�舒从��于舒�� ��仂 仂从仆仂 仗仂 亰舒于亠��亠仆亳亳 于�亠� 仗亠�亠亟舒�"
 
-#: ../finch/gntft.c:214
+#: ../finch/gntft.c:215
 msgid "Clear finished transfers"
 msgstr "��亳�舒�� 亰舒于亠���仆仆�亠 仗亠�亠亟舒�亳"
 
-#: ../finch/gntft.c:228
+#: ../finch/gntft.c:229
 msgid "Stop"
 msgstr "���舒仆仂于亳��"
 
 #. Close button
-#: ../finch/gntft.c:233 ../finch/gntnotify.c:179 ../finch/gntplugin.c:205
-#: ../finch/gntplugin.c:291 ../finch/gntpounce.c:722 ../finch/gntstatus.c:209
+#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
+#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215
 #: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
-#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2487
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2479
 #: ../pidgin/gtkrequest.c:272
 msgid "Close"
 msgstr "�舒从����"
 
-#: ../finch/gntft.c:299 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:975
+#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
 msgid "Waiting for transfer to begin"
 msgstr "�亢亳亟舒仆亳亠 仆舒�舒仍舒 仗亠�亠亟舒�亳"
 
-#: ../finch/gntft.c:366 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1056
+#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
 msgid "Canceled"
 msgstr "��仄亠仆亠仆仂"
 
-#: ../finch/gntft.c:368 ../pidgin/gtkft.c:1058
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
 msgid "Failed"
 msgstr "�亠 �亟舒仍仂��"
 
-#: ../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
+#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f �亳�/�"
+
+#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1115
 msgid "Finished"
 msgstr "�舒于亠��亠仆仂"
 
-#: ../finch/gntft.c:428 ../libpurple/protocols/msn/session.c:347
+#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
 msgid "Transferring"
 msgstr "�亠�亠亟舒�舒"
 
-#: ../finch/gntnotify.c:162
+#: ../finch/gntnotify.c:164
 msgid "Emails"
 msgstr "�亟�亠�舒 e-mail"
 
-#: ../finch/gntnotify.c:168 ../finch/gntnotify.c:222
+#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224
 msgid "You have mail!"
 msgstr "�舒仄 仗�亳�仍舒 仗仂��舒!"
 
-#: ../finch/gntnotify.c:171 ../libpurple/protocols/jabber/jabber.c:1180
-msgid "From"
-msgstr "��"
-
-#: ../finch/gntnotify.c:171 ../pidgin/gtknotify.c:490
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:489
+msgid "Sender"
+msgstr "��仗�舒于亳�亠仍�"
+
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:496
 msgid "Subject"
 msgstr "丐亠仄舒"
 
-#: ../finch/gntnotify.c:198
+#: ../finch/gntnotify.c:200
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
@@ -971,57 +985,57 @@
 msgstr[1] "%s (%s) 亳仄亠亠� %d 仆仂于�� �仂仂弍�亠仆亳�."
 msgstr[2] "%s (%s) 亳仄亠亠� %d 仆仂于�� �仂仂弍�亠仆亳亶."
 
-#: ../finch/gntnotify.c:222 ../pidgin/gtknotify.c:329
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:335
 msgid "New Mail"
 msgstr "�仂于舒� 仗仂��舒"
 
-#: ../finch/gntnotify.c:287 ../pidgin/gtknotify.c:906
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:915
 #, c-format
 msgid "Info for %s"
 msgstr "�仆�仂�仄舒�亳� 亟仍� %s"
 
-#: ../finch/gntnotify.c:288 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:907
+#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:916
 msgid "Buddy Information"
 msgstr "�仆�仂�仄舒�亳� 仂 �仂弍亠�亠亟仆亳从亠"
 
-#: ../finch/gntnotify.c:366
+#: ../finch/gntnotify.c:376
 msgid "Continue"
 msgstr "��仂亟仂仍亢亳��"
 
-#: ../finch/gntnotify.c:372 ../pidgin/gtkconv.c:1662 ../pidgin/gtkdebug.c:834
+#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1628 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "�仆�仂�仄舒�亳�"
 
-#: ../finch/gntnotify.c:375 ../pidgin/gtkconv.c:1623
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1589
 msgid "IM"
 msgstr "�亞仆仂于亠仆仆仂亠 �仂仂弍�亠仆亳亠"
 
-#: ../finch/gntnotify.c:378
+#: ../finch/gntnotify.c:388
 msgid "Join"
 msgstr "��亳�仂亠亟亳仆亳����"
 
-#: ../finch/gntnotify.c:381 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3474
 msgid "Invite"
 msgstr "��亳亞仍舒�亳��"
 
-#: ../finch/gntnotify.c:384
+#: ../finch/gntnotify.c:394
 msgid "(none)"
 msgstr "(仆亠�)"
 
-#: ../finch/gntplugin.c:73 ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83
 msgid "ERROR"
 msgstr ""
 
-#: ../finch/gntplugin.c:73
+#: ../finch/gntplugin.c:74
 msgid "loading plugin failed"
 msgstr ""
 
-#: ../finch/gntplugin.c:82
+#: ../finch/gntplugin.c:83
 msgid "unloading plugin failed"
 msgstr ""
 
-#: ../finch/gntplugin.c:124
+#: ../finch/gntplugin.c:128
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1038,369 +1052,391 @@
 "�亠弍-�舒亶�: %s\n"
 "�仄� �舒亶仍舒: %s\n"
 
-#: ../finch/gntplugin.c:182
+#: ../finch/gntplugin.c:186
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "�仂亟�仍� 仆亠仂弍�仂亟亳仄仂 亰舒亞��亰亳�� 仗亠�亠亟 亠亞仂 仆舒���仂亶从仂亶."
 
-#: ../finch/gntplugin.c:226
+#: ../finch/gntplugin.c:234
 msgid "No configuration options for this plugin."
 msgstr "亅�仂� 仄仂亟�仍� 仆亠 亳仄亠亠� 仆舒���舒亳于舒亠仄�� 仗舒�舒仄亠��仂于."
 
-#: ../finch/gntplugin.c:249
+#: ../finch/gntplugin.c:259
 msgid "You can (un)load plugins from the following list."
 msgstr "�� 仄仂亢亠�亠 亰舒亞��亢舒��/于�亞��亢舒�� 仄仂亟�仍亳 亳亰 �仍亠亟���亠亞仂 �仗亳�从舒."
 
-#: ../finch/gntplugin.c:296
+#: ../finch/gntplugin.c:314
 msgid "Configure Plugin"
 msgstr "�舒���仂亳�� 仄仂亟�仍�"
 
-#: ../finch/gntplugin.c:352 ../finch/gntplugin.c:359 ../finch/gntprefs.c:245
-#: ../finch/gntui.c:82 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:1992
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+#: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
+#: ../finch/gntui.c:83 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2060
 msgid "Preferences"
 msgstr "�舒���仂亶从亳"
 
-#: ../finch/gntpounce.c:180 ../pidgin/gtkpounce.c:253
+#: ../finch/gntpounce.c:182 ../pidgin/gtkpounce.c:255
 msgid "Please enter a buddy to pounce."
 msgstr "�于亠亟亳�亠 �仂弍亠�亠亟仆亳从舒 亟仍� �仍亠亢亠仆亳�."
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#. Create the window.
+#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "New Buddy Pounce"
 msgstr "�仂于仂亠 仗�舒于亳仍仂"
 
-#: ../finch/gntpounce.c:325 ../pidgin/gtkpounce.c:507
+#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
 msgid "Edit Buddy Pounce"
 msgstr "�亰仄亠仆亳�� 仗�舒于亳仍仂"
 
-#: ../finch/gntpounce.c:330
+#: ../finch/gntpounce.c:332
 msgid "Pounce Who"
 msgstr "�舒 从亠仄 �仍亠亟亳��"
 
 #. Account:
-#: ../finch/gntpounce.c:333 ../finch/gntstatus.c:446
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452
 msgid "Account:"
 msgstr "丕���仆舒� 亰舒仗亳��:"
 
-#: ../finch/gntpounce.c:355
+#: ../finch/gntpounce.c:357
 msgid "Buddy name:"
 msgstr "�仄� �仂弍亠�亠亟仆亳从舒:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:371 ../pidgin/gtkpounce.c:577
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586
 msgid "Pounce When Buddy..."
 msgstr "��仗仂仍仆���, 从仂亞亟舒 �仂弍亠�亠亟仆亳从..."
 
-#: ../finch/gntpounce.c:373
+#: ../finch/gntpounce.c:375
 msgid "Signs on"
 msgstr "��仂亟亳�"
 
-#: ../finch/gntpounce.c:374
+#: ../finch/gntpounce.c:376
 msgid "Signs off"
 msgstr "���仂亟亳�"
 
-#: ../finch/gntpounce.c:375
-msgid "Goes away"
-msgstr "���仂亟亳�"
-
-#: ../finch/gntpounce.c:376
-msgid "Returns from away"
-msgstr "�仂亰于�舒�舒亠���"
-
 #: ../finch/gntpounce.c:377
-msgid "Becomes idle"
-msgstr "�舒�亳仆舒亠� 弍亠亰亟亠亶��于仂于舒��"
+msgid "Goes away"
+msgstr "���仂亟亳�"
 
 #: ../finch/gntpounce.c:378
+msgid "Returns from away"
+msgstr "�仂亰于�舒�舒亠���"
+
+#: ../finch/gntpounce.c:379
+msgid "Becomes idle"
+msgstr "�舒�亳仆舒亠� 弍亠亰亟亠亶��于仂于舒��"
+
+#: ../finch/gntpounce.c:380
 msgid "Is no longer idle"
 msgstr "�亠�亠��舒�� 弍亠亰亟亠亶��于仂于舒��"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:381
 msgid "Starts typing"
 msgstr "�舒�亳仆舒亠� 仆舒弍仂� �仂仂弍�亠仆亳�"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:382
 msgid "Pauses while typing"
 msgstr "��亳仂��舒仆舒于仍亳于舒亠� 仆舒弍仂� �仂仂弍�亠仆亳�"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:383
 msgid "Stops typing"
 msgstr "��亠从�舒�舒亠� 仆舒弍仂� �仂仂弍�亠仆亳�"
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:384
 msgid "Sends a message"
 msgstr "��仗�舒于仍�亠� �仂仂弍�亠仆亳亠"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:411 ../pidgin/gtkpounce.c:638
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647
 msgid "Action"
 msgstr "�亠亶��于亳亠"
 
-#: ../finch/gntpounce.c:413
+#: ../finch/gntpounce.c:415
 msgid "Open an IM window"
 msgstr "��从���� 仂从仆仂 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶"
 
-#: ../finch/gntpounce.c:414
-msgid "Pop up a notification"
-msgstr "��于亠��亳 �于亠亟仂仄仍亠仆亳亠"
-
-#: ../finch/gntpounce.c:415
-msgid "Send a message"
-msgstr "��仗�舒于亳�� �仂仂弍�亠仆亳亠"
-
 #: ../finch/gntpounce.c:416
+msgid "Pop up a notification"
+msgstr "��于亠��亳 �于亠亟仂仄仍亠仆亳亠"
+
+#: ../finch/gntpounce.c:417
+msgid "Send a message"
+msgstr "��仗�舒于亳�� �仂仂弍�亠仆亳亠"
+
+#: ../finch/gntpounce.c:418
 msgid "Execute a command"
 msgstr "��仗仂仍仆亳�� 从仂仄舒仆亟�"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:419
 msgid "Play a sound"
 msgstr "�仂�仗�仂亳亰于亠��亳 亰于�从"
 
-#: ../finch/gntpounce.c:445
+#: ../finch/gntpounce.c:447
 msgid "Pounce only when my status is not available"
 msgstr "��仗仂仍仆��� �仂仍�从仂 仗�亳 ��舒���亠, 仂�仍亳�仆仂仄 仂� \"�仂���仗亠仆\""
 
-#: ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:1282
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295
 msgid "Recurring"
 msgstr "�仂于�仂�亠仆亳亠"
 
-#: ../finch/gntpounce.c:649 ../pidgin/gtkpounce.c:1097
+#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 �亟舒仍亳�� 仗�舒于亳仍仂 %s 亟仍� %s?"
 
-#: ../finch/gntpounce.c:682 ../finch/gntui.c:78 ../pidgin/gtkpounce.c:1329
+#: ../finch/gntpounce.c:685 ../finch/gntui.c:79 ../pidgin/gtkpounce.c:1339
 msgid "Buddy Pounces"
 msgstr "��舒于亳仍舒"
 
-#: ../finch/gntpounce.c:794 ../pidgin/gtkpounce.c:1456
+#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s 仆舒�舒仍 仆舒弍仂� �仂仂弍�亠仆亳� 亟仍� 于舒� (%s)"
 
-#: ../finch/gntpounce.c:796 ../pidgin/gtkpounce.c:1458
+#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s 仗�亳仂��舒仆仂于亳仍 仆舒弍仂� �仂仂弍�亠仆亳� 亟仍� 于舒� (%s)"
 
-#: ../finch/gntpounce.c:798 ../pidgin/gtkpounce.c:1460
+#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s 于 �亠�亳 (%s)"
 
-#: ../finch/gntpounce.c:800 ../pidgin/gtkpounce.c:1462
+#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s 仗亠�亠��舒仍 弍亠亰亟亠亶��于仂于舒�� (%s)"
 
-#: ../finch/gntpounce.c:802 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s 于亠�仆�仍�� (%s)"
 
-#: ../finch/gntpounce.c:804 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s 仗�亠从�舒�亳仍 仆舒弍仂� �仂仂弍�亠仆亳� 亟仍� 于舒� (%s)"
 
-#: ../finch/gntpounce.c:806 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s 仆亠 于 �亠�亳 (%s)"
 
-#: ../finch/gntpounce.c:808 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s 仆舒�舒仍 弍亠亰亟亠亶��于仂于舒�� (%s)"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s 仂�仂��仍 (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s 仂�仗�舒于亳仍 于舒仄 �仂仂弍�亠仆亳亠 (%s)"
 
-#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1475
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
 msgid "Unknown pounce event. Please report this!"
 msgstr "�亠亳亰于亠��仆仂亠 �仂弍��亳亠 �仍亠亢亠仆亳�. 弌仂仂弍�亳�亠 仂弍 ��仂仄!"
 
-#: ../finch/gntprefs.c:79
+#: ../finch/gntprefs.c:91
 msgid "Based on keyboard use"
 msgstr "��仆仂于�于舒��� 仆舒 亳�仗仂仍�亰仂于舒仆亳亳 从仍舒于亳舒����"
 
-#: ../finch/gntprefs.c:81 ../pidgin/gtkprefs.c:1853
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1923
 msgid "From last sent message"
 msgstr "弌 仄仂仄亠仆�舒 仗仂�仍亠亟仆亠亶 仂�仗�舒于从亳 �仂仂弍�亠仆亳�"
 
-#: ../finch/gntprefs.c:83 ../pidgin/gtkprefs.c:820 ../pidgin/gtkprefs.c:829
-#: ../pidgin/gtkprefs.c:1852 ../pidgin/gtkprefs.c:1866
+#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:1922 ../pidgin/gtkprefs.c:1936
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:337
 msgid "Never"
 msgstr "�亳从仂亞亟舒"
 
-#: ../finch/gntprefs.c:171
+#: ../finch/gntprefs.c:183
 msgid "Show Idle Time"
 msgstr "�仂从舒亰�于舒�� 于�亠仄� 弍亠亰亟亠亶��于亳�"
 
-#: ../finch/gntprefs.c:172
+#: ../finch/gntprefs.c:184
 msgid "Show Offline Buddies"
 msgstr "�仂从舒亰�于舒�� �仂弍亠�亠亟仆亳从仂于 仆亠 于 �亠�亳"
 
-#: ../finch/gntprefs.c:179
+#: ../finch/gntprefs.c:191
 msgid "Notify buddies when you are typing"
 msgstr "丕于亠亟仂仄仍��� �仂弍亠�亠亟仆亳从仂于 仂 仆舒弍仂�亠 �仂仂弍�亠仆亳�"
 
-#: ../finch/gntprefs.c:185
+#: ../finch/gntprefs.c:197
 msgid "Log format"
 msgstr "个仂�仄舒� 亢��仆舒仍舒"
 
-#: ../finch/gntprefs.c:186
+#: ../finch/gntprefs.c:198
 msgid "Log IMs"
 msgstr "�舒仗亳��于舒�� 仄亞仆仂于亠仆仆�亠 �仂仂弍�亠仆亳�"
 
-#: ../finch/gntprefs.c:187
+#: ../finch/gntprefs.c:199
 msgid "Log chats"
 msgstr "�舒仗亳��于舒�� �舒��"
 
-#: ../finch/gntprefs.c:188
+#: ../finch/gntprefs.c:200
 msgid "Log status change events"
 msgstr "�舒仗亳��于舒�� 亳亰仄亠仆亠仆亳� ��舒���舒"
 
+#: ../finch/gntprefs.c:206
+msgid "Report Idle time"
+msgstr "弌仂仂弍�舒�� 于�亠仄� 弍亠亰亟亠亶��于亳�"
+
+#: ../finch/gntprefs.c:207
+msgid "Change status when idle"
+msgstr "�亠仆��� ��舒��� 仗�亳 弍亠亰亟亠亶��于亳亳"
+
+#: ../finch/gntprefs.c:208
+msgid "Minutes before changing status"
+msgstr "�亳仆�� 亟仂 亳亰仄亠仆亠仆亳� ��舒���舒"
+
+#: ../finch/gntprefs.c:209
+msgid "Change status to"
+msgstr "�亠仆��� ��舒��� 仆舒"
+
 #. Conversations
-#: ../finch/gntprefs.c:241 ../pidgin/gtkprefs.c:915 ../pidgin/gtkprefs.c:1956
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2026
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "�亠�亠亟�"
 
-#: ../finch/gntprefs.c:242 ../pidgin/gtkprefs.c:1392 ../pidgin/gtkprefs.c:1967
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1462 ../pidgin/gtkprefs.c:2037
 msgid "Logging"
 msgstr "���仆舒仍�"
 
-#: ../finch/gntrequest.c:532
+#: ../finch/gntrequest.c:563
 msgid "Not implemented yet."
 msgstr "��� 仆亠 �亠舒仍亳亰仂于舒仆仂."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1530
-#: ../pidgin/gtkrequest.c:1576
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1531
+#: ../pidgin/gtkrequest.c:1577
 msgid "Save File..."
 msgstr "弌仂��舒仆亳�� �舒亶仍..."
 
-#: ../finch/gntrequest.c:597 ../pidgin/gtkrequest.c:1531
-#: ../pidgin/gtkrequest.c:1577
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1532
+#: ../pidgin/gtkrequest.c:1578
 msgid "Open File..."
 msgstr "��从���� �舒亶仍..."
 
-#: ../finch/gntstatus.c:135
+#: ../finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 �亟舒仍亳�� \"%s\""
 
-#: ../finch/gntstatus.c:138
+#: ../finch/gntstatus.c:140
 msgid "Delete Status"
 msgstr "丕亟舒仍亳�� ��舒���"
 
-#: ../finch/gntstatus.c:170 ../pidgin/gtksavedstatuses.c:557
+#: ../finch/gntstatus.c:175 ../pidgin/gtksavedstatuses.c:596
 msgid "Saved Statuses"
 msgstr "弌仂��舒仆�仆仆�亠 ��舒����"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:529
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535
 #: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:935
+#: ../libpurple/protocols/jabber/buddy.c:973
 #: ../libpurple/protocols/novell/novell.c:1484
-#: ../pidgin/gtksavedstatuses.c:464
+#: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
 msgstr "�舒亰于舒仆亳亠"
 
-#: ../finch/gntstatus.c:177 ../pidgin/gtksavedstatuses.c:479
+#: ../finch/gntstatus.c:182 ../pidgin/gtksavedstatuses.c:514
 msgid "Type"
 msgstr "丐亳仗"
 
-#: ../finch/gntstatus.c:177 ../finch/gntstatus.c:554 ../finch/gntstatus.c:566
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
 #: ../libpurple/protocols/bonjour/bonjour.c:247
 #: ../libpurple/protocols/bonjour/bonjour.c:254
 #: ../libpurple/protocols/bonjour/bonjour.c:320
-#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1594 ../libpurple/protocols/gg/gg.c:1604
-#: ../libpurple/protocols/gg/gg.c:1610 ../libpurple/protocols/gg/gg.c:1619
-#: ../libpurple/protocols/gg/gg.c:1624 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1252
-#: ../libpurple/protocols/jabber/jabber.c:1262
-#: ../libpurple/protocols/jabber/jabber.c:1272
-#: ../libpurple/protocols/jabber/jabber.c:1282
-#: ../libpurple/protocols/jabber/jabber.c:1292
-#: ../libpurple/protocols/jabber/jabber.c:1304
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
+#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
+#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
+#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1296
 #: ../libpurple/protocols/novell/novell.c:2838
 #: ../libpurple/protocols/novell/novell.c:2941
 #: ../libpurple/protocols/novell/novell.c:2947
 #: ../libpurple/protocols/novell/novell.c:2953
-#: ../libpurple/protocols/oscar/oscar.c:5507
-#: ../libpurple/protocols/oscar/oscar.c:5725
-#: ../libpurple/protocols/oscar/oscar.c:5739
-#: ../libpurple/protocols/oscar/oscar.c:5755
-#: ../libpurple/protocols/oscar/oscar.c:5762
-#: ../libpurple/protocols/oscar/oscar.c:5769
-#: ../libpurple/protocols/sametime/sametime.c:3286
-#: ../libpurple/protocols/sametime/sametime.c:3292
-#: ../libpurple/protocols/sametime/sametime.c:3298
-#: ../libpurple/protocols/sametime/sametime.c:3377
+#: ../libpurple/protocols/oscar/oscar.c:5533
+#: ../libpurple/protocols/oscar/oscar.c:5751
+#: ../libpurple/protocols/oscar/oscar.c:5765
+#: ../libpurple/protocols/oscar/oscar.c:5781
+#: ../libpurple/protocols/oscar/oscar.c:5788
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../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:1551
 #: ../libpurple/protocols/silc10/buddy.c:1551
 #: ../libpurple/protocols/simple/simple.c:246
 #: ../libpurple/protocols/yahoo/yahoo.c:3494
 #: ../libpurple/protocols/yahoo/yahoo.c:3500
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:490 ../pidgin/gtksavedstatuses.c:954
+#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "弌仂仂弍�亠仆亳亠"
 
 #. Use
-#: ../finch/gntstatus.c:189 ../finch/gntstatus.c:583
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589
 msgid "Use"
 msgstr "��亳仄亠仆亳��"
 
-#: ../finch/gntstatus.c:294
+#: ../finch/gntstatus.c:300
 msgid "Invalid title"
 msgstr "�亠于亠�仆仂亠 仆舒亰于舒仆亳亠"
 
-#: ../finch/gntstatus.c:295
+#: ../finch/gntstatus.c:301
 msgid "Please enter a non-empty title for the status."
 msgstr "�于亠亟亳�亠 仆亠仗���仂亠 仆舒亰于舒仆亳亠 亟仍� ��舒���舒."
 
-#: ../finch/gntstatus.c:302
+#: ../finch/gntstatus.c:308
 msgid "Duplicate title"
 msgstr "�仂于�仂����亠亠�� 仆舒亰于舒仆亳亠"
 
-#: ../finch/gntstatus.c:303
+#: ../finch/gntstatus.c:309
 msgid "Please enter a different title for the status."
 msgstr "�于亠亟亳�亠 亟��亞仂亠 仆舒亰于舒仆亳亠 亟仍� ��舒���舒."
 
-#: ../finch/gntstatus.c:443
+#: ../finch/gntstatus.c:449
 msgid "Substatus"
 msgstr "�仂亟��舒���"
 
-#: ../finch/gntstatus.c:454 ../pidgin/gtkft.c:698
+#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "弌�舒���:"
 
-#: ../finch/gntstatus.c:469
+#: ../finch/gntstatus.c:475
 msgid "Message:"
 msgstr "弌仂仂弍�亠仆亳亠:"
 
-#: ../finch/gntstatus.c:518
+#: ../finch/gntstatus.c:524
 msgid "Edit Status"
 msgstr "�亰仄亠仆亳�� ��舒���"
 
-#: ../finch/gntstatus.c:560
+#: ../finch/gntstatus.c:566
 msgid "Use different status for following accounts"
 msgstr "��仗仂仍�亰仂于舒�� 仂�仍亳�舒��亳亶�� ��舒��� 亟仍� �仍亠亟���亳� ����仆�� 亰舒仗亳�亠亶"
 
 #. Save & Use
-#: ../finch/gntstatus.c:594
+#: ../finch/gntstatus.c:600
 msgid "Save & Use"
 msgstr "弌仂��舒仆亳�� 亳 仗�亳仄亠仆亳��"
 
-#: ../finch/gntui.c:83
+#: ../finch/gntui.c:84
 msgid "Statuses"
 msgstr "弌�舒����"
 
@@ -1559,12 +1595,12 @@
 msgstr "�������于�亠� 仄仂亟�仍� 仗�仂�仂从仂仍舒 亟仍� %s"
 
 #: ../libpurple/account.c:1012 ../libpurple/connection.c:107
-#: ../pidgin/gtkblist.c:3972
+#: ../pidgin/gtkblist.c:4010
 msgid "Connection Error"
 msgstr "��亳弍从舒 �仂亠亟亳仆亠仆亳�"
 
 #: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
-#: ../libpurple/protocols/jabber/jabber.c:1342
+#: ../libpurple/protocols/jabber/jabber.c:1334
 msgid "New passwords do not match."
 msgstr "�仂于�亠 仗舒�仂仍亳 仆亠 �仂于仗舒亟舒��."
 
@@ -1603,22 +1639,22 @@
 msgstr "丕��舒仆仂于亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳�"
 
 #: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
-#: ../libpurple/protocols/jabber/buddy.c:638
-#: ../libpurple/protocols/jabber/buddy.c:1424
-#: ../libpurple/protocols/jabber/buddy.c:1441
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:1462
+#: ../libpurple/protocols/jabber/buddy.c:1479
 #: ../libpurple/protocols/novell/novell.c:2831
 #: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
 msgid "Unknown"
 msgstr "�亠亳亰于亠��仆仂"
 
-#: ../libpurple/blist.c:523 ../libpurple/blist.c:1291
-#: ../libpurple/blist.c:1520 ../libpurple/protocols/jabber/roster.c:68
-#: ../pidgin/gtkblist.c:5251 ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
+#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5310 ../pidgin/plugins/gevolution/gevolution.c:96
 #: ../pidgin/plugins/gevolution/gevo-util.c:64
 msgid "Buddies"
 msgstr "弌仂弍亠�亠亟仆亳从亳"
 
-#: ../libpurple/blist.c:550
+#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "�仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
 
@@ -1637,84 +1673,84 @@
 msgstr "+++ %s 于��亠仍"
 
 #: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:1712
+#: ../libpurple/protocols/jabber/buddy.c:1750
 #: ../libpurple/protocols/msn/servconn.c:139
 #: ../libpurple/protocols/msn/session.c:322
 msgid "Unknown error"
 msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒"
 
-#: ../libpurple/conversation.c:165
+#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠: 弌仂仂弍�亠仆亳亠 �仍亳�从仂仄 于亠仍亳从仂."
 
-#: ../libpurple/conversation.c:168 ../libpurple/conversation.c:181
+#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠 亟仍� %s."
 
-#: ../libpurple/conversation.c:169
+#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "弌仂仂弍�亠仆亳亠 �仍亳�从仂仄 于亠仍亳从仂."
 
-#: ../libpurple/conversation.c:178 ../libpurple/protocols/bonjour/jabber.c:283
-#: ../libpurple/protocols/bonjour/jabber.c:325
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:284
+#: ../libpurple/protocols/bonjour/jabber.c:326
 msgid "Unable to send message."
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠."
 
-#: ../libpurple/conversation.c:1164
+#: ../libpurple/conversation.c:1169
 msgid "Send Message"
 msgstr "��仗�舒于亳�� �仂仂弍�亠仆亳亠"
 
-#: ../libpurple/conversation.c:1167
+#: ../libpurple/conversation.c:1172
 msgid "_Send Message"
 msgstr "_��仗�舒于亳�� �仂仂弍�亠仆亳亠"
 
-#: ../libpurple/conversation.c:1572
+#: ../libpurple/conversation.c:1578
 #, c-format
 msgid "%s entered the room."
 msgstr "%s 于仂��仍 于 从仂仄仆舒��."
 
-#: ../libpurple/conversation.c:1575
+#: ../libpurple/conversation.c:1581
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] 于仂��仍 于 从仂仄仆舒��."
 
-#: ../libpurple/conversation.c:1682
+#: ../libpurple/conversation.c:1691
 #, c-format
 msgid "You are now known as %s"
 msgstr "�� �亠仗亠�� 亳亰于亠��仆� 从舒从 %s"
 
-#: ../libpurple/conversation.c:1702
+#: ../libpurple/conversation.c:1711
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s �亠仗亠�� 亳亰于亠��亠仆 从舒从 %s"
 
-#: ../libpurple/conversation.c:1775
+#: ../libpurple/conversation.c:1786
 #, c-format
 msgid "%s left the room."
 msgstr "%s 于��亠仍 亳亰 从仂仄仆舒��."
 
-#: ../libpurple/conversation.c:1778
+#: ../libpurple/conversation.c:1789
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s 于��亠仍 亳亰 从仂仄仆舒�� (%s)."
 
-#: ../libpurple/dbus-server.c:578
+#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "�亠 �亟舒仍仂�� 仗仂仍��亳�� �仂亠亟亳仆亠仆亳亠: %s"
 
-#: ../libpurple/dbus-server.c:590
+#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "�亠 �亟舒仍仂�� 仗仂仍��亳�� 亳仄�: %s"
 
-#: ../libpurple/dbus-server.c:603
+#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "�亠 �亟舒仍仂�� 仗仂仍��亳�� 亳仄� �亠�于亠�舒: %s"
 
-#: ../libpurple/dbus-server.h:83
+#: ../libpurple/dbus-server.h:84
 msgid "Purple's D-BUS server is not running for the reason listed below"
 msgstr ""
 
@@ -1767,7 +1803,7 @@
 msgid "Unknown reason"
 msgstr "��亳�亳仆舒 仆亠亳亰于亠��仆舒"
 
-#: ../libpurple/ft.c:204
+#: ../libpurple/ft.c:207
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -1776,7 +1812,7 @@
 "��亳弍从舒 ��亠仆亳� %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:208
+#: ../libpurple/ft.c:211
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -1785,7 +1821,7 @@
 "��亳弍从舒 亰舒仗亳�亳 %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:212
+#: ../libpurple/ft.c:215
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -1794,39 +1830,39 @@
 "��亳弍从舒 亟仂���仗舒 %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:248
+#: ../libpurple/ft.c:251
 msgid "Directory is not writable."
 msgstr "�舒�舒仍仂亞 仆亠亟仂���仗亠仆 亟仍� 亰舒仗亳�亳."
 
-#: ../libpurple/ft.c:263
+#: ../libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
 msgstr "�亠仍�亰� 仂�仗�舒于亳�� �舒亶仍 �舒亰仄亠�仂仄 0 弍舒亶�."
 
-#: ../libpurple/ft.c:273
+#: ../libpurple/ft.c:276
 msgid "Cannot send a directory."
 msgstr "�亠仍�亰� 仂�仗�舒于亳�� 从舒�舒仍仂亞."
 
-#: ../libpurple/ft.c:282
+#: ../libpurple/ft.c:285
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 仆亠 �于仍�亠��� 仂弍��仆�仄 �舒亶仍仂仄. �亠 弍�亟亠� 仗亠�亠亰舒仗亳�舒仆.\n"
 
-#: ../libpurple/ft.c:342
+#: ../libpurple/ft.c:345
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s �仂�亠� 仂�仗�舒于亳�� 于舒仄 %s (%s)"
 
-#: ../libpurple/ft.c:349
+#: ../libpurple/ft.c:352
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s �仂�亠� 仂�仗�舒于亳�� 于舒仄 �舒亶仍"
 
-#: ../libpurple/ft.c:392
+#: ../libpurple/ft.c:395
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "丕亟仂于仍亠�于仂�亳�� 亰舒仗�仂� 仗亠�亠亟舒�亳 �舒亶仍仂于 仂� %s?"
 
-#: ../libpurple/ft.c:396
+#: ../libpurple/ft.c:399
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -1837,60 +1873,60 @@
 "丕亟舒仍�仆仆�亶 �亰亠仍: %s\n"
 "丕亟舒仍�仆仆�亶 仗仂��: %d"
 
-#: ../libpurple/ft.c:431
+#: ../libpurple/ft.c:434
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s 仗�亠亟仍舒亞舒亠� 仂�仗�舒于从� �舒亶仍舒 %s"
 
-#: ../libpurple/ft.c:483
+#: ../libpurple/ft.c:486
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 仆亠 �于仍�亠��� 亟仂仗���亳仄�仄 亳仄亠仆亠仄 �舒亶仍舒.\n"
 
-#: ../libpurple/ft.c:504
+#: ../libpurple/ft.c:507
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "��亠亟仍仂亢亠仆亳亠 仂�仗�舒于从亳 %s 亟仍� %s"
 
-#: ../libpurple/ft.c:516
+#: ../libpurple/ft.c:519
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "�舒仗��从 仗亠�亠亟舒�亳 %s 仂� %s"
 
-#: ../libpurple/ft.c:670
+#: ../libpurple/ft.c:680
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "�亠�亠亟舒�舒 �舒亶仍舒 %s 亰舒于亠��亠仆舒"
 
-#: ../libpurple/ft.c:673
+#: ../libpurple/ft.c:683
 msgid "File transfer complete"
 msgstr "�亠�亠亟舒�舒 �舒亶仍仂于 亰舒于亠��亠仆舒"
 
-#: ../libpurple/ft.c:1091
+#: ../libpurple/ft.c:1101
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "�� 仂�仄亠仆亳仍亳 仗亠�亠亟舒�� %s"
 
-#: ../libpurple/ft.c:1096
+#: ../libpurple/ft.c:1106
 msgid "File transfer cancelled"
 msgstr "�亠�亠亟舒�舒 �舒亶仍仂于 仂�仄亠仆亠仆舒"
 
-#: ../libpurple/ft.c:1154
+#: ../libpurple/ft.c:1164
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s 仂�仄亠仆亳仍 仗亠�亠亟舒�� %s"
 
-#: ../libpurple/ft.c:1159
+#: ../libpurple/ft.c:1169
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s 仂�仄亠仆亳仍 仗亠�亠亟舒�� �舒亶仍仂于"
 
-#: ../libpurple/ft.c:1216
+#: ../libpurple/ft.c:1226
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "�亠 �亟舒仍仂�� 仗�仂亳亰于亠��亳 仗亠�亠亟舒�� �舒亶仍仂于 亟仍� %s."
 
-#: ../libpurple/ft.c:1218
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "�亠 �亟舒仍仂�� 仗�仂亳亰于亠��亳 仗亠�亠亟舒�� �舒亶仍仂于 仂� %s."
@@ -2049,33 +2085,33 @@
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "�仂仍亢仆舒 仍亳 �从舒亰舒仆仆舒� 从仂仄舒仆亟舒 仂弍�舒弍舒��于舒�� \"ymsgr\" URL"
 
-#: ../libpurple/log.c:181
+#: ../libpurple/log.c:182
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr ""
 "<b><font color=\"red\">弌仍�亢弍舒 于亠亟亠仆亳� 亢��仆舒仍舒 仆亠 亳仄亠亠� ��仆从�亳亳 ��亠仆亳�</"
 "font></b>"
 
-#: ../libpurple/log.c:593
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:607
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "��仂��仂亶 �亠从��"
 
-#: ../libpurple/log.c:621
+#: ../libpurple/log.c:625
 msgid "Old flat format"
 msgstr "弌�舒��亶 仗仍仂�从亳亶 �仂�仄舒�"
 
-#: ../libpurple/log.c:732
+#: ../libpurple/log.c:837
 msgid "Logging of this conversation failed."
 msgstr "�亠 �亟舒仍仂�� 于�仗仂仍仆亳�� 于亠亟亠仆亳亠 亢��仆舒仍舒 ��仂亶 弍亠�亠亟�."
 
-#: ../libpurple/log.c:1175
+#: ../libpurple/log.c:1280
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1251
+#: ../libpurple/log.c:1364
 #, c-format
 msgid ""
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2084,7 +2120,7 @@
 "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1253
+#: ../libpurple/log.c:1366
 #, c-format
 msgid ""
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
@@ -2093,16 +2129,16 @@
 "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
 "REPLY&gt;:</b></font> %s<br/>\n"
 
-#: ../libpurple/log.c:1311 ../libpurple/log.c:1444
+#: ../libpurple/log.c:1424 ../libpurple/log.c:1557
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>�亠 �亟舒���� 仆舒亶�亳 仗��� 从 亢��仆舒仍�!</b></font>"
 
-#: ../libpurple/log.c:1323 ../libpurple/log.c:1453
+#: ../libpurple/log.c:1436 ../libpurple/log.c:1566
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>�亠 �亟舒仍仂�� 仗�仂�亳�舒�� �舒亶仍: %s</b></font>"
 
-#: ../libpurple/log.c:1385
+#: ../libpurple/log.c:1498
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-REPLY>: %s\n"
@@ -2195,13 +2231,13 @@
 
 #: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
 #: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
-#: ../libpurple/protocols/oscar/oscar.c:1440
-#: ../libpurple/protocols/oscar/oscar.c:2233
-#: ../libpurple/protocols/oscar/oscar.c:2280
-#: ../libpurple/protocols/oscar/oscar.c:5839
-#: ../libpurple/protocols/oscar/oscar.c:5894
-#: ../libpurple/protocols/oscar/oscar.c:6120
-#: ../libpurple/protocols/oscar/oscar.c:6190 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1454
+#: ../libpurple/protocols/oscar/oscar.c:2247
+#: ../libpurple/protocols/oscar/oscar.c:2294
+#: ../libpurple/protocols/oscar/oscar.c:5865
+#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1387
 #: ../libpurple/request.h:1397
 msgid "_Cancel"
 msgstr "�_�仄亠仆亳��"
@@ -2218,12 +2254,12 @@
 msgid "Auto Reject"
 msgstr "��于亠�亞仆��� 舒于�仂仄舒�亳�亠�从亳"
 
-#: ../libpurple/plugins/autoaccept.c:184
+#: ../libpurple/plugins/autoaccept.c:185
 msgid "Autoaccept File Transfers..."
 msgstr "�于�仂仄舒�亳�亠�从亳亶 仗�亳�仄 �舒亶仍仂于..."
 
 #. XXX: Is there a better way than this? There really should be.
-#: ../libpurple/plugins/autoaccept.c:214
+#: ../libpurple/plugins/autoaccept.c:215
 msgid ""
 "Path to save the files in\n"
 "(Please provide the full path)"
@@ -2231,11 +2267,11 @@
 "弌仂��舒仆��� �舒亶仍� 于\n"
 "(�从舒亢亳�亠 仗仂仍仆�亶 仗���)"
 
-#: ../libpurple/plugins/autoaccept.c:219
+#: ../libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
 msgstr "��于亠�亞舒�� 舒于�仂仄舒�亳�亠�从亳 仂� 仗仂仍�亰仂于舒�亠仍亠亶 仆亠 亳亰 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../libpurple/plugins/autoaccept.c:223
+#: ../libpurple/plugins/autoaccept.c:224
 msgid ""
 "Notify with a popup when an autoaccepted file transfer is complete\n"
 "(only when there's no conversation with the sender)"
@@ -2253,7 +2289,7 @@
 msgid "Enter your notes below..."
 msgstr "�亳亢亠 于于亠亟亳�亠 于舒�亳 亰舒仄亠�从亳..."
 
-#: ../libpurple/plugins/buddynote.c:62
+#: ../libpurple/plugins/buddynote.c:65
 msgid "Edit Notes..."
 msgstr "�亰仄亠仆亳�� 亰舒仄亠�从亳..."
 
@@ -2265,18 +2301,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:87
+#: ../libpurple/plugins/buddynote.c:90
 msgid "Buddy Notes"
 msgstr "�舒仄亠�从亳 仂 �仂弍亠�亠亟仆亳从舒�"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:89
+#: ../libpurple/plugins/buddynote.c:92
 msgid "Store notes on particular buddies."
 msgstr "弌仂��舒仆�亠� 亰舒仄亠�从亳 仂弍 仂�亟亠仍�仆�� �仂弍亠�亠亟仆亳从舒�."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:90
+#: ../libpurple/plugins/buddynote.c:93
 msgid "Adds the option to store notes for buddies on your buddy list."
 msgstr ""
 "�仂弍舒于仍�亠� 于仂亰仄仂亢仆仂��� �仂��舒仆亠仆亳� 亰舒仄亠�仂从 亟仍� �仂弍亠�亠亟仆亳从仂于 于 �仗亳�从亠 "
@@ -2469,7 +2505,7 @@
 #. * 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.
-#: ../libpurple/plugins/log_reader.c:497
+#: ../libpurple/plugins/log_reader.c:492
 msgid "(UTC)"
 msgstr "(UTC)"
 
@@ -2514,58 +2550,66 @@
 #. 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.
-#: ../libpurple/plugins/log_reader.c:1989
-#: ../libpurple/plugins/log_reader.c:2098
+#: ../libpurple/plugins/log_reader.c:2343
+#: ../libpurple/plugins/log_reader.c:2466
 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.
-#: ../libpurple/plugins/log_reader.c:2002
-#: ../libpurple/plugins/log_reader.c:2103
+#: ../libpurple/plugins/log_reader.c:2356
+#: ../libpurple/plugins/log_reader.c:2471
 msgid "Fire"
 msgstr "Fire"
 
 #. 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.
-#: ../libpurple/plugins/log_reader.c:2014
-#: ../libpurple/plugins/log_reader.c:2107
+#: ../libpurple/plugins/log_reader.c:2368
+#: ../libpurple/plugins/log_reader.c:2475
 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.
-#: ../libpurple/plugins/log_reader.c:2027
-#: ../libpurple/plugins/log_reader.c:2112
+#: ../libpurple/plugins/log_reader.c:2382
+#: ../libpurple/plugins/log_reader.c:2480
+msgid "QIP"
+msgstr ""
+
+#. 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.
+#: ../libpurple/plugins/log_reader.c:2394
+#: ../libpurple/plugins/log_reader.c:2484
 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.
-#: ../libpurple/plugins/log_reader.c:2039
-#: ../libpurple/plugins/log_reader.c:2116
+#: ../libpurple/plugins/log_reader.c:2406
+#: ../libpurple/plugins/log_reader.c:2488
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2080
+#: ../libpurple/plugins/log_reader.c:2448
 msgid "General Log Reading Configuration"
 msgstr "��仆仂于仆�亠 仆舒���仂亶从亳 �亳��亠仄� ��亠仆亳� 亢��仆舒仍仂于"
 
-#: ../libpurple/plugins/log_reader.c:2084
+#: ../libpurple/plugins/log_reader.c:2452
 msgid "Fast size calculations"
 msgstr "�����仂亠 于��亳�仍亠仆亳亠 �舒亰仄亠�舒"
 
-#: ../libpurple/plugins/log_reader.c:2088
+#: ../libpurple/plugins/log_reader.c:2456
 msgid "Use name heuristics"
 msgstr ""
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2094
+#: ../libpurple/plugins/log_reader.c:2462
 msgid "Log Directory"
 msgstr "�舒�舒仍仂亞 亢��仆舒仍舒"
 
@@ -2575,21 +2619,21 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2145
+#: ../libpurple/plugins/log_reader.c:2517
 msgid "Log Reader"
 msgstr "弌亳��亠仄舒 ��亠仆亳� 亢��仆舒仍仂于"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2149
+#: ../libpurple/plugins/log_reader.c:2521
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr ""
 "�从仍��舒亠� 亢��仆舒仍� 亟��亞亳� 从仍亳亠仆�仂于 仂弍仄亠仆舒 �仂仂弍�亠仆亳�仄亳 于 �亳��亠仄� 仗�仂�仄仂��舒 "
 "亢��仆舒仍仂于."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2153
+#: ../libpurple/plugins/log_reader.c:2525
 msgid ""
 "When viewing logs, this plugin will include logs from other IM clients. "
 "Currently, this includes Adium, MSN Messenger, and Trillian.\n"
@@ -2935,17 +2979,17 @@
 #: ../libpurple/protocols/bonjour/bonjour.c:294
 #: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
 #: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:1434
+#: ../libpurple/protocols/jabber/buddy.c:1472
 #: ../libpurple/protocols/novell/novell.c:2819
-#: ../libpurple/protocols/oscar/oscar.c:715
-#: ../libpurple/protocols/oscar/oscar.c:4520
-#: ../libpurple/protocols/oscar/oscar.c:5585
+#: ../libpurple/protocols/oscar/oscar.c:733
+#: ../libpurple/protocols/oscar/oscar.c:4545
+#: ../libpurple/protocols/oscar/oscar.c:5611
 #: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
 #: ../libpurple/protocols/silc10/buddy.c:1476
 #: ../libpurple/protocols/yahoo/yahoo.c:3397
 #: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1862
-#: ../pidgin/gtkstatusbox.c:1052
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkstatusbox.c:1056
 msgid "Away"
 msgstr "��仂��仍"
 
@@ -2966,31 +3010,31 @@
 
 #: ../libpurple/protocols/bonjour/bonjour.c:470
 #: ../libpurple/protocols/bonjour/bonjour.c:477
-#: ../libpurple/protocols/bonjour/bonjour.c:535
+#: ../libpurple/protocols/bonjour/bonjour.c:526
 msgid "Purple Person"
 msgstr ""
 
 #. Creating the user splits
-#: ../libpurple/protocols/bonjour/bonjour.c:583
+#: ../libpurple/protocols/bonjour/bonjour.c:575
 #: ../libpurple/protocols/silc/silc.c:1007
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "�仄� �亰仍舒"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:587
+#: ../libpurple/protocols/bonjour/bonjour.c:579
 #: ../libpurple/protocols/gg/gg.c:627
 #: ../libpurple/protocols/jabber/jabber.c:828
 msgid "First name"
 msgstr "�仄�"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:590
+#: ../libpurple/protocols/bonjour/bonjour.c:582
 #: ../libpurple/protocols/gg/gg.c:622
 #: ../libpurple/protocols/jabber/jabber.c:833
 msgid "Last name"
 msgstr "个舒仄亳仍亳�"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:593
+#: ../libpurple/protocols/bonjour/bonjour.c:585
 #: ../libpurple/protocols/gg/gg.c:472
 #: ../libpurple/protocols/jabber/jabber.c:818
 #: ../libpurple/protocols/silc/silc.c:770
@@ -3000,11 +3044,11 @@
 msgid "E-mail"
 msgstr "E-mail"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:596
+#: ../libpurple/protocols/bonjour/bonjour.c:588
 msgid "AIM Account"
 msgstr "丕���仆舒� 亰舒仗亳�� AIM"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:599
+#: ../libpurple/protocols/bonjour/bonjour.c:591
 msgid "XMPP Account"
 msgstr "丕���仆舒� 亰舒仗亳�� XMPP"
 
@@ -3012,30 +3056,30 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:394
+#: ../libpurple/protocols/bonjour/jabber.c:395
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s 亰舒从��仍 弍亠�亠亟�."
 
-#: ../libpurple/protocols/bonjour/jabber.c:440
-#: ../libpurple/protocols/bonjour/jabber.c:653
-#: ../libpurple/protocols/bonjour/jabber.c:678
+#: ../libpurple/protocols/bonjour/jabber.c:441
+#: ../libpurple/protocols/bonjour/jabber.c:654
+#: ../libpurple/protocols/bonjour/jabber.c:679
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠, 仆亠 �亟舒仍仂�� 仆舒�舒�� 弍亠�亠亟�."
 
-#: ../libpurple/protocols/bonjour/jabber.c:574
+#: ../libpurple/protocols/bonjour/jabber.c:575
 msgid "Cannot open socket"
 msgstr "�亠 �亟舒���� 仂�从���� �仂从亠�"
 
-#: ../libpurple/protocols/bonjour/jabber.c:582
+#: ../libpurple/protocols/bonjour/jabber.c:583
 msgid "Error setting socket options"
 msgstr "��亳弍从舒 ���舒仆仂于从亳 仗舒�舒仄亠��仂于 �仂从亠�舒"
 
-#: ../libpurple/protocols/bonjour/jabber.c:606
+#: ../libpurple/protocols/bonjour/jabber.c:607
 msgid "Could not bind socket to port"
 msgstr "�亠 �亟舒仍仂�� �于�亰舒�� �仂从亠� � 仗仂��仂仄"
 
-#: ../libpurple/protocols/bonjour/jabber.c:614
+#: ../libpurple/protocols/bonjour/jabber.c:615
 msgid "Could not listen on socket"
 msgstr "�亠 �亟舒仍仂�� 仂���亠��于亳�� 仗�仂�仍��亳于舒仆亳亠 �仂从亠�舒"
 
@@ -3113,7 +3157,7 @@
 
 #: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
 #: ../libpurple/protocols/jabber/jabber.c:807
-#: ../libpurple/protocols/jabber/jabber.c:1377
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Password"
 msgstr "�舒�仂仍�"
 
@@ -3138,10 +3182,10 @@
 msgstr "�舒仗仂仍仆亳�亠 �仍亠亟���亳亠 仗仂仍�"
 
 #: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
-#: ../libpurple/protocols/gg/gg.c:1123
+#: ../libpurple/protocols/gg/gg.c:1121
 #: ../libpurple/protocols/jabber/jabber.c:843
-#: ../libpurple/protocols/oscar/oscar.c:3778
-#: ../libpurple/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3811
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "�仂�仂亟"
@@ -3151,11 +3195,11 @@
 msgstr "�仂亟 �仂亢亟亠仆亳�"
 
 #: ../libpurple/protocols/gg/gg.c:645 ../libpurple/protocols/msn/msn.c:1558
-#: ../libpurple/protocols/oscar/oscar.c:3721
+#: ../libpurple/protocols/oscar/oscar.c:3741
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "�仂仍"
 
@@ -3164,14 +3208,14 @@
 msgstr "��亢�亳仆舒 亳仍亳 亢亠仆�亳仆舒"
 
 #: ../libpurple/protocols/gg/gg.c:647
-#: ../libpurple/protocols/oscar/oscar.c:3721
+#: ../libpurple/protocols/oscar/oscar.c:3741
 #: ../libpurple/protocols/qq/buddy_info.c:83
 #: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "��亢�亳仆舒"
 
 #: ../libpurple/protocols/gg/gg.c:648
-#: ../libpurple/protocols/oscar/oscar.c:3721
+#: ../libpurple/protocols/oscar/oscar.c:3741
 #: ../libpurple/protocols/qq/buddy_info.c:84
 #: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
@@ -3231,148 +3275,148 @@
 msgstr "�仂弍舒于亳�� 从 �舒��..."
 
 #: ../libpurple/protocols/gg/gg.c:1003
-#: ../libpurple/protocols/jabber/buddy.c:1428
+#: ../libpurple/protocols/jabber/buddy.c:1466
 #: ../libpurple/protocols/novell/novell.c:2828
-#: ../libpurple/protocols/oscar/oscar.c:810
-#: ../libpurple/protocols/oscar/oscar.c:5557
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:5583
 #: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
 #: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
-#: ../pidgin/gtkblist.c:3053 ../pidgin/gtkblist.c:3381
-#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1054
+#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3411
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
 msgid "Offline"
 msgstr "�亠 于 �亠�亳"
 
 #: ../libpurple/protocols/gg/gg.c:1006
-#: ../libpurple/protocols/jabber/buddy.c:1430
+#: ../libpurple/protocols/jabber/buddy.c:1468
 #: ../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:2816
 #: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
-#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1051
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
 msgid "Available"
 msgstr "�仂���仗亠仆"
 
-#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1114
-#: ../libpurple/protocols/oscar/oscar.c:2657
-#: ../libpurple/protocols/oscar/oscar.c:3688
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
+#: ../libpurple/protocols/oscar/oscar.c:2671
+#: ../libpurple/protocols/oscar/oscar.c:3708
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/jabber/buddy.c:1585
-#: ../libpurple/protocols/jabber/buddy.c:1761
-#: ../libpurple/protocols/oscar/oscar.c:3699
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
+#: ../libpurple/protocols/jabber/buddy.c:1623
+#: ../libpurple/protocols/jabber/buddy.c:1799
+#: ../libpurple/protocols/oscar/oscar.c:3719
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "�仄�"
 
-#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1126
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
 msgid "Birth Year"
 msgstr "�仂亟 �仂亢亟亠仆亳�"
 
-#: ../libpurple/protocols/gg/gg.c:1108 ../libpurple/protocols/gg/gg.c:1177
-#: ../libpurple/protocols/oscar/oscar.c:3900
+#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
+#: ../libpurple/protocols/oscar/oscar.c:3920
 msgid "Unable to display the search results."
 msgstr "�亠 �亟舒���� 仂�仂弍�舒亰亳�� �亠亰�仍��舒�� 仗仂亳�从舒."
 
-#: ../libpurple/protocols/gg/gg.c:1168
+#: ../libpurple/protocols/gg/gg.c:1166
 msgid "Gadu-Gadu Public Directory"
 msgstr "��弍仍亳�仆�亶 从舒�舒仍仂亞 Gadu-Gadu"
 
-#: ../libpurple/protocols/gg/gg.c:1169
+#: ../libpurple/protocols/gg/gg.c:1167
 msgid "Search results"
 msgstr "�亠亰�仍��舒�� 仗仂亳�从舒"
 
-#: ../libpurple/protocols/gg/gg.c:1212
+#: ../libpurple/protocols/gg/gg.c:1210
 msgid "No matching users found"
 msgstr "�仂仍�亰仂于舒�亠仍亳 仆亠 仆舒亶亟亠仆�"
 
-#: ../libpurple/protocols/gg/gg.c:1213
+#: ../libpurple/protocols/gg/gg.c:1211
 msgid "There are no users matching your search criteria."
 msgstr "�亠� 仗仂仍�亰仂于舒�亠仍亠亶, �仂仂�于亠���于���亳� 从�亳�亠�亳�仄 仗仂亳�从舒."
 
-#: ../libpurple/protocols/gg/gg.c:1307 ../libpurple/protocols/gg/gg.c:1460
+#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
 msgid "Unable to read socket"
 msgstr "�亠 �亟舒���� 仗�仂�亳�舒�� �仂从亠�"
 
-#: ../libpurple/protocols/gg/gg.c:1392
+#: ../libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list downloaded"
 msgstr "弌仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 亰舒亞��亢亠仆"
 
-#: ../libpurple/protocols/gg/gg.c:1393
+#: ../libpurple/protocols/gg/gg.c:1391
 msgid "Your buddy list was downloaded from the server."
 msgstr "弌仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 弍�仍 亰舒亞��亢亠仆 � �亠�于亠�舒."
 
-#: ../libpurple/protocols/gg/gg.c:1400
+#: ../libpurple/protocols/gg/gg.c:1398
 msgid "Buddy list uploaded"
 msgstr "弌仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 �仂��舒仆�仆"
 
-#: ../libpurple/protocols/gg/gg.c:1401
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Your buddy list was stored on the server."
 msgstr "弌仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 弍�仍 �仂��舒仆�仆 仆舒 �亠�于亠�亠."
 
-#: ../libpurple/protocols/gg/gg.c:1506 ../libpurple/protocols/gg/gg.c:1712
+#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠."
 
-#: ../libpurple/protocols/gg/gg.c:1618 ../libpurple/protocols/msn/msn.c:531
+#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "�舒弍仍仂从亳�仂于舒仆"
 
-#: ../libpurple/protocols/gg/gg.c:1641
+#: ../libpurple/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "�仂弍舒于亳�� 从 �舒��"
 
-#: ../libpurple/protocols/gg/gg.c:1650
+#: ../libpurple/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "�舒亰弍仍仂从亳�仂于舒��"
 
-#: ../libpurple/protocols/gg/gg.c:1654
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "�仍仂从亳�仂于舒��"
 
-#: ../libpurple/protocols/gg/gg.c:1671
+#: ../libpurple/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "_�仄� �舒�舒:"
 
-#: ../libpurple/protocols/gg/gg.c:1911
+#: ../libpurple/protocols/gg/gg.c:1909
 msgid "Chat error"
 msgstr "��亳弍从舒 �舒�舒"
 
-#: ../libpurple/protocols/gg/gg.c:1912
+#: ../libpurple/protocols/gg/gg.c:1910
 msgid "This chat name is already in use"
 msgstr "亅�仂 亳仄� �舒�舒 �亢亠 亳�仗仂仍�亰�亠���"
 
-#: ../libpurple/protocols/gg/gg.c:1995
+#: ../libpurple/protocols/gg/gg.c:1993
 msgid "Not connected to the server."
 msgstr "�亠� �仂亠亟亳仆亠仆亳� � �亠�于亠�仂仄."
 
-#: ../libpurple/protocols/gg/gg.c:2018
+#: ../libpurple/protocols/gg/gg.c:2016
 msgid "Find buddies..."
 msgstr "�舒亶�亳 �仂弍亠�亠亟仆亳从仂于..."
 
-#: ../libpurple/protocols/gg/gg.c:2024
+#: ../libpurple/protocols/gg/gg.c:2022
 msgid "Change password..."
 msgstr "�亰仄亠仆亳�� 仗舒�仂仍�..."
 
-#: ../libpurple/protocols/gg/gg.c:2030
+#: ../libpurple/protocols/gg/gg.c:2028
 msgid "Upload buddylist to Server"
 msgstr "弌仂��舒仆亳�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 仆舒 �亠�于亠�亠"
 
-#: ../libpurple/protocols/gg/gg.c:2034
+#: ../libpurple/protocols/gg/gg.c:2032
 msgid "Download buddylist from Server"
 msgstr "�舒亞��亰亳�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 � �亠�于亠�舒"
 
-#: ../libpurple/protocols/gg/gg.c:2038
+#: ../libpurple/protocols/gg/gg.c:2036
 msgid "Delete buddylist from Server"
 msgstr "丕亟舒仍亳�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 � �亠�于亠�舒"
 
-#: ../libpurple/protocols/gg/gg.c:2042
+#: ../libpurple/protocols/gg/gg.c:2040
 msgid "Save buddylist to file..."
 msgstr "弌仂��舒仆亳�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 于 �舒亶仍..."
 
-#: ../libpurple/protocols/gg/gg.c:2046
+#: ../libpurple/protocols/gg/gg.c:2044
 msgid "Load buddylist from file..."
 msgstr "�舒亞��亰亳�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 亳亰 �舒亶仍舒..."
 
@@ -3387,16 +3431,16 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2150
+#: ../libpurple/protocols/gg/gg.c:2148
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 Gadu-Gadu"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2151
+#: ../libpurple/protocols/gg/gg.c:2149
 msgid "Polish popular IM"
 msgstr ""
 
-#: ../libpurple/protocols/gg/gg.c:2205
+#: ../libpurple/protocols/gg/gg.c:2203
 msgid "Gadu-Gadu User"
 msgstr "�仂仍�亰仂于舒�亠仍� Gadu-Gadu"
 
@@ -3424,9 +3468,9 @@
 
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "File Transfer Failed"
 msgstr "�亠 �亟舒仍仂�� 仗�仂亳亰于亠��亳 仗亠�亠亟舒�� �舒亶仍仂于"
 
@@ -3467,7 +3511,7 @@
 msgstr "_�舒仆舒仍:"
 
 #: ../libpurple/protocols/irc/irc.c:267
-#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:523
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
 msgid "_Password:"
 msgstr "_�舒�仂仍�:"
 
@@ -3477,15 +3521,15 @@
 
 #. connect to the server
 #: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1048
+#: ../libpurple/protocols/jabber/jabber.c:1046
 #: ../libpurple/protocols/msn/session.c:345
 #: ../libpurple/protocols/novell/novell.c:2182
-#: ../libpurple/protocols/oscar/oscar.c:1270
+#: ../libpurple/protocols/oscar/oscar.c:1288
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1671
+#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/simple/simple.c:1676
 #: ../libpurple/protocols/yahoo/yahoo.c:2762
-#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:659
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
 msgid "Connecting"
 msgstr "弌仂亠亟亳仆亠仆亳亠"
 
@@ -3497,12 +3541,12 @@
 
 #: ../libpurple/protocols/irc/irc.c:338
 #: ../libpurple/protocols/simple/simple.c:464
-#: ../libpurple/protocols/simple/simple.c:1586
+#: ../libpurple/protocols/simple/simple.c:1591
 msgid "Couldn't create socket"
 msgstr "�亠 �亟舒仍仂�� �仂亰亟舒�� �仂从亠�"
 
 #: ../libpurple/protocols/irc/irc.c:416
-#: ../libpurple/protocols/oscar/oscar.c:1266
+#: ../libpurple/protocols/oscar/oscar.c:1284
 msgid "Couldn't connect to host"
 msgstr "�亠 �亟舒仍仂�� �仂亠亟亳仆亳���� � �亰仍仂仄"
 
@@ -3523,17 +3567,17 @@
 #: ../libpurple/protocols/irc/irc.c:775
 #: ../libpurple/protocols/silc/chat.c:1412
 #: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/yahoo/yahoochat.c:1401
 msgid "Users"
 msgstr "�仂仍�亰仂于舒�亠仍亳"
 
 #: ../libpurple/protocols/irc/irc.c:778
-#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/sametime/sametime.c:3375
 #: ../libpurple/protocols/silc/chat.c:1415
 #: ../libpurple/protocols/silc/ops.c:1389
 #: ../libpurple/protocols/silc10/chat.c:1429
 #: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/yahoo/yahoochat.c:1410
 msgid "Topic"
 msgstr "丐亠仄舒"
 
@@ -3545,46 +3589,46 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "IRC Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 IRC"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:916
+#: ../libpurple/protocols/irc/irc.c:917
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "�舒亳仄亠仆亠亠 仗仍仂�仂亶 仄仂亟�仍� 仗�仂�仂从仂仍舒 IRC"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:941 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/irc/irc.c:942 ../libpurple/protocols/irc/msgs.c:323
 #: ../libpurple/protocols/msn/msn.c:2154
-#: ../libpurple/protocols/oscar/oscar.c:6624
+#: ../libpurple/protocols/oscar/oscar.c:6650
 #: ../libpurple/protocols/qq/qq.c:756
-#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/sametime/sametime.c:5728
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1341
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1850
+#: ../libpurple/protocols/simple/simple.c:1855
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "弌亠�于亠�"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:944 ../libpurple/protocols/msn/msn.c:2159
-#: ../libpurple/protocols/oscar/oscar.c:6627
+#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6653
 #: ../libpurple/protocols/qq/qq.c:759
-#: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:1917
-#: ../libpurple/protocols/silc10/silc.c:1859
+#: ../libpurple/protocols/sametime/sametime.c:5733
+#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc10/silc.c:1861
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "�仂��"
 
-#: ../libpurple/protocols/irc/irc.c:947
+#: ../libpurple/protocols/irc/irc.c:948
 msgid "Encodings"
 msgstr "�仂亟亳�仂于从亳"
 
-#: ../libpurple/protocols/irc/irc.c:950 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/irc/irc.c:951 ../libpurple/protocols/irc/msgs.c:316
 #: ../libpurple/protocols/jabber/jabber.c:803
 #: ../libpurple/protocols/silc/buddy.c:1539
 #: ../libpurple/protocols/silc/ops.c:1197
@@ -3601,7 +3645,7 @@
 msgid "Username"
 msgstr "�仄� 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../libpurple/protocols/irc/irc.c:953 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
 #: ../libpurple/protocols/silc/silc.c:1009
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
@@ -3611,7 +3655,7 @@
 #. option = purple_account_option_string_new(_("Quit message"), "quitmsg", IRC_DEFAULT_QUIT);
 #. prpl_info.protocol_options = g_list_append(prpl_info.protocol_options, option);
 #.
-#: ../libpurple/protocols/irc/irc.c:961
+#: ../libpurple/protocols/irc/irc.c:962
 msgid "Use SSL"
 msgstr "��仗仂仍�亰仂于舒�� SSL"
 
@@ -3642,7 +3686,7 @@
 msgstr " <i>(亳亟亠仆�亳�亳�亳�仂于舒仆)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3689
+#: ../libpurple/protocols/oscar/oscar.c:3709
 #: ../libpurple/protocols/silc/ops.c:1418
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -3919,7 +3963,7 @@
 "从舒仆舒仍亠."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:1819
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;仆仂于�亶 仗�亠于亟仂仆亳仄&gt;:  �亰仄亠仆亳�� �于仂亶 仗�亠于亟仂仆亳仄."
 
@@ -4108,22 +4152,22 @@
 msgstr "��亳弍从舒 SASL"
 
 #: ../libpurple/protocols/jabber/buddy.c:271
-#: ../libpurple/protocols/jabber/buddy.c:787
-#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/sametime/sametime.c:4129
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "�仂仍仆仂亠 亳仄�"
 
 #: ../libpurple/protocols/jabber/buddy.c:272
-#: ../libpurple/protocols/jabber/buddy.c:800
+#: ../libpurple/protocols/jabber/buddy.c:838
 #: ../libpurple/protocols/silc/ops.c:998
 #: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "个舒仄亳仍亳�"
 
 #: ../libpurple/protocols/jabber/buddy.c:273
-#: ../libpurple/protocols/jabber/buddy.c:804
+#: ../libpurple/protocols/jabber/buddy.c:842
 msgid "Given Name"
 msgstr "�仄�"
 
@@ -4133,274 +4177,274 @@
 msgstr "URL"
 
 #: ../libpurple/protocols/jabber/buddy.c:276
-#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Street Address"
 msgstr "�亟�亠�"
 
 #: ../libpurple/protocols/jabber/buddy.c:277
-#: ../libpurple/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:890
 msgid "Extended Address"
 msgstr "�仂仗仂仍仆亳�亠仍�仆�亶 舒亟�亠�"
 
 #: ../libpurple/protocols/jabber/buddy.c:278
-#: ../libpurple/protocols/jabber/buddy.c:860
+#: ../libpurple/protocols/jabber/buddy.c:898
 msgid "Locality"
 msgstr "�舒�亠仍�仆仆�亶 仗�仆从�"
 
 #: ../libpurple/protocols/jabber/buddy.c:279
-#: ../libpurple/protocols/jabber/buddy.c:864
+#: ../libpurple/protocols/jabber/buddy.c:902
 msgid "Region"
 msgstr "�亠亞亳仂仆"
 
 #: ../libpurple/protocols/jabber/buddy.c:280
-#: ../libpurple/protocols/jabber/buddy.c:868
+#: ../libpurple/protocols/jabber/buddy.c:906
 msgid "Postal Code"
 msgstr "�仂��仂于�亶 从仂亟"
 
 #: ../libpurple/protocols/jabber/buddy.c:281
-#: ../libpurple/protocols/jabber/buddy.c:873
+#: ../libpurple/protocols/jabber/buddy.c:911
 #: ../libpurple/protocols/silc/silc.c:1015
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "弌��舒仆舒"
 
 #: ../libpurple/protocols/jabber/buddy.c:282
-#: ../libpurple/protocols/jabber/buddy.c:884
-#: ../libpurple/protocols/jabber/buddy.c:891
+#: ../libpurple/protocols/jabber/buddy.c:922
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Telephone"
 msgstr "丐亠仍亠�仂仆"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:902
-#: ../libpurple/protocols/jabber/buddy.c:910
-#: ../libpurple/protocols/jabber/buddy.c:1591
+#: ../libpurple/protocols/jabber/buddy.c:940
+#: ../libpurple/protocols/jabber/buddy.c:948
+#: ../libpurple/protocols/jabber/buddy.c:1629
 #: ../libpurple/protocols/silc/ops.c:1041
 #: ../libpurple/protocols/silc/util.c:555
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1037
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "E-Mail"
 msgstr "E-mail"
 
 #: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:925
+#: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
 msgstr "�舒亰于舒仆亳亠 仂�亞舒仆亳亰舒�亳亳"
 
 #: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:929
+#: ../libpurple/protocols/jabber/buddy.c:967
 msgid "Organization Unit"
 msgstr "��亟亠仍"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/buddy.c:938
+#: ../libpurple/protocols/jabber/buddy.c:976
 msgid "Role"
 msgstr "�仂仍亢仆仂���"
 
 #: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:821
+#: ../libpurple/protocols/jabber/buddy.c:859
 #: ../libpurple/protocols/msn/msn.c:1627
-#: ../libpurple/protocols/oscar/oscar.c:3738
+#: ../libpurple/protocols/oscar/oscar.c:3758
 msgid "Birthday"
 msgstr "�舒�舒 �仂亢亟亠仆亳�"
 
 #: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3064
-#: ../pidgin/gtkprefs.c:680
+#: ../libpurple/protocols/jabber/buddy.c:979
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkprefs.c:738
 msgid "Description"
 msgstr "�仗亳�舒仆亳亠"
 
-#: ../libpurple/protocols/jabber/buddy.c:578
-#: ../libpurple/protocols/jabber/buddy.c:579
+#: ../libpurple/protocols/jabber/buddy.c:582
+#: ../libpurple/protocols/jabber/buddy.c:583
 msgid "Edit XMPP vCard"
 msgstr "�亰仄亠仆亳�� XMPP vCard"
 
-#: ../libpurple/protocols/jabber/buddy.c:580
+#: ../libpurple/protocols/jabber/buddy.c:584
 msgid ""
 "All items below are optional. Enter only the information with which you feel "
 "comfortable."
 msgstr ""
 "��亠 仆亳亢亠�仍亠亟���亳亠 仗�仆从�� 仆亠仂弍�亰舒�亠仍�仆�. �舒仗仂仍仆�亶�亠 仗仂 �于仂亠仄� ��仄仂��亠仆亳�."
 
-#: ../libpurple/protocols/jabber/buddy.c:651
-#: ../libpurple/protocols/jabber/buddy.c:692
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Client"
 msgstr "�仍亳亠仆�"
 
-#: ../libpurple/protocols/jabber/buddy.c:655
-#: ../libpurple/protocols/jabber/buddy.c:696
+#: ../libpurple/protocols/jabber/buddy.c:659
+#: ../libpurple/protocols/jabber/buddy.c:700
 msgid "Operating System"
 msgstr "�仗亠�舒�亳仂仆仆舒� �亳��亠仄舒"
 
-#: ../libpurple/protocols/jabber/buddy.c:665
-#: ../libpurple/protocols/jabber/libxmpp.c:198
+#: ../libpurple/protocols/jabber/buddy.c:669
+#: ../libpurple/protocols/jabber/libxmpp.c:202
 #: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr "�亠����"
 
-#: ../libpurple/protocols/jabber/buddy.c:667
-#: ../libpurple/protocols/jabber/jabber.c:1251
-#: ../libpurple/protocols/jabber/jabber.c:1261
-#: ../libpurple/protocols/jabber/jabber.c:1271
-#: ../libpurple/protocols/jabber/jabber.c:1281
-#: ../libpurple/protocols/jabber/jabber.c:1291
+#: ../libpurple/protocols/jabber/buddy.c:671
+#: ../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:1283
 msgid "Priority"
 msgstr "��亳仂�亳�亠�"
 
-#: ../libpurple/protocols/jabber/buddy.c:808
+#: ../libpurple/protocols/jabber/buddy.c:846
 #: ../libpurple/protocols/silc/ops.c:994
 #: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "���亠��于仂"
 
-#: ../libpurple/protocols/jabber/buddy.c:841
+#: ../libpurple/protocols/jabber/buddy.c:879
 #: ../libpurple/protocols/jabber/jabber.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3777
-#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3810
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "�亟�亠�"
 
-#: ../libpurple/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:886
 msgid "P.O. Box"
 msgstr "�仆亟亠从�"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Photo"
 msgstr "个仂�仂亞�舒�亳�"
 
-#: ../libpurple/protocols/jabber/buddy.c:962
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Logo"
 msgstr "�仂亞仂�亳仗"
 
-#: ../libpurple/protocols/jabber/buddy.c:1371
+#: ../libpurple/protocols/jabber/buddy.c:1409
 msgid "Un-hide From"
 msgstr "�仂从舒亰舒���� 亟仍�"
 
-#: ../libpurple/protocols/jabber/buddy.c:1375
+#: ../libpurple/protocols/jabber/buddy.c:1413
 msgid "Temporarily Hide From"
 msgstr "��亠仄亠仆仆仂 �从������ 仂�"
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1383
+#: ../libpurple/protocols/jabber/buddy.c:1421
 msgid "Cancel Presence Notification"
 msgstr "��仄亠仆亳�� �于亠亟仂仄仍亠仆亳亠 仂 仗�亳�����于亳亳"
 
-#: ../libpurple/protocols/jabber/buddy.c:1390
+#: ../libpurple/protocols/jabber/buddy.c:1428
 msgid "(Re-)Request authorization"
 msgstr "(�仂于�仂�仆仂) �舒仗�仂�亳�� 舒于�仂�亳亰舒�亳�"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1399
+#: ../libpurple/protocols/jabber/buddy.c:1437
 msgid "Unsubscribe"
 msgstr "��仗亳�舒����"
 
-#: ../libpurple/protocols/jabber/buddy.c:1432
-#: ../libpurple/protocols/jabber/jabber.c:1260
+#: ../libpurple/protocols/jabber/buddy.c:1470
+#: ../libpurple/protocols/jabber/jabber.c:1252
 msgid "Chatty"
 msgstr "�仂�仂于 仗仂仂弍�舒����"
 
-#: ../libpurple/protocols/jabber/buddy.c:1436 ../libpurple/status.c:158
+#: ../libpurple/protocols/jabber/buddy.c:1474
 msgid "Extended Away"
 msgstr "�舒��亳�亠仆仆�亶 \"��仂��仍\""
 
-#: ../libpurple/protocols/jabber/buddy.c:1438
-#: ../libpurple/protocols/jabber/jabber.c:1290
-#: ../libpurple/protocols/oscar/oscar.c:709
-#: ../libpurple/protocols/oscar/oscar.c:5761
-#: ../libpurple/protocols/sametime/sametime.c:3297
+#: ../libpurple/protocols/jabber/buddy.c:1476
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/oscar/oscar.c:727
+#: ../libpurple/protocols/oscar/oscar.c:5787
+#: ../libpurple/protocols/sametime/sametime.c:3298
 msgid "Do Not Disturb"
 msgstr "�亠 弍亠�仗仂从仂亳��"
 
-#: ../libpurple/protocols/jabber/buddy.c:1583
+#: ../libpurple/protocols/jabber/buddy.c:1621
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:1587
-#: ../libpurple/protocols/jabber/buddy.c:1766
-#: ../libpurple/protocols/oscar/oscar.c:3700
+#: ../libpurple/protocols/jabber/buddy.c:1625
+#: ../libpurple/protocols/jabber/buddy.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:3720
 msgid "Last Name"
 msgstr "个舒仄亳仍亳�"
 
-#: ../libpurple/protocols/jabber/buddy.c:1619
+#: ../libpurple/protocols/jabber/buddy.c:1657
 msgid "The following are the results of your search"
 msgstr "弌仍亠亟���亠亠 �于仍�亠��� �亠亰�仍��舒�舒仄亳 于舒�亠亞仂 仗仂亳�从舒"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libpurple/protocols/jabber/buddy.c:1694
+#: ../libpurple/protocols/jabber/buddy.c:1732
 msgid ""
 "Find a contact by entering the search criteria in the given fields. Note: "
 "Each field supports wild card searches (%)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1714
+#: ../libpurple/protocols/jabber/buddy.c:1752
 msgid "Directory Query Failed"
 msgstr "�亠 �亟舒仍仂�� 仂仗�仂�亳�� 从舒�舒仍仂亞"
 
-#: ../libpurple/protocols/jabber/buddy.c:1715
+#: ../libpurple/protocols/jabber/buddy.c:1753
 msgid "Could not query the directory server."
 msgstr "�亠 �亟舒仍仂�� 仂仗�仂�亳�� �亠�于亠� 从舒�舒仍仂亞舒."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libpurple/protocols/jabber/buddy.c:1749
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "�仆����从�亳亳 �亠�于亠�舒: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:1756
+#: ../libpurple/protocols/jabber/buddy.c:1794
 msgid "Fill in one or more fields to search for any matching XMPP users."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:1776
+#: ../libpurple/protocols/jabber/buddy.c:1814
 #: ../libpurple/protocols/novell/novell.c:1488
-#: ../libpurple/protocols/oscar/oscar.c:3703
-#: ../libpurple/protocols/oscar/oscar.c:3712
+#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/oscar/oscar.c:3732
 msgid "E-Mail Address"
 msgstr "�亟�亠� e-mail"
 
-#: ../libpurple/protocols/jabber/buddy.c:1785
-#: ../libpurple/protocols/jabber/buddy.c:1786
+#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1824
 msgid "Search for XMPP users"
 msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍亠亶 XMPP"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:1787
+#: ../libpurple/protocols/jabber/buddy.c:1825
 #: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:145
+#: ../libpurple/protocols/qq/group_im.c:147
 #: ../libpurple/protocols/qq/sys_msg.c:176
 #: ../libpurple/protocols/qq/sys_msg.c:253
 #: ../libpurple/protocols/qq/sys_msg.c:271
-#: ../libpurple/protocols/sametime/sametime.c:5611
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:473
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:358
+#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
 msgstr "��从舒��"
 
-#: ../libpurple/protocols/jabber/buddy.c:1802
+#: ../libpurple/protocols/jabber/buddy.c:1840
 msgid "Invalid Directory"
 msgstr "�亠于亠�仆�亶 从舒�舒仍仂亞"
 
-#: ../libpurple/protocols/jabber/buddy.c:1819
+#: ../libpurple/protocols/jabber/buddy.c:1857
 msgid "Enter a User Directory"
 msgstr "�于亠亟亳�亠 从舒�舒仍仂亞 仗仂仍�亰仂于舒�亠仍亠亶"
 
-#: ../libpurple/protocols/jabber/buddy.c:1820
+#: ../libpurple/protocols/jabber/buddy.c:1858
 msgid "Select a user directory to search"
 msgstr "��弍亠�亳�亠 从舒�舒仍仂亞 仗仂仍�亰仂于舒�亠仍亠亶 亟仍� 仗仂亳�从舒"
 
-#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1861
 msgid "Search Directory"
 msgstr "�仂亳�从 于 从舒�舒仍仂亞亠"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5247
-#: ../libpurple/protocols/yahoo/yahoochat.c:999
+#: ../libpurple/protocols/oscar/oscar.c:5273
+#: ../libpurple/protocols/yahoo/yahoochat.c:962
 msgid "_Room:"
 msgstr "_�仂仄仆舒�舒:"
 
@@ -4506,7 +4550,7 @@
 msgstr "��亳弍从舒 ��亠仆亳�"
 
 #: ../libpurple/protocols/jabber/jabber.c:467
-#: ../libpurple/protocols/oscar/flap_connection.c:386
+#: ../libpurple/protocols/oscar/flap_connection.c:394
 #: ../libpurple/protocols/yahoo/yahoo.c:2381
 #: ../libpurple/protocols/yahoo/yahoo.c:2413
 #, c-format
@@ -4541,7 +4585,7 @@
 msgstr "�亠亞亳���舒�亳� 亰舒于亠��亠仆舒 ��仗亠�仆仂"
 
 #: ../libpurple/protocols/jabber/jabber.c:653
-#: ../libpurple/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "�亠亳亰于亠��仆舒� 仂�亳弍从舒"
 
@@ -4556,8 +4600,8 @@
 msgstr "丕亢亠 亰舒�亠亞亳���亳�仂于舒仆仂"
 
 #: ../libpurple/protocols/jabber/jabber.c:848
-#: ../libpurple/protocols/oscar/oscar.c:3779
-#: ../libpurple/protocols/oscar/oscar.c:3792
+#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3812
 msgid "State"
 msgstr "�弍仍舒���"
 
@@ -4589,384 +4633,388 @@
 msgstr "�舒�亠亞亳���亳�仂于舒�� 仆仂于�� ����仆�� 亰舒仗亳�� XMPP"
 
 #. Register button
-#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1526
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1518
 msgid "Register"
 msgstr "�舒�亠亞亳���亳�仂于舒��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1052
+#: ../libpurple/protocols/jabber/jabber.c:1050
 msgid "Initializing Stream"
 msgstr "�仆亳�亳舒仍亳亰舒�亳� 仗仂�仂从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1057
+#: ../libpurple/protocols/jabber/jabber.c:1055
 #: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "���亠仆�亳�亳从舒�亳�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1066
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Re-initializing Stream"
 msgstr "�仂于�仂�仆舒� 亳仆亳�亳舒仍亳亰舒�亳� 仗仂�仂从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1134
-#: ../libpurple/protocols/jabber/jabber.c:1508
-#: ../libpurple/protocols/jabber/jabber.c:1549
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/oscar/oscar.c:808
-#: ../libpurple/protocols/oscar/oscar.c:5555
+#: ../libpurple/protocols/jabber/jabber.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:5581
 msgid "Not Authorized"
 msgstr "�亠 舒于�仂�亳亰仂于舒仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1176
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "Both"
 msgstr "�弍亠"
 
-#: ../libpurple/protocols/jabber/jabber.c:1178
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "From (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1183
+#: ../libpurple/protocols/jabber/jabber.c:1172
+msgid "From"
+msgstr "��"
+
+#: ../libpurple/protocols/jabber/jabber.c:1175
 msgid "To"
 msgstr "�仍�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1185
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "None (To pending)"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1187
+#: ../libpurple/protocols/jabber/jabber.c:1179
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "�亠�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1190
+#: ../libpurple/protocols/jabber/jabber.c:1182
 msgid "Subscription"
 msgstr "�仂亟仗亳�从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1320
+#: ../libpurple/protocols/jabber/jabber.c:1312
 msgid "Password Changed"
 msgstr "�舒�仂仍� 亳亰仄亠仆�仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1321
+#: ../libpurple/protocols/jabber/jabber.c:1313
 msgid "Your password has been changed."
 msgstr "�舒�仂仍� 弍�仍 亳亰仄亠仆�仆."
 
-#: ../libpurple/protocols/jabber/jabber.c:1325
-#: ../libpurple/protocols/jabber/jabber.c:1326
+#: ../libpurple/protocols/jabber/jabber.c:1317
+#: ../libpurple/protocols/jabber/jabber.c:1318
 msgid "Error changing password"
 msgstr "��亳弍从舒 亳亰仄亠仆亠仆亳� 仗舒�仂仍�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1382
+#: ../libpurple/protocols/jabber/jabber.c:1375
 msgid "Password (again)"
 msgstr "�舒�仂仍� (亠�� �舒亰)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1387
-#: ../libpurple/protocols/jabber/jabber.c:1388
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Change XMPP Password"
 msgstr "�亰仄亠仆亳�� 仗舒�仂仍� XMPP"
 
-#: ../libpurple/protocols/jabber/jabber.c:1388
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "�于亠亟亳�亠 仆仂于�亶 仗舒�仂仍�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1400
-#: ../libpurple/protocols/oscar/oscar.c:6341
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6367
 #: ../libpurple/protocols/silc/silc.c:1093
 #: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "丕��舒仆仂于亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳�..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1405
-#: ../libpurple/protocols/oscar/oscar.c:6352
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6378
 #: ../libpurple/protocols/silc/silc.c:1089
 #: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "�亰仄亠仆亳�� 仗舒�仂仍�..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1410
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍亠亶..."
 
+#: ../libpurple/protocols/jabber/jabber.c:1482
+msgid "Bad Request"
+msgstr "�亠于亠�仆�亶 亰舒仗�仂�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1484
+msgid "Conflict"
+msgstr "�仂仆�仍亳从�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1486
+msgid "Feature Not Implemented"
+msgstr "个�仆从�亳� 仆亠 �亠舒仍亳亰仂于舒仆舒"
+
 #: ../libpurple/protocols/jabber/jabber.c:1488
-msgid "Bad Request"
-msgstr "�亠于亠�仆�亶 亰舒仗�仂�"
+msgid "Forbidden"
+msgstr "�舒仗�亠�亠仆仂"
 
 #: ../libpurple/protocols/jabber/jabber.c:1490
-msgid "Conflict"
-msgstr "�仂仆�仍亳从�"
+msgid "Gone"
+msgstr "丕��仍"
 
 #: ../libpurple/protocols/jabber/jabber.c:1492
-msgid "Feature Not Implemented"
-msgstr "个�仆从�亳� 仆亠 �亠舒仍亳亰仂于舒仆舒"
-
-#: ../libpurple/protocols/jabber/jabber.c:1494
-msgid "Forbidden"
-msgstr "�舒仗�亠�亠仆仂"
-
-#: ../libpurple/protocols/jabber/jabber.c:1496
-msgid "Gone"
-msgstr "丕��仍"
-
-#: ../libpurple/protocols/jabber/jabber.c:1498
-#: ../libpurple/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "�仆���亠仆仆�� 仂�亳弍从舒 �亠�于亠�舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "亅仍亠仄亠仆� 仆亠 仆舒亶亟亠仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1496
 msgid "Malformed XMPP ID"
 msgstr "�亠于亠�仆仂 ��仂�仄亳�仂于舒仆仆�亶 XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1504
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "�亠亟仂仗���亳仄仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:1506
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "�亠 �舒亰�亠�亠仆仂"
 
-#: ../libpurple/protocols/jabber/jabber.c:1510
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "丐�亠弍�亠��� 仗仍舒�舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "�仂仍��舒�亠仍� 仆亠亟仂���仗亠仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1516
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "丐�亠弍�亠��� �亠亞亳���舒�亳�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "丕亟舒仍�仆仆�亶 �亠�于亠� 仆亠 仆舒亶亟亠仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1520
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "���亠从仍仂 于�亠仄� 仂亢亳亟舒仆亳� �亟舒仍�仆仆仂亞仂 �亠�于亠�舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1522
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "弌亠�于亠� 仗亠�亠亞��亢亠仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1524
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "弌仍�亢弍舒 仆亠亟仂���仗仆舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1526
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "丐�亠弍�亠��� 仗仂亟仗亳�从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1528
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "�亠仗�亠亟于亳亟亠仆仆�亶 亰舒仗�仂�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "�于�仂�亳亰舒�亳� 仗�亠�于舒仆舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "�亠仗�舒于亳仍�仆舒� 从仂亟亳�仂于从舒 于 舒于�仂�亳亰舒�亳亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "�亠于亠�仆�亶 亳亟亠仆�亳�亳从舒�仂� 舒于�仂�亳亰舒�亳亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "�亠于亠�仆�亶 仄亠�舒仆亳亰仄 舒于�仂�亳亰舒�亳亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:1546
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "�亠�舒仆亳亰仄 舒于�仂�亳亰舒�亳亳 �仍亳�从仂仄 �仍舒弍"
 
-#: ../libpurple/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "��亠仄亠仆仆舒� 仂�亳弍从舒 舒��亠仆�亳�亳从舒�亳亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:1554
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "��亳弍从舒 舒��亠仆�亳�亳从舒�亳亳"
 
-#: ../libpurple/protocols/jabber/jabber.c:1560
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "�亠于亠�仆�亶 �仂�仄舒�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1562
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "�亠于亠�仆�亶 仗�亠�亳从� 仗�仂���舒仆��于舒 亳仄�仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "�仂仆�仍亳从� �亠����仂于"
 
-#: ../libpurple/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1561
 #: ../libpurple/protocols/silc/silc.c:244
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "���亠从仍仂 于�亠仄� 仂亢亳亟舒仆亳� �仂亠亟亳仆亠仆亳�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "丕亰亠仍 ���仍"
 
-#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "丕亰亠仍 仆亠亳亰于亠��亠仆"
 
+#: ../libpurple/protocols/jabber/jabber.c:1567
+msgid "Improper Addressing"
+msgstr "�亠仗�舒于亳仍�仆舒� 舒亟�亠�舒�亳�"
+
+#: ../libpurple/protocols/jabber/jabber.c:1571
+msgid "Invalid ID"
+msgstr "�亠于亠�仆�亶 ID"
+
 #: ../libpurple/protocols/jabber/jabber.c:1573
-msgid "Improper Addressing"
-msgstr "�亠仗�舒于亳仍�仆舒� 舒亟�亠�舒�亳�"
-
-#: ../libpurple/protocols/jabber/jabber.c:1577
-msgid "Invalid ID"
-msgstr "�亠于亠�仆�亶 ID"
-
-#: ../libpurple/protocols/jabber/jabber.c:1579
 msgid "Invalid Namespace"
 msgstr "�亠于亠�仆仂亠 仗�仂���舒仆��于仂 亳仄�仆"
 
-#: ../libpurple/protocols/jabber/jabber.c:1581
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "�亠于亠�仆�亶 XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "�亠�仂�亠�舒亠仄�亠 �亰仍�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "�舒���亠仆亳亠 仗�舒于亳仍"
 
-#: ../libpurple/protocols/jabber/jabber.c:1589
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �亟舒仍�仆仆仂亠 �仂亠亟亳仆亠仆亳亠"
 
-#: ../libpurple/protocols/jabber/jabber.c:1591
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "�亠亟仂��舒�仂从 �亠����仂于"
 
-#: ../libpurple/protocols/jabber/jabber.c:1593
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "�亞�舒仆亳�亠仆仆�亶 XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1595
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "�弍�舒�亳�亠�� 从 亟��亞仂仄� �亰仍�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "��从仍��亠仆亳亠 �亳��亠仄�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "�亠仂仗�亠亟亠仍�仆仆仂亠 �仂��仂�仆亳亠"
 
-#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "�亠仗仂亟亟亠�亢亳于舒亠仄舒� 从仂亟亳�仂于从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1603
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr "�亠仗仂亟亟亠�亢亳于舒亠仄�亶 �亳仗 ���仂��"
 
-#: ../libpurple/protocols/jabber/jabber.c:1605
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "�亠仗仂亟亟亠�亢亳于舒亠仄舒� 于亠��亳�"
 
-#: ../libpurple/protocols/jabber/jabber.c:1607
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "XML 仆亠 ��仂�仄亳�仂于舒仆 亟仂仍亢仆�仄 仂弍�舒亰仂仄"
 
-#: ../libpurple/protocols/jabber/jabber.c:1609
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "��亳弍从舒 仗仂�仂从舒"
 
-#: ../libpurple/protocols/jabber/jabber.c:1676
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "�亠 �亟舒���� 于�亞仆舒�� 仗仂仍�亰仂于舒�亠仍� %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1696
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1701
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1720
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1727
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1780
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "�亠 �亟舒���� �亟舒仍亳�� 仗仂仍�亰仂于舒�亠仍� %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1811
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config:  �舒���仂亳�� 从仂仄仆舒��."
 
-#: ../libpurple/protocols/jabber/jabber.c:1815
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure:  �舒���仂亳�� 从仂仄仆舒��."
 
-#: ../libpurple/protocols/jabber/jabber.c:1824
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [从仂仄仆舒�舒]:  �仂从亳仆��� 从仂仄仆舒��."
 
+#: ../libpurple/protocols/jabber/jabber.c:1823
+msgid "register:  Register with a chat room."
+msgstr "register:  �舒�亠亞亳���亳�仂于舒�� 从仂仄仆舒��."
+
 #: ../libpurple/protocols/jabber/jabber.c:1829
-msgid "register:  Register with a chat room."
-msgstr "register:  �舒�亠亞亳���亳�仂于舒�� 从仂仄仆舒��."
-
-#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [仆仂于舒� �亠仄舒]:  ��仂�仄仂��亠�� 亳仍亳 亳亰仄亠仆亳�� �亠仄�."
 
-#: ../libpurple/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;仗仂仍�亰仂于舒�亠仍�&gt; [从仂仄仆舒�舒]:  ��亞仆舒�� 仗仂仍�亰仂于舒�亠仍� 亳亰 从仂仄仆舒��."
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1841
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
 msgstr ""
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr ""
 "invite &lt;仗仂仍�亰仂于舒�亠仍�&gt; [�仂仂弍�亠仆亳亠]:  ��亳亞仍舒�亳�� 仗仂仍�亰仂于舒�亠仍� 于 从仂仄仆舒��."
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;从仂仄仆舒�舒&gt; [�亠�于亠�]:  ��亳�仂亠亟亳仆亳���� 从 �舒�� 仆舒 ��仂仄 �亠�于亠�亠."
 
-#: ../libpurple/protocols/jabber/jabber.c:1871
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;仗仂仍�亰仂于舒�亠仍�&gt; [从仂仄仆舒�舒]:  丕亟舒仍亳�� 仗仂仍�亰仂于舒�亠仍� 亳亰 从仂仄仆舒��."
 
-#: ../libpurple/protocols/jabber/jabber.c:1876
+#: ../libpurple/protocols/jabber/jabber.c:1870
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
@@ -4983,33 +5031,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:166
-#: ../libpurple/protocols/jabber/libxmpp.c:168
+#: ../libpurple/protocols/jabber/libxmpp.c:169
+#: ../libpurple/protocols/jabber/libxmpp.c:171
 msgid "XMPP Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 XMPP"
 
 #. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
-#: ../libpurple/protocols/jabber/libxmpp.c:195 ../pidgin/gtkaccount.c:505
+#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
 msgid "Domain"
 msgstr "�仂仄亠仆"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:201
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Force old (port 5223) SSL"
 msgstr "��亳仆�亟亳�亠仍�仆仂 亳�仗仂仍�亰仂于舒�� ��舒��亶 (仗仂�� 5223) SSL"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:206
+#: ../libpurple/protocols/jabber/libxmpp.c:211
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "�舒亰�亠�亳�� 亳亟亠仆�亳�亳从舒�亳� 仗�仂���仄 �亠从��仂仄 �亠�亠亰 仆亠�亳��仂于舒仆仆�亠 仗仂�仂从亳"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:211
-#: ../libpurple/protocols/simple/simple.c:1856
+#: ../libpurple/protocols/jabber/libxmpp.c:216
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Connect port"
 msgstr "弌仂亠亟亳仆����� 仆舒 仗仂��"
 
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:215
-#: ../libpurple/protocols/silc/silc.c:1913
-#: ../libpurple/protocols/silc10/silc.c:1855 ../pidgin/gtkaccount.c:835
+#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/silc/silc.c:1914
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "弌仂亠亟亳仆����� � �亠�于亠�仂仄"
 
@@ -5051,16 +5099,16 @@
 msgid "XML Parse error"
 msgstr "��亳弍从舒 �舒亰弍仂�舒 XML"
 
-#: ../libpurple/protocols/jabber/presence.c:279
+#: ../libpurple/protocols/jabber/presence.c:290
 msgid "Unknown Error in presence"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/presence.c:353
-#: ../libpurple/protocols/jabber/presence.c:354
+#: ../libpurple/protocols/jabber/presence.c:364
+#: ../libpurple/protocols/jabber/presence.c:365
 msgid "Create New Room"
 msgstr "弌仂亰亟舒�� 仆仂于�� 从仂仄仆舒��"
 
-#: ../libpurple/protocols/jabber/presence.c:355
+#: ../libpurple/protocols/jabber/presence.c:366
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -5068,20 +5116,20 @@
 "�� �仂亰亟舒��亠 仆仂于�� 从仂仄仆舒��. 丱仂�亳�亠 仆舒���仂亳�� 亠� 亳仍亳 仗�亳仆��� ���舒仆仂于从亳 仗仂 "
 "�仄仂仍�舒仆亳�?"
 
-#: ../libpurple/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:372
 msgid "_Configure Room"
 msgstr "_�舒���仂亳�� 从仂仄仆舒��"
 
-#: ../libpurple/protocols/jabber/presence.c:362
+#: ../libpurple/protocols/jabber/presence.c:373
 msgid "_Accept Defaults"
 msgstr "_��亳仆��� ���舒仆仂于从亳 仗仂 �仄仂仍�舒仆亳�"
 
-#: ../libpurple/protocols/jabber/presence.c:399
+#: ../libpurple/protocols/jabber/presence.c:409
 #, c-format
 msgid "Error in chat %s"
 msgstr "��亳弍从舒 于 �舒�亠 %s"
 
-#: ../libpurple/protocols/jabber/presence.c:402
+#: ../libpurple/protocols/jabber/presence.c:412
 #, c-format
 msgid "Error joining chat %s"
 msgstr "��亳弍从舒 仗�亳�仂亠亟亳仆亠仆亳� 从 �舒�� %s"
@@ -5339,7 +5387,7 @@
 msgstr "弌亠�于亠� �仍亳�从仂仄 亰舒仆��"
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1363
+#: ../libpurple/protocols/oscar/oscar.c:1381
 #: ../libpurple/protocols/silc/silc.c:233
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
@@ -5515,32 +5563,32 @@
 msgstr "�亠 �亟舒仍仂�� �仂亠亟亳仆亳���� � �亠�于亠�仂仄."
 
 #: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "��亳弍从舒 亰舒亞��亰从亳 仗�仂�亳仍�"
 
 #: ../libpurple/protocols/msn/msn.c:1550 ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:448
+#: ../pidgin/plugins/pidginrc.c:366
 msgid "General"
 msgstr "��仆仂于仆�亠"
 
 #: ../libpurple/protocols/msn/msn.c:1557
-#: ../libpurple/protocols/oscar/oscar.c:3744
+#: ../libpurple/protocols/oscar/oscar.c:3764
 #: ../libpurple/protocols/qq/buddy_info.c:45
 #: ../libpurple/protocols/qq/qq.c:219
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1057
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "�仂亰�舒��"
 
 #: ../libpurple/protocols/msn/msn.c:1559
 #: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "�舒仆��仂���"
 
 #: ../libpurple/protocols/msn/msn.c:1560
 #: ../libpurple/protocols/novell/novell.c:1478
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1052
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
@@ -5562,7 +5610,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1590
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "��舒�仆�亶 ��舒���"
 
@@ -5596,7 +5644,7 @@
 
 #: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
 #: ../libpurple/protocols/msn/msn.c:1785
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "��弍亳仄舒� �亳�舒�舒"
 
@@ -5621,7 +5669,7 @@
 msgstr "�仂仄舒�仆亳亶 �亠仍亠�仂仆 2"
 
 #: ../libpurple/protocols/msn/msn.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:3782
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Home Address"
 msgstr "�仂仄舒�仆亳亶 舒亟�亠�"
 
@@ -5657,7 +5705,7 @@
 msgstr "�舒亰于舒仆亳亠 �舒弍仂��"
 
 #: ../libpurple/protocols/msn/msn.c:1647
-#: ../libpurple/protocols/oscar/oscar.c:3803
+#: ../libpurple/protocols/oscar/oscar.c:3823
 msgid "Company"
 msgstr "�仂仄仗舒仆亳�"
 
@@ -5679,7 +5727,7 @@
 msgstr "�舒弍仂�亳亶 �亠仍亠�仂仆 2"
 
 #: ../libpurple/protocols/msn/msn.c:1652
-#: ../libpurple/protocols/oscar/oscar.c:3795
+#: ../libpurple/protocols/oscar/oscar.c:3815
 msgid "Work Address"
 msgstr "�舒弍仂�亳亶 舒亟�亠�"
 
@@ -5741,7 +5789,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/msn/msn.c:1841
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "URL 仗�仂�亳仍�"
 
@@ -5786,8 +5834,8 @@
 #: ../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
+#: ../libpurple/protocols/yahoo/yahoochat.c:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Unable to connect"
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
 
@@ -5890,7 +5938,7 @@
 msgstr "��亳弍从舒 �舒亰弍仂�舒 HTTP."
 
 #: ../libpurple/protocols/msn/session.c:307
-#: ../libpurple/protocols/oscar/oscar.c:3456
+#: ../libpurple/protocols/oscar/flap_connection.c:384
 #: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "�� 仗仂亟从仍��亠仆� 亳亰 亟��亞仂亞仂 仄亠��舒."
@@ -5973,7 +6021,7 @@
 
 #: ../libpurple/protocols/msn/switchboard.c:424
 msgid ""
-"Message could not be sent because we wer unable to establish a session with "
+"Message could not be sent because we were unable to establish a session with "
 "the server. This is likely a server problem, try again in a few minutes:"
 msgstr ""
 
@@ -6256,7 +6304,7 @@
 msgstr ""
 
 #: ../libpurple/protocols/novell/novell.c:1502
-#: ../libpurple/protocols/sametime/sametime.c:4122
+#: ../libpurple/protocols/sametime/sametime.c:4123
 msgid "User ID"
 msgstr "�仂仍�亰仂于舒�亠仍��从亳亶 ID"
 
@@ -6373,7 +6421,7 @@
 msgid "Server port"
 msgstr "�仂�� �亠�于亠�舒"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:379
+#: ../libpurple/protocols/oscar/flap_connection.c:387
 #: ../libpurple/protocols/yahoo/yahoo.c:2292
 #: ../libpurple/protocols/yahoo/yahoo.c:2459
 #: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
@@ -6382,7 +6430,7 @@
 msgid "Server closed the connection."
 msgstr "弌亠�于亠� �舒亰仂�于舒仍 �仂亠亟亳仆亠仆亳亠."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:381
+#: ../libpurple/protocols/oscar/flap_connection.c:389
 #: ../libpurple/protocols/yahoo/yahoo.c:2286
 #: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
 #: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
@@ -6395,7 +6443,7 @@
 "弌仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄 仗仂�亠��仆仂:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/oscar/flap_connection.c:392
 #: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
 #: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
 #: ../libpurple/proxy.c:1461
@@ -6564,7 +6612,7 @@
 msgid "Not while on AOL"
 msgstr "�亠 于 AOL"
 
-#: ../libpurple/protocols/oscar/oscar.c:330
+#: ../libpurple/protocols/oscar/oscar.c:348
 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 "
@@ -6572,7 +6620,7 @@
 "your AIM/ICQ account.)"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:439
+#: ../libpurple/protocols/oscar/oscar.c:457
 #, c-format
 msgid ""
 "(There was an error receiving this message.  Either you and %s have "
@@ -6582,21 +6630,21 @@
 "从仂亟亳�仂于从亳, 仍亳弍仂 从仍亳亠仆� %s �仂亟亠�亢亳� 仂�亳弍从亳.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:621 ../pidgin/gtkutils.c:2309
-#: ../pidgin/gtkutils.c:2339
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:338
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2359
+#: ../pidgin/gtkutils.c:2389
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
 msgid "Buddy Icon"
 msgstr "�仆舒�仂从 �仂弍亠�亠亟仆亳从舒"
 
-#: ../libpurple/protocols/oscar/oscar.c:624
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "�仂仍仂�"
 
-#: ../libpurple/protocols/oscar/oscar.c:627
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠 AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:630
+#: ../libpurple/protocols/oscar/oscar.c:648
 #: ../libpurple/protocols/silc/silc.c:768
 #: ../libpurple/protocols/silc/util.c:553
 #: ../libpurple/protocols/silc10/silc.c:679
@@ -6604,124 +6652,124 @@
 msgid "Chat"
 msgstr "丼舒�"
 
-#: ../libpurple/protocols/oscar/oscar.c:633
-#: ../libpurple/protocols/oscar/oscar.c:5963
+#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get File"
 msgstr "�仂仍��亳�� �舒亶仍"
 
-#: ../libpurple/protocols/oscar/oscar.c:640
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "�亞��"
 
-#: ../libpurple/protocols/oscar/oscar.c:643
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "�仂仗仂仍仆亠仆亳�"
 
-#: ../libpurple/protocols/oscar/oscar.c:646
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "��仗�舒于亳�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../libpurple/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠 ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "�仂仍�亰仂于舒�亠仍� AP"
 
-#: ../libpurple/protocols/oscar/oscar.c:655
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "ICQ RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "�亳亞亳仍亳��"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
-msgid "ICQ Server Relay"
-msgstr "�亠仍亠亶仆�亶 �亠�于亠� ICQ"
-
-#: ../libpurple/protocols/oscar/oscar.c:664
-msgid "Old ICQ UTF8"
-msgstr "弌�舒��亶 ICQ UTF8"
-
-#: ../libpurple/protocols/oscar/oscar.c:667
-msgid "Trillian Encryption"
-msgstr "丿亳��仂于舒仆亳亠 Trillian"
-
-#: ../libpurple/protocols/oscar/oscar.c:670
-msgid "ICQ UTF8"
-msgstr "ICQ UTF8"
-
-#: ../libpurple/protocols/oscar/oscar.c:673
-msgid "Hiptop"
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:676
-msgid "Security Enabled"
-msgstr "�亠亰仂仗舒�仆仂��� 于从仍��亠仆舒"
-
 #: ../libpurple/protocols/oscar/oscar.c:679
+msgid "ICQ Server Relay"
+msgstr "�亠仍亠亶仆�亶 �亠�于亠� ICQ"
+
+#: ../libpurple/protocols/oscar/oscar.c:682
+msgid "Old ICQ UTF8"
+msgstr "弌�舒��亶 ICQ UTF8"
+
+#: ../libpurple/protocols/oscar/oscar.c:685
+msgid "Trillian Encryption"
+msgstr "丿亳��仂于舒仆亳亠 Trillian"
+
+#: ../libpurple/protocols/oscar/oscar.c:688
+msgid "ICQ UTF8"
+msgstr "ICQ UTF8"
+
+#: ../libpurple/protocols/oscar/oscar.c:691
+msgid "Hiptop"
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:694
+msgid "Security Enabled"
+msgstr "�亠亰仂仗舒�仆仂��� 于从仍��亠仆舒"
+
+#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "�亳亟亠仂�舒�"
 
-#: ../libpurple/protocols/oscar/oscar.c:683
+#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:686
+#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "�亳于仂亠 于亳亟亠仂"
 
-#: ../libpurple/protocols/oscar/oscar.c:689
+#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "�舒仄亠�舒"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
-#: ../libpurple/protocols/oscar/oscar.c:5733
+#: ../libpurple/protocols/oscar/oscar.c:725
+#: ../libpurple/protocols/oscar/oscar.c:5759
 msgid "Free For Chat"
 msgstr "�仂�仂于 仗仂仂弍�舒����"
 
-#: ../libpurple/protocols/oscar/oscar.c:711
-#: ../libpurple/protocols/oscar/oscar.c:5768
+#: ../libpurple/protocols/oscar/oscar.c:729
+#: ../libpurple/protocols/oscar/oscar.c:5794
 msgid "Not Available"
 msgstr "�亠亟仂���仗亠仆"
 
-#: ../libpurple/protocols/oscar/oscar.c:713
-#: ../libpurple/protocols/oscar/oscar.c:5754
+#: ../libpurple/protocols/oscar/oscar.c:731
+#: ../libpurple/protocols/oscar/oscar.c:5780
 msgid "Occupied"
 msgstr "�舒仆��"
 
-#: ../libpurple/protocols/oscar/oscar.c:717
+#: ../libpurple/protocols/oscar/oscar.c:735
 msgid "Web Aware"
 msgstr "弌�舒��� 仆舒 于亠弍-���舒仆亳�舒�"
 
-#: ../libpurple/protocols/oscar/oscar.c:719 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
 #: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1053
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
 msgid "Invisible"
 msgstr "�亠于亳亟亳仄�亶"
 
-#: ../libpurple/protocols/oscar/oscar.c:721
+#: ../libpurple/protocols/oscar/oscar.c:739
 msgid "Online"
 msgstr "� �亠�亳"
 
-#: ../libpurple/protocols/oscar/oscar.c:820
-#: ../libpurple/protocols/oscar/oscar.c:3696
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:697 ../pidgin/gtkprefs.c:1052
+#: ../libpurple/protocols/oscar/oscar.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3716
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1121
 msgid "IP Address"
 msgstr "IP-舒亟�亠�"
 
-#: ../libpurple/protocols/oscar/oscar.c:827
-#: ../libpurple/protocols/oscar/oscar.c:2848
+#: ../libpurple/protocols/oscar/oscar.c:845
+#: ../libpurple/protocols/oscar/oscar.c:2863
 msgid "Warning Level"
 msgstr "丕�仂于亠仆� 仗�亠亟�仗�亠亢亟亠仆亳�"
 
-#: ../libpurple/protocols/oscar/oscar.c:837
+#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "�仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒"
 
-#: ../libpurple/protocols/oscar/oscar.c:977
+#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -6730,7 +6778,7 @@
 "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠 � �亠�于亠�仂仄 舒��亠仆�亳�亳从舒�亳亳:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:985
+#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -6739,50 +6787,50 @@
 "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠 � BOS-�亠�于亠�仂仄:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1025
+#: ../libpurple/protocols/oscar/oscar.c:1043
 msgid "Screen name sent"
 msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仂�仗�舒于仍亠仆"
 
-#: ../libpurple/protocols/oscar/oscar.c:1030
+#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr "弌仂亠亟亳仆亠仆亳亠 ���舒仆仂于仍亠仆仂, 亟舒仆仆�亠 仂�仗�舒于仍亠仆�"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1059
+#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr "�舒于亠��亠仆亳亠 ���舒仆仂于仍亠仆亳� �仂亠亟亳仆亠仆亳�"
 
-#: ../libpurple/protocols/oscar/oscar.c:1243
+#: ../libpurple/protocols/oscar/oscar.c:1261
 #, c-format
 msgid ""
 "Unable to login: Could not sign on as %s because the screen name is "
-"invalid.  Screen names must either start with a letter and contain only "
-"letters, numbers and spaces, or contain only numbers."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:1328
+"invalid.  Screen names must be a valid email address, or start with a letter "
+"and contain only letters, numbers and spaces, or contain only numbers."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:1346
 #: ../libpurple/protocols/yahoo/yahoo.c:1934
 msgid "Invalid screen name."
 msgstr "�亠于亠�仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�."
 
-#: ../libpurple/protocols/oscar/oscar.c:1335
+#: ../libpurple/protocols/oscar/oscar.c:1353
 #: ../libpurple/protocols/qq/login_logout.c:483
-#: ../libpurple/protocols/simple/simple.c:1037
+#: ../libpurple/protocols/simple/simple.c:1039
 #: ../libpurple/protocols/yahoo/yahoo.c:1952
 msgid "Incorrect password."
 msgstr "�亠仗�舒于亳仍�仆�亶 仗舒�仂仍�."
 
-#: ../libpurple/protocols/oscar/oscar.c:1340
+#: ../libpurple/protocols/oscar/oscar.c:1358
 msgid "Your account is currently suspended."
 msgstr "�舒�舒 ����仆舒� 亰舒仗亳�� �亠亶�舒� 亰舒弍仍仂从亳�仂于舒仆舒."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1344
+#: ../libpurple/protocols/oscar/oscar.c:1362
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "弌仍�亢弍舒 AOL Instant Messenger 于�亠仄亠仆仆仂 仆亠亟仂���仗仆舒."
 
-#: ../libpurple/protocols/oscar/oscar.c:1349
-#: ../libpurple/protocols/oscar/oscar.c:1360
+#: ../libpurple/protocols/oscar/oscar.c:1367
+#: ../libpurple/protocols/oscar/oscar.c:1378
 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."
@@ -6790,44 +6838,44 @@
 "�� �仂亠亟亳仆�仍亳�� 亳 仂��仂亠亟亳仆�仍亳�� �仍亳�从仂仄 �舒��仂. �仂亟仂亢亟亳�亠 10 仄亳仆�� 亳 "
 "仗仂仗��舒亶�亠�� �仆仂于舒. ��仍亳 于� 仗�仂亟仂仍亢亳�亠 仗仂仗��从亳, 于舒仄 仗�亳亟���� 亢亟舒�� 亠�� 亟仂仍��亠."
 
-#: ../libpurple/protocols/oscar/oscar.c:1354
+#: ../libpurple/protocols/oscar/oscar.c:1372
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "�亠��亳� 从仍亳亠仆�舒, 从仂�仂�仂亶 于� 仗仂仍�亰�亠�亠��, �仍亳�从仂仄 ��舒�舒. �弍仆仂于亳�亠 亟仂 %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:1411
 msgid "Could Not Connect"
 msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
 
-#: ../libpurple/protocols/oscar/oscar.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:1415
 msgid "Received authorization"
 msgstr "�仂仍��亠仆舒 舒于�仂�亳亰舒�亳�"
 
-#: ../libpurple/protocols/oscar/oscar.c:1422
+#: ../libpurple/protocols/oscar/oscar.c:1437
 msgid "The SecurID key entered is invalid."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1436
+#: ../libpurple/protocols/oscar/oscar.c:1450
 msgid "Enter SecurID"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:1437
+#: ../libpurple/protocols/oscar/oscar.c:1451
 msgid "Enter the 6 digit number from the digital display."
 msgstr ""
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1439
-#: ../libpurple/protocols/oscar/oscar.c:2232
-#: ../libpurple/protocols/oscar/oscar.c:2279
-#: ../libpurple/protocols/oscar/oscar.c:5838
-#: ../libpurple/protocols/oscar/oscar.c:6119 ../libpurple/request.h:1387
+#: ../libpurple/protocols/oscar/oscar.c:1453
+#: ../libpurple/protocols/oscar/oscar.c:2246
+#: ../libpurple/protocols/oscar/oscar.c:2293
+#: ../libpurple/protocols/oscar/oscar.c:5864
+#: ../libpurple/protocols/oscar/oscar.c:6145 ../libpurple/request.h:1387
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1478
-#: ../libpurple/protocols/oscar/oscar.c:1521
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -6836,54 +6884,54 @@
 "弌仂亠亟亳仆亠仆亳亠 � 于舒仄亳 于�从仂�亠 仄仂亢亠� 弍��� �舒亰仂�于舒仆仂. �仂亰仄仂亢仆仂, 于� 亰舒�仂�亳�亠 "
 "亳�仗仂仍�亰仂于舒�� TOC, 仗仂从舒 ��仂 仆亠 弍�亟亠� 亳�仗�舒于仍亠仆仂. 弌仄仂��亳�亠 仂弍仆仂于仍亠仆亳� 仆舒 %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1481
-#: ../libpurple/protocols/oscar/oscar.c:1524
+#: ../libpurple/protocols/oscar/oscar.c:1495
+#: ../libpurple/protocols/oscar/oscar.c:1538
 msgid "Unable to get a valid AIM login hash."
 msgstr "�亠 �亟舒���� 仗仂仍��亳�� 亟仂仗���亳仄�亶 ��� 于�仂亟舒 AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:1609
+#: ../libpurple/protocols/oscar/oscar.c:1623
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr ""
 "弌仂亠亟亳仆亠仆亳亠 � 于舒仄亳 于�从仂�亠 仄仂亢亠� 弍��� �舒亰仂�于舒仆仂. 弌仄仂��亳�亠 仂弍仆仂于仍亠仆亳� 仆舒 %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1612
+#: ../libpurple/protocols/oscar/oscar.c:1626
 msgid "Unable to get a valid login hash."
 msgstr "�亠 �亟舒���� 仗仂仍��亳�� 亟仂仗���亳仄�亶 ��� 于�仂亟舒."
 
-#: ../libpurple/protocols/oscar/oscar.c:1641
+#: ../libpurple/protocols/oscar/oscar.c:1655
 msgid "Password sent"
 msgstr "�舒�仂仍� 仂�仗�舒于仍亠仆"
 
-#: ../libpurple/protocols/oscar/oscar.c:1697
+#: ../libpurple/protocols/oscar/oscar.c:1711
 msgid "Unable to initialize connection"
 msgstr "�亠 �亟舒���� 亳仆亳�亳舒仍亳亰亳�仂于舒�� �仂亠亟亳仆亠仆亳亠"
 
-#: ../libpurple/protocols/oscar/oscar.c:2202
+#: ../libpurple/protocols/oscar/oscar.c:2216
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2230
+#: ../libpurple/protocols/oscar/oscar.c:2244
 msgid "Authorization Request Message:"
 msgstr "弌仂仂弍�亠仆亳亠 亰舒仗�仂�舒 舒于�仂�亳亰舒�亳亳:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2245
 msgid "Please authorize me!"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:2271
-#: ../libpurple/protocols/oscar/oscar.c:2278
-#: ../libpurple/protocols/oscar/oscar.c:2405
-#: ../libpurple/protocols/oscar/oscar.c:5216
+#: ../libpurple/protocols/oscar/oscar.c:2285
+#: ../libpurple/protocols/oscar/oscar.c:2292
+#: ../libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:5242
 #: ../libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "��亳�亳仆舒 仆亠 �从舒亰舒仆舒."
 
-#: ../libpurple/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:2291
 msgid "Authorization Denied Message:"
 msgstr "弌仂仂弍�亠仆亳亠 仂�从舒亰舒 于 舒于�仂�亳亰舒�亳亳:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2419
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
@@ -6894,18 +6942,18 @@
 "�仍亠亟���亠亶 仗�亳�亳仆亠:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2406
+#: ../libpurple/protocols/oscar/oscar.c:2420
 msgid "ICQ authorization denied."
 msgstr "� 舒于�仂�亳亰舒�亳亳 ICQ 仂�从舒亰舒仆仂."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2413
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
 msgstr ""
 "�仂仍�亰仂于舒�亠仍� %u 亟舒仍 �于仂� �仂亞仍舒�亳亠 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于."
 
-#: ../libpurple/protocols/oscar/oscar.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -6918,7 +6966,7 @@
 "��: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2429
+#: ../libpurple/protocols/oscar/oscar.c:2443
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -6931,7 +6979,7 @@
 "��: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2437
+#: ../libpurple/protocols/oscar/oscar.c:2451
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -6944,24 +6992,24 @@
 "弌仂仂弍�亠仆亳亠:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2458
+#: ../libpurple/protocols/oscar/oscar.c:2472
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "�仂仍�亰仂于舒�亠仍� ICQ %u 仂�仗�舒于亳仍 于舒仄 �仂弍亠�亠亟仆亳从舒: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2464
+#: ../libpurple/protocols/oscar/oscar.c:2478
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "丱仂�亳�亠 亟仂弍舒于亳�� ��仂亞仂 �仂弍亠�亠亟仆亳从舒 于 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2469 ../pidgin/gtkroomlist.c:308
+#: ../libpurple/protocols/oscar/oscar.c:2483 ../pidgin/gtkroomlist.c:308
 msgid "_Add"
 msgstr "_�仂弍舒于亳��"
 
-#: ../libpurple/protocols/oscar/oscar.c:2470
+#: ../libpurple/protocols/oscar/oscar.c:2484
 msgid "_Decline"
 msgstr "_��从仍仂仆亳��"
 
-#: ../libpurple/protocols/oscar/oscar.c:2554
+#: ../libpurple/protocols/oscar/oscar.c:2568
 #, 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."
@@ -6969,7 +7017,7 @@
 msgstr[1] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳� 仂� %s, �舒从 从舒从 仂仆亳 弍�仍亳 仆亠从仂��亠从�仆�."
 msgstr[2] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, �舒从 从舒从 仂仆亳 弍�仍亳 仆亠从仂��亠从�仆�."
 
-#: ../libpurple/protocols/oscar/oscar.c:2563
+#: ../libpurple/protocols/oscar/oscar.c:2577
 #, 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."
@@ -6980,7 +7028,7 @@
 msgstr[2] ""
 "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, �舒从 从舒从 仂仆亳 弍�仍亳 �仍亳�从仂仄 于亠仍亳从亳."
 
-#: ../libpurple/protocols/oscar/oscar.c:2572
+#: ../libpurple/protocols/oscar/oscar.c:2586
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -6993,7 +7041,7 @@
 msgstr[2] ""
 "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, �舒从 从舒从 弍�仍 仗�亠于��亠仆 仗�亠亟亠仍 仂�亠仆从亳."
 
-#: ../libpurple/protocols/oscar/oscar.c:2581
+#: ../libpurple/protocols/oscar/oscar.c:2595
 #, 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."
@@ -7004,7 +7052,7 @@
 msgstr[2] ""
 "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, 仗仂�仂仄� ��仂 仂仆 �仍亳�从仂仄 仆舒亟仂亠亟仍亳于."
 
-#: ../libpurple/protocols/oscar/oscar.c:2590
+#: ../libpurple/protocols/oscar/oscar.c:2604
 #, 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."
@@ -7015,7 +7063,7 @@
 msgstr[2] ""
 "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s, 仗仂�仂仄� ��仂 于� �仍亳�从仂仄 仆舒亟仂亠亟仍亳于�."
 
-#: ../libpurple/protocols/oscar/oscar.c:2599
+#: ../libpurple/protocols/oscar/oscar.c:2613
 #, 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."
@@ -7024,61 +7072,55 @@
 msgstr[2] "�� 仆亠 仗仂仍��亳仍亳 %hu �仂仂弍�亠仆亳亶 仂� %s 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2754
+#: ../libpurple/protocols/oscar/oscar.c:2768
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2754
-#: ../libpurple/protocols/oscar/oscar.c:2759
-#: ../libpurple/protocols/oscar/oscar.c:2821
-#: ../libpurple/protocols/oscar/oscar.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2768
+#: ../libpurple/protocols/oscar/oscar.c:2773
+#: ../libpurple/protocols/oscar/oscar.c:2837
 msgid "Unknown reason."
 msgstr "��亳�亳仆舒 仆亠亳亰于亠��仆舒."
 
-#: ../libpurple/protocols/oscar/oscar.c:2757
+#: ../libpurple/protocols/oscar/oscar.c:2771
 #: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� �仂仂弍�亠仆亳亠 亟仍� %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2821
+#: ../libpurple/protocols/oscar/oscar.c:2837
 #, c-format
 msgid "User information not available: %s"
 msgstr "�仂仍�亰仂于舒�亠仍��从舒� 亳仆�仂�仄舒�亳� 仆亠亟仂���仗仆舒: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2824
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "�仂仍�亰仂于舒�亠仍��从舒� 亳仆�仂�仄舒�亳� 亟仍� %s 仆亠亟仂���仗仆舒:"
-
-#: ../libpurple/protocols/oscar/oscar.c:2853
+#: ../libpurple/protocols/oscar/oscar.c:2868
 msgid "Online Since"
 msgstr "� �亠�亳 �"
 
-#: ../libpurple/protocols/oscar/oscar.c:2858
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2873
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "丼仍亠仆 �"
 
-#: ../libpurple/protocols/oscar/oscar.c:2863
+#: ../libpurple/protocols/oscar/oscar.c:2878
 msgid "Capabilities"
 msgstr "�仂亰仄仂亢仆仂��亳"
 
-#: ../libpurple/protocols/oscar/oscar.c:2893
+#: ../libpurple/protocols/oscar/oscar.c:2908
 msgid "Available Message"
 msgstr "弌�舒���仆仂亠 �仂仂弍�亠仆亳亠"
 
-#: ../libpurple/protocols/oscar/oscar.c:2919
+#: ../libpurple/protocols/oscar/oscar.c:2936
 msgid "Profile"
 msgstr "��仂�亳仍�"
 
-#: ../libpurple/protocols/oscar/oscar.c:2996
+#: ../libpurple/protocols/oscar/oscar.c:3016
 msgid "Your AIM connection may be lost."
 msgstr "�舒�亠 �仂亠亟亳仆亠仆亳亠 AIM 仄仂亢亠� 弍��� 仗仂�亠��仆仂."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3183
+#: ../libpurple/protocols/oscar/oscar.c:3204
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
@@ -7086,7 +7128,7 @@
 "[�亠 �亟舒���� 仂�仂弍�舒亰亳�� �仂仂弍�亠仆亳亠 仂� ��仂亞仂 仗仂仍�亰仂于舒�亠仍�, �舒从 从舒从 仂仆仂 �仂亟亠�亢亳� "
 "仆亠亟仂仗���亳仄�亠 �亳仄于仂仍�.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3386
+#: ../libpurple/protocols/oscar/oscar.c:3407
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -7094,57 +7136,53 @@
 "�仂�仍亠亟仆亠亠 仗�亠亟仗�亳仆��仂亠 于舒仄亳 亟亠亶��于亳亠 仆亠 仄仂亢亠� 弍��� 于�仗仂仍仆亠仆仂, �舒从 从舒从 于� "
 "仗�亠于��亳仍亳 仗�亠亟亠仍. �仂亟仂亢亟亳�亠 10 �亠从�仆亟 亳 仗仂仗��舒亶�亠�� �仆仂于舒."
 
-#: ../libpurple/protocols/oscar/oscar.c:3458
-msgid "You have been signed off for an unknown reason."
-msgstr "�� 弍�仍亳 仂�从仍��亠仆� 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."
-
-#: ../libpurple/protocols/oscar/oscar.c:3471
+#: ../libpurple/protocols/oscar/oscar.c:3490
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "�� 弍�仍亳 仂��仂亠亟亳仆亠仆� 仂� �舒�舒 %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3718
+#: ../libpurple/protocols/oscar/oscar.c:3738
 #: ../libpurple/protocols/silc/util.c:585
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "�仂弍亳仍�仆�亶 �亠仍亠�仂仆"
 
-#: ../libpurple/protocols/oscar/oscar.c:3748
+#: ../libpurple/protocols/oscar/oscar.c:3768
 msgid "Personal Web Page"
 msgstr "�亠��仂仆舒仍�仆舒� Web-���舒仆亳�舒"
 
-#: ../libpurple/protocols/oscar/oscar.c:3772
+#: ../libpurple/protocols/oscar/oscar.c:3792
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "�仂仗仂仍仆亳�亠仍�仆舒� 亳仆�仂�仄舒�亳�"
 
-#: ../libpurple/protocols/oscar/oscar.c:3780
-#: ../libpurple/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3813
 msgid "Zip Code"
 msgstr "�仆亟亠从�"
 
-#: ../libpurple/protocols/oscar/oscar.c:3804
+#: ../libpurple/protocols/oscar/oscar.c:3824
 msgid "Division"
 msgstr "��亟亠仍"
 
-#: ../libpurple/protocols/oscar/oscar.c:3805
+#: ../libpurple/protocols/oscar/oscar.c:3825
 msgid "Position"
 msgstr "�仂仍亢仆仂���"
 
-#: ../libpurple/protocols/oscar/oscar.c:3807
+#: ../libpurple/protocols/oscar/oscar.c:3827
 msgid "Web Page"
 msgstr "Web-���舒仆亳�舒"
 
-#: ../libpurple/protocols/oscar/oscar.c:3810
+#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Work Information"
 msgstr "�仆�仂�仄舒�亳� 仂 �舒弍仂�亠"
 
-#: ../libpurple/protocols/oscar/oscar.c:3866
+#: ../libpurple/protocols/oscar/oscar.c:3886
 msgid "Pop-Up Message"
 msgstr "��仗仍�于舒��亠亠 �仂仂弍�亠仆亳亠"
 
-#: ../libpurple/protocols/oscar/oscar.c:3906
+#: ../libpurple/protocols/oscar/oscar.c:3926
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
@@ -7152,29 +7190,29 @@
 msgstr[1] "弌仍亠亟���亳亠 亳亟亠仆�亳�亳从舒�仂�� 仗仂仍�亰仂于舒�亠仍亠亶 �仂仂�仆亠�亠仆� � %s"
 msgstr[2] "弌仍亠亟���亳亠 亳亟亠仆�亳�亳从舒�仂�� 仗仂仍�亰仂于舒�亠仍亠亶 �仂仂�仆亠�亠仆� � %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3911
+#: ../libpurple/protocols/oscar/oscar.c:3931
 msgid "Screen name"
 msgstr "�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../libpurple/protocols/oscar/oscar.c:3937
+#: ../libpurple/protocols/oscar/oscar.c:3957
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "�亳�亠亞仂 仆亠 仆舒亶亟亠仆仂 亟仍� 舒亟�亠�舒 e-mail %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3958
+#: ../libpurple/protocols/oscar/oscar.c:3978
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "�� 亟仂仍亢仆� 仗仂仍��亳�� e-mail � 仗�仂��弍仂亶 仗仂亟�于亠�亟亳�� %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3960
+#: ../libpurple/protocols/oscar/oscar.c:3980
 msgid "Account Confirmation Requested"
 msgstr "�舒仗�仂�亠仆仂 仗仂亟�于亠�亢亟亠仆亳亠 ����仆仂亶 亰舒仗亳�亳"
 
-#: ../libpurple/protocols/oscar/oscar.c:3991
+#: ../libpurple/protocols/oscar/oscar.c:4011
 msgid "Error Changing Account Info"
 msgstr "��亳弍从舒 亳亰仄亠仆亠仆亳� 亳仆�仂�仄舒�亳亳 仂弍 ����仆仂亶 亰舒仗亳�亳"
 
-#: ../libpurple/protocols/oscar/oscar.c:3994
+#: ../libpurple/protocols/oscar/oscar.c:4014
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7183,14 +7221,14 @@
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 仂��仂�仄舒�亳�仂于舒�� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�, �舒从 "
 "从舒从 亰舒仗�仂�亠仆仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 仂�仍亳�舒亠��� 仂� 仂�亳亞亳仆舒仍�仆仂亞仂."
 
-#: ../libpurple/protocols/oscar/oscar.c:3997
+#: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 仂��仂�仄舒�亳�仂于舒�� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�, �舒从 "
 "从舒从 仂仆 仆亠亟仂仗���亳仄."
 
-#: ../libpurple/protocols/oscar/oscar.c:4000
+#: ../libpurple/protocols/oscar/oscar.c:4020
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -7199,7 +7237,7 @@
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 仂��仂�仄舒�亳�仂于舒�� 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�, �舒从 "
 "从舒从 亰舒仗�仂�亠仆仆�亶 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� �仍亳�从仂仄 于亠仍亳从."
 
-#: ../libpurple/protocols/oscar/oscar.c:4003
+#: ../libpurple/protocols/oscar/oscar.c:4023
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -7208,7 +7246,7 @@
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 亳亰仄亠仆亳�� 舒亟�亠� e-mail, �舒从 从舒从 亟仍� ��仂亞仂 "
 "亳亟亠仆�亳�亳从舒�仂�舒 仗仂仍�亰仂于舒�亠仍� �亢亠 亠��� 仂亢亳亟舒��亳亶 亰舒仗�仂�."
 
-#: ../libpurple/protocols/oscar/oscar.c:4006
+#: ../libpurple/protocols/oscar/oscar.c:4026
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -7217,7 +7255,7 @@
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 亳亰仄亠仆亳�� 舒亟�亠� e-mail, �舒从 从舒从 � 亰舒亟舒仆仆�仄 舒亟�亠�仂仄 "
 "�仂仂�仆亠�亠仆仂 �仍亳�从仂仄 仄仆仂亞仂 亳亟亠仆�亳�亳从舒�仂�仂于 仗仂仍�亰仂于舒�亠仍亠亶."
 
-#: ../libpurple/protocols/oscar/oscar.c:4009
+#: ../libpurple/protocols/oscar/oscar.c:4029
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -7226,32 +7264,32 @@
 "��亳弍从舒 0x%04x: �亠 �亟舒���� 亳亰仄亠仆亳�� 舒亟�亠� e-mail, �舒从 从舒从 亰舒亟舒仆仆�亶 舒亟�亠� "
 "仆亠于亠�亠仆."
 
-#: ../libpurple/protocols/oscar/oscar.c:4012
+#: ../libpurple/protocols/oscar/oscar.c:4032
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "��亳弍从舒 0x%04x: �亠亳亰于亠��仆舒� 仂�亳弍从舒."
 
-#: ../libpurple/protocols/oscar/oscar.c:4022
+#: ../libpurple/protocols/oscar/oscar.c:4042
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "�亟�亠� e-mail 亟仍� %s: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4024
+#: ../libpurple/protocols/oscar/oscar.c:4044
 msgid "Account Info"
 msgstr "�仆�仂�仄舒�亳� 仂弍 ����仆仂亶 亰舒仗亳�亳"
 
-#: ../libpurple/protocols/oscar/oscar.c:4196
+#: ../libpurple/protocols/oscar/oscar.c:4216
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "�舒�亠 亳亰仂弍�舒亢亠仆亳亠 仆亠 弍�仍仂 仂�仗�舒于仍亠仆仂. �� 亟仂仍亢仆� 亳仄亠�� 仗��仄仂亠 �仂亠亟亳仆亠仆亳亠 亟仍� "
 "仂�仗�舒于从亳 亳亰仂弍�舒亢亠仆亳亶."
 
-#: ../libpurple/protocols/oscar/oscar.c:4462
+#: ../libpurple/protocols/oscar/oscar.c:4487
 msgid "Unable to set AIM profile."
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� 仗�仂�亳仍� AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:4463
+#: ../libpurple/protocols/oscar/oscar.c:4488
 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 "
@@ -7261,7 +7299,7 @@
 "于�仂亟舒. �舒� 仗�仂�亳仍� 仂��舒���� 仆亠���舒仆仂于仍亠仆仆�仄; 仗仂仗��舒亶�亠�� ���舒仆仂于亳�� 亠亞仂 亠�� "
 "�舒亰, 从仂亞亟舒 弍�亟亠�亠 仗仂仍仆仂���� 仗仂亟从仍��亠仆�."
 
-#: ../libpurple/protocols/oscar/oscar.c:4477
+#: ../libpurple/protocols/oscar/oscar.c:4502
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -7276,11 +7314,11 @@
 msgstr[2] ""
 "�舒从�亳仄舒仍�仆�亶 �舒亰仄亠� 仗�仂�亳仍� 于 %d 弍舒亶� 弍�仍 仗�亠于��亠仆. ��仂�亳仍� 弍�仍 ��亠亰舒仆."
 
-#: ../libpurple/protocols/oscar/oscar.c:4482
+#: ../libpurple/protocols/oscar/oscar.c:4507
 msgid "Profile too long."
 msgstr "��仂�亳仍� �仍亳�从仂仄 于亠仍亳从."
 
-#: ../libpurple/protocols/oscar/oscar.c:4527
+#: ../libpurple/protocols/oscar/oscar.c:4552
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -7298,29 +7336,29 @@
 "�舒从�亳仄舒仍�仆�亶 �舒亰仄亠� �仂仂弍�亠仆亳� 仂弍 仂������于亳亳 于 %d 弍舒亶� 弍�仍 仗�亠于��亠仆. "
 "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳 弍�仍仂 ��亠亰舒仆仂."
 
-#: ../libpurple/protocols/oscar/oscar.c:4532
+#: ../libpurple/protocols/oscar/oscar.c:4557
 msgid "Away message too long."
 msgstr "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳 �仍亳�从仂仄 于亠仍亳从仂."
 
-#: ../libpurple/protocols/oscar/oscar.c:4601
+#: ../libpurple/protocols/oscar/oscar.c:4626
 #, c-format
 msgid ""
 "Could not add the buddy %s because the screen name is invalid.  Screen names "
-"must either start with a letter and contain only letters, numbers and "
-"spaces, or contain only numbers."
-msgstr ""
-
-#: ../libpurple/protocols/oscar/oscar.c:4603
-#: ../libpurple/protocols/oscar/oscar.c:5026
-#: ../libpurple/protocols/oscar/oscar.c:5040
+"must be a valid email address, or start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
+msgstr ""
+
+#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:5051
+#: ../libpurple/protocols/oscar/oscar.c:5066
 msgid "Unable To Add"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳��"
 
-#: ../libpurple/protocols/oscar/oscar.c:4707
+#: ../libpurple/protocols/oscar/oscar.c:4732
 msgid "Unable To Retrieve Buddy List"
 msgstr "�亠 �亟舒���� 亰舒亞��亰亳�� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../libpurple/protocols/oscar/oscar.c:4708
+#: ../libpurple/protocols/oscar/oscar.c:4733
 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."
@@ -7329,16 +7367,16 @@
 "�仂弍亠�亠亟仆亳从仂于 仆亠 仗仂�亠��仆 亳, 于亠�仂��仆仂, ��舒仆亠� 亟仂���仗亠仆 于 �亠�亠仆亳亠 仆亠�从仂仍�从亳� "
 "�舒�仂于."
 
-#: ../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:4937
+#: ../libpurple/protocols/oscar/oscar.c:4938
+#: ../libpurple/protocols/oscar/oscar.c:4943
+#: ../libpurple/protocols/oscar/oscar.c:5120
+#: ../libpurple/protocols/oscar/oscar.c:5121
+#: ../libpurple/protocols/oscar/oscar.c:5126
 msgid "Orphans"
 msgstr "弌亳�仂��"
 
-#: ../libpurple/protocols/oscar/oscar.c:5024
+#: ../libpurple/protocols/oscar/oscar.c:5049
 #, c-format
 msgid ""
 "Could not add the buddy %s because you have too many buddies in your buddy "
@@ -7347,23 +7385,17 @@
 "�亠 �亟舒仍仂�� 亟仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒 %s, �舒从 从舒从 于 �仗亳�从亠 �仂弍亠�亠亟仆亳从仂于 �仍亳�从仂仄 "
 "仄仆仂亞仂 �仂弍亠�亠亟仆亳从仂于. 丕亟舒仍亳�亠 仂亟亳仆 亳 仗仂仗��舒亶�亠�� �仆仂于舒."
 
-#: ../libpurple/protocols/oscar/oscar.c:5024
-#: ../libpurple/protocols/oscar/oscar.c:5038
+#: ../libpurple/protocols/oscar/oscar.c:5049
+#: ../libpurple/protocols/oscar/oscar.c:5064
 msgid "(no name)"
 msgstr "(仆亠� 亳仄亠仆亳)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5038
-#, 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 ""
-"�亠 �亟舒仍仂�� 亟仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒 %s 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠. �舒亳弍仂仍亠亠 �舒��仂亶 "
-"仗�亳�亳仆仂亶 ��仂亞仂 �于仍�亠��� �仂, ��仂 于� 亳仄亠亠�亠 仄舒从�亳仄舒仍�仆仂亠 从仂仍亳�亠��于仂 亟仂仗���亳仄�� "
-"�仂弍亠�亠亟仆亳从仂于 于 �仗亳�从亠 �仂弍亠�亠亟仆亳从仂于."
-
-#: ../libpurple/protocols/oscar/oscar.c:5131
+#: ../libpurple/protocols/oscar/oscar.c:5063
+#, c-format
+msgid "Could not add the buddy %s for an unknown reason."
+msgstr "�亠 �亟舒仍仂�� 亟仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒 %s 仗仂 仆亠亳亰于亠��仆仂亶 仗�亳�亳仆亠."
+
+#: ../libpurple/protocols/oscar/oscar.c:5157
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
@@ -7372,22 +7404,22 @@
 "�仂仍�亰仂于舒�亠仍� %s �舒亰�亠�亳仍 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于. 丱仂�亳�亠 "
 "亟仂弍舒于亳�� 亠亞仂?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5139
+#: ../libpurple/protocols/oscar/oscar.c:5165
 msgid "Authorization Given"
 msgstr "�于�仂�亳亰舒�亳� 亟舒仆舒"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5212
+#: ../libpurple/protocols/oscar/oscar.c:5238
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
 msgstr "�仂仍�亰仂于舒�亠仍� %s �舒亰�亠�亳仍 亟仂弍舒于亳�� 亠亞仂 于 于舒� �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于."
 
-#: ../libpurple/protocols/oscar/oscar.c:5213
+#: ../libpurple/protocols/oscar/oscar.c:5239
 msgid "Authorization Granted"
 msgstr "�于�仂�亳亰舒�亳� 亟舒仆舒"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5216
+#: ../libpurple/protocols/oscar/oscar.c:5242
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
@@ -7398,53 +7430,53 @@
 "�仍亠亟���亠亶 仗�亳�亳仆亠:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5217
+#: ../libpurple/protocols/oscar/oscar.c:5243
 msgid "Authorization Denied"
 msgstr "� 舒于�仂�亳亰舒�亳亳 仂�从舒亰舒仆仂"
 
-#: ../libpurple/protocols/oscar/oscar.c:5253
+#: ../libpurple/protocols/oscar/oscar.c:5279
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_�弍仄亠仆:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5293
+#: ../libpurple/protocols/oscar/oscar.c:5319
 msgid "Invalid chat name specified."
 msgstr "丕从舒亰舒仆仂 仆亠于亠�仆仂亠 亳仄� �舒�舒."
 
-#: ../libpurple/protocols/oscar/oscar.c:5362
+#: ../libpurple/protocols/oscar/oscar.c:5388
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "�亰仂弍�舒亢亠仆亳亠 仆亠 弍�仍仂 仂�仗�舒于仍亠仆仂. �� 仆亠 仄仂亢亠�亠 仂�仗�舒于仍��� 亳亰仂弍�舒亢亠仆亳� 于 �舒�舒� "
 "AIM."
 
-#: ../libpurple/protocols/oscar/oscar.c:5522
-#: ../libpurple/protocols/oscar/oscar.c:5527
+#: ../libpurple/protocols/oscar/oscar.c:5548
+#: ../libpurple/protocols/oscar/oscar.c:5553
 msgid "Away Message"
 msgstr "弌仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
 
-#: ../libpurple/protocols/oscar/oscar.c:5527
+#: ../libpurple/protocols/oscar/oscar.c:5553
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(亰舒亞��亰从舒)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5727
+#: ../libpurple/protocols/oscar/oscar.c:5753
 msgid "iTunes Music Store Link"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:5835
+#: ../libpurple/protocols/oscar/oscar.c:5861
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "�仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒 亟仍� %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5836
+#: ../libpurple/protocols/oscar/oscar.c:5862
 msgid "Buddy Comment:"
 msgstr "�仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5883
+#: ../libpurple/protocols/oscar/oscar.c:5909
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "�� 于�弍�舒仍亳 仂�从���亳亠 仗��仄仂亞仂 �仂亠亟亳仆亠仆亳� � %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:5887
+#: ../libpurple/protocols/oscar/oscar.c:5913
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -7452,65 +7484,66 @@
 "丐舒从 从舒从 ��仂 �舒�从�仂亠� 于舒� IP-舒亟�亠�, ��仂 仄仂亢仆仂 ��亳�舒�� �亞�仂亰仂亶 弍亠亰仂仗舒�仆仂��亳. "
 "丱仂�亳�亠 仗�仂亟仂仍亢亳��?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5893
+#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/oscar/peer.c:1022
 msgid "C_onnect"
 msgstr "_丕��舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
 
-#: ../libpurple/protocols/oscar/oscar.c:5928
+#: ../libpurple/protocols/oscar/oscar.c:5954
 msgid "Get AIM Info"
 msgstr "�仂仍��亳�� 亳仆�仂�仄舒�亳� AIM"
 
-#: ../libpurple/protocols/oscar/oscar.c:5934
+#: ../libpurple/protocols/oscar/oscar.c:5960
 msgid "Edit Buddy Comment"
 msgstr "�亰仄亠仆亳�� 从仂仄仄亠仆�舒�亳亶 �仂弍亠�亠亟仆亳从舒"
 
-#: ../libpurple/protocols/oscar/oscar.c:5942
+#: ../libpurple/protocols/oscar/oscar.c:5968
 msgid "Get Status Msg"
 msgstr "�仂仍��亳�� �仂仂弍�亠仆亳亠 仂 ��舒���亠"
 
-#: ../libpurple/protocols/oscar/oscar.c:5955
+#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Direct IM"
 msgstr "���仄仂亠 �仂亠亟亳仆亠仆亳亠"
 
-#: ../libpurple/protocols/oscar/oscar.c:5977
+#: ../libpurple/protocols/oscar/oscar.c:6003
 msgid "Re-request Authorization"
 msgstr "�仂于�仂�仆�亶 亰舒仗�仂� 舒于�仂�亳亰舒�亳亳"
 
-#: ../libpurple/protocols/oscar/oscar.c:6036
+#: ../libpurple/protocols/oscar/oscar.c:6062
 msgid "Require authorization"
 msgstr "丐�亠弍仂于舒�� 舒于�仂�亳亰舒�亳�"
 
-#: ../libpurple/protocols/oscar/oscar.c:6039
+#: ../libpurple/protocols/oscar/oscar.c:6065
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "弌�舒��� 仆舒 于亠弍-���舒仆亳�舒� (于�亰�于舒亠� 仗仂�于仍亠仆亳亠 弌����!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6044
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "ICQ Privacy Options"
 msgstr "�舒�舒仄亠��� 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳 ICQ"
 
-#: ../libpurple/protocols/oscar/oscar.c:6063
+#: ../libpurple/protocols/oscar/oscar.c:6089
 msgid "The new formatting is invalid."
 msgstr "�仂于仂亠 �仂�仄舒�亳�仂于舒仆亳亠 仆亠亟仂仗���亳仄仂."
 
-#: ../libpurple/protocols/oscar/oscar.c:6064
+#: ../libpurple/protocols/oscar/oscar.c:6090
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "个仂�仄舒�亳�仂于舒仆亳亠 亳亟亠仆�亳�亳从舒�仂�舒 仗仂仍�亰仂于舒�亠仍� 仄仂亢亠� 于仍亳��� �仂仍�从仂 仆舒 �亠亞亳��� "
 "弍�从于 亳 仗�仂弍亠仍�."
 
-#: ../libpurple/protocols/oscar/oscar.c:6117
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Change Address To:"
 msgstr "�亰仄亠仆亳�� 舒亟�亠� 仆舒:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6163
+#: ../libpurple/protocols/oscar/oscar.c:6189
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>于� 仆亠 仂亢亳亟舒亠�亠 舒于�仂�亳亰舒�亳�</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6166
+#: ../libpurple/protocols/oscar/oscar.c:6192
 msgid "You are awaiting authorization from the following buddies"
 msgstr "�� 仂亢亳亟舒亠�亠 舒于�仂�亳亰舒�亳� 仂� �仍亠亟���亳� �仂弍亠�亠亟仆亳从仂于"
 
-#: ../libpurple/protocols/oscar/oscar.c:6167
+#: ../libpurple/protocols/oscar/oscar.c:6193
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -7518,73 +7551,73 @@
 "�� 仄仂亢亠�亠 亰舒仗�仂�亳�� 舒于�仂�亳亰舒�亳� 仂� ��亳� �仂弍亠�亠亟仆亳从仂于 仗仂于�仂�仆仂, ��仍从仆�于 仆舒 "
 "仆亳� 仗�舒于仂亶 从仆仂仗从仂亶 仄��亳 亳 于�弍�舒于 \"�仂于�仂�仆�亶 亰舒仗�仂� 舒于�仂�亳亰舒�亳亳\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:6184
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "Find Buddy by E-Mail"
 msgstr "�舒亶�亳 �仂弍亠�亠亟仆亳从舒 仗仂 e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6185
+#: ../libpurple/protocols/oscar/oscar.c:6211
 msgid "Search for a buddy by e-mail address"
 msgstr "��从舒�� �仂弍亠�亠亟仆亳从舒 仗仂 舒亟�亠�� e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6186
+#: ../libpurple/protocols/oscar/oscar.c:6212
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "�于亠亟亳�亠 舒亟�亠� e-mail �仂弍亠�亠亟仆亳从舒, 从仂�仂�仂亞仂 于� 亳�亠�亠."
 
-#: ../libpurple/protocols/oscar/oscar.c:6189
+#: ../libpurple/protocols/oscar/oscar.c:6215
 msgid "_Search"
 msgstr "_��从舒��"
 
-#: ../libpurple/protocols/oscar/oscar.c:6347
+#: ../libpurple/protocols/oscar/oscar.c:6373
 msgid "Set User Info (URL)..."
 msgstr "丕��舒仆仂于亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳� (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6358
+#: ../libpurple/protocols/oscar/oscar.c:6384
 msgid "Change Password (URL)"
 msgstr "�亰仄亠仆亳�� 仗舒�仂仍� (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6362
+#: ../libpurple/protocols/oscar/oscar.c:6388
 msgid "Configure IM Forwarding (URL)"
 msgstr "�舒���仂亳�� 仗亠�亠仆舒仗�舒于仍亠仆亳亠 �仂仂弍�亠仆亳亶 (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6372
+#: ../libpurple/protocols/oscar/oscar.c:6398
 msgid "Set Privacy Options..."
 msgstr "丕��舒仆仂于亳�� 仗舒�舒仄亠��� 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6379
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Confirm Account"
 msgstr "�仂亟�于亠�亟亳�� ����仆�� 亰舒仗亳��"
 
-#: ../libpurple/protocols/oscar/oscar.c:6383
+#: ../libpurple/protocols/oscar/oscar.c:6409
 msgid "Display Currently Registered E-Mail Address"
 msgstr "�仂从舒亰舒�� �亠从��亳亶 亰舒�亠亞亳���亳�仂于舒仆仆�亶 舒亟�亠� e-mail"
 
-#: ../libpurple/protocols/oscar/oscar.c:6387
+#: ../libpurple/protocols/oscar/oscar.c:6413
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "�亰仄亠仆亳�� �亠从��亳亶 亰舒�亠亞亳���亳�仂于舒仆仆�亶 舒亟�亠� e-mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6420
 msgid "Show Buddies Awaiting Authorization"
 msgstr "�仂从舒亰舒�� �仂弍亠�亠亟仆亳从仂于 弍亠亰 舒于�仂�亳亰舒�亳亳"
 
-#: ../libpurple/protocols/oscar/oscar.c:6400
+#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "��从舒�� �仂弍亠�亠亟仆亳从舒 仗仂 舒亟�亠�� e-mail..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6405
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by Information"
 msgstr "��从舒�� �仂弍亠�亠亟仆亳从舒 仗仂 亳仆�仂�仄舒�亳亳"
 
-#: ../libpurple/protocols/oscar/oscar.c:6473
+#: ../libpurple/protocols/oscar/oscar.c:6499
 msgid "Use recent buddies group"
 msgstr ""
 
-#: ../libpurple/protocols/oscar/oscar.c:6476
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Show how long you have been idle"
 msgstr "�仂从舒亰�于舒��, 从舒从 亟仂仍亞仂 于� 弍亠亰亟亠亶��于仂于舒仍亳"
 
-#: ../libpurple/protocols/oscar/oscar.c:6631
+#: ../libpurple/protocols/oscar/oscar.c:6657
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -7618,10 +7651,6 @@
 "considered a privacy risk."
 msgstr ""
 
-#: ../libpurple/protocols/oscar/peer.c:1022
-msgid "_Connect"
-msgstr "_丕��舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
-
 #: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr ""
@@ -7800,13 +7829,13 @@
 msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_opt.c:208
-#: ../libpurple/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/group_opt.c:136
 #, c-format
 msgid "You rejected %d's request"
 msgstr "�� 仂�于亠�亞仍亳 亰舒仗�仂� %d"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:209
-#: ../libpurple/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Input your reason:"
 msgstr "�于亠亟亳�亠 仗�亳�亳仆�:"
 
@@ -7816,13 +7845,13 @@
 
 #. title
 #: ../libpurple/protocols/qq/buddy_opt.c:213
-#: ../libpurple/protocols/qq/group_opt.c:140
+#: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
 msgstr "�亰于亳仆亳�亠, 于� 仆亠 于 仄仂�仄 于从��亠..."
 
 #: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/group_im.c:142
-#: ../libpurple/protocols/qq/group_opt.c:126
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
 #: ../libpurple/protocols/qq/sys_msg.c:91
 #: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
@@ -7846,13 +7875,13 @@
 msgstr ""
 
 #: ../libpurple/protocols/qq/buddy_opt.c:404
-#: ../libpurple/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "�于亠亟亳�亠 亰舒仗�仂� 亰亟亠��"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
 #: ../libpurple/protocols/qq/buddy_opt.c:405
-#: ../libpurple/protocols/qq/group_join.c:135
+#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr ""
 
@@ -7860,8 +7889,8 @@
 #. masked
 #. hint
 #: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
-#: ../libpurple/protocols/qq/group_opt.c:142
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "��仗�舒于亳��"
 
@@ -7910,59 +7939,59 @@
 msgid "You can only search for permanent QQ groups\n"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:124
+#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:125
-#: ../libpurple/protocols/qq/group_im.c:179
+#: ../libpurple/protocols/qq/group_im.c:127
+#: ../libpurple/protocols/qq/group_im.c:181
 #: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "��亳�亳仆舒: %s"
 
-#: ../libpurple/protocols/qq/group_im.c:134
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/group_im.c:221
-#: ../libpurple/protocols/qq/group_im.c:256
-#: ../libpurple/protocols/qq/group_im.c:290
-#: ../libpurple/protocols/qq/group_join.c:231
-#: ../libpurple/protocols/qq/group_join.c:357
-#: ../libpurple/protocols/qq/group_opt.c:234
-#: ../libpurple/protocols/qq/group_opt.c:304
-#: ../libpurple/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_im.c:136
+#: ../libpurple/protocols/qq/group_im.c:183
+#: ../libpurple/protocols/qq/group_im.c:223
+#: ../libpurple/protocols/qq/group_im.c:258
+#: ../libpurple/protocols/qq/group_im.c:292
+#: ../libpurple/protocols/qq/group_join.c:233
+#: ../libpurple/protocols/qq/group_join.c:359
+#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:139
-#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/group_im.c:141
+#: ../libpurple/protocols/qq/group_opt.c:128
 #: ../libpurple/protocols/qq/sys_msg.c:92
 #: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:178
+#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:219
+#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:255
+#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:289
+#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_im.c:290
+#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "亅�舒 亞��仗仗舒 弍�仍舒 亟仂弍舒于仍亠仆舒 于 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
 
@@ -7986,88 +8015,88 @@
 msgid "Unknown status"
 msgstr "�亠亳亰于亠��仆�亶 ��舒���"
 
-#: ../libpurple/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:231
+#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully exited the group"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:255
+#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:256
+#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:327
+#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You inputted a group id outside the acceptable range"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:358
-msgid "Are you sure to exit this Qun?"
-msgstr ""
-
 #: ../libpurple/protocols/qq/group_join.c:360
+msgid "Are you sure to exit this Qun?"
+msgstr ""
+
+#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Go ahead"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "�仂亟 [0x%02X]: %s"
 
-#: ../libpurple/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr ""
 
 #. we wanna see window
-#: ../libpurple/protocols/qq/group_opt.c:123
+#: ../libpurple/protocols/qq/group_opt.c:124
 #: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:234
+#: ../libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modify Qun member"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:304
+#: ../libpurple/protocols/qq/group_opt.c:305
 msgid "You have successfully modify Qun information"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:391
+#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:393
+#: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
 msgstr ""
 
-#: ../libpurple/protocols/qq/group_opt.c:397
+#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr ""
 
-#: ../libpurple/protocols/qq/im.c:430
+#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "弌亳��亠仄仆仂亠 �仂仂弍�亠仆亳亠"
 
-#: ../libpurple/protocols/qq/im.c:574
+#: ../libpurple/protocols/qq/im.c:576
 msgid "Server ACK"
 msgstr ""
 
-#: ../libpurple/protocols/qq/im.c:574
-msgid "Send IM fail\n"
-msgstr ""
-
-#: ../libpurple/protocols/qq/keep_alive.c:85
+#: ../libpurple/protocols/qq/im.c:576
+msgid "Failed to send IM."
+msgstr "�亠 �亟舒仍仂�� 仂�仗�舒于亳�� 仄亞仆仂于亠仆仆仂亠 �仂仂弍�亠仆亳亠."
+
+#: ../libpurple/protocols/qq/keep_alive.c:87
 msgid "Keep alive error, seems connection lost!"
 msgstr ""
 
@@ -8081,8 +8110,8 @@
 
 #. we didn't successfully connect. tdt->toc_fd is valid here
 #: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:108
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:188
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
 #: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠."
@@ -8223,27 +8252,27 @@
 msgid "Unable to read from socket"
 msgstr "�亠 �亟舒���� 仗�仂�亳�舒�� 亳亰 �仂从亠�舒"
 
-#: ../libpurple/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr ""
 
-#: ../libpurple/protocols/qq/send_file.c:709
-#: ../libpurple/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:710
+#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr ""
 
-#: ../libpurple/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d 仂�仄亠仆亳仍 仗亠�亠亟舒�� %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:122
+#: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "弌仂亠亟亳仆亠仆亳亠 仗仂�亠��仆仂"
 
 #. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:130
+#: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "�亠 �亟舒仍仂�� 于仂亶�亳 于 �亠��, 仆亠� 仂�于亠�舒"
 
@@ -8385,7 +8414,7 @@
 
 #. this is a regular connect, error out
 #: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
+#: ../libpurple/protocols/sametime/sametime.c:3727
 msgid "Unable to connect to host"
 msgstr "�亠 �亟舒���� �仂亠亟亳仆亳���� � �亰仍仂仄"
 
@@ -8406,64 +8435,64 @@
 msgid "Place Closed"
 msgstr "�亠��仂 亰舒从���仂"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Microphone"
 msgstr "�亳从�仂�仂仆"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Speakers"
 msgstr "�仂仍仂仆从亳"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3232
 msgid "Video Camera"
 msgstr "�亳亟亠仂从舒仄亠�舒"
 
-#: ../libpurple/protocols/sametime/sametime.c:3235
+#: ../libpurple/protocols/sametime/sametime.c:3236
 msgid "File Transfer"
 msgstr "�亠�亠亟舒�舒 �舒亶仍仂于"
 
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3270
+#: ../libpurple/protocols/sametime/sametime.c:4146
 msgid "Supports"
 msgstr "�仂亟亟亠�亢亳于舒亠���"
 
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
+#: ../libpurple/protocols/sametime/sametime.c:3275
+#: ../libpurple/protocols/sametime/sametime.c:4120
 msgid "External User"
 msgstr "�仆亠�仆亳亶 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
+#: ../libpurple/protocols/sametime/sametime.c:3381
 msgid "Create conference with user"
 msgstr "弌仂亰亟舒�� 从仂仆�亠�亠仆�亳� � 仗仂仍�亰仂于舒�亠仍亠仄"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3385
+#: ../libpurple/protocols/sametime/sametime.c:3386
 msgid "New Conference"
 msgstr "�仂于舒� 从仂仆�亠�亠仆�亳�"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
+#: ../libpurple/protocols/sametime/sametime.c:3388
 msgid "Create"
 msgstr "弌仂亰亟舒��"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
+#: ../libpurple/protocols/sametime/sametime.c:3453
 msgid "Available Conferences"
 msgstr "�仂���仗仆�亠 从仂仆�亠�亠仆�亳亳"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
+#: ../libpurple/protocols/sametime/sametime.c:3459
 msgid "Create New Conference..."
 msgstr "弌仂亰亟舒�� 仆仂于�� 从仂仆�亠�亠仆�亳�..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3465
+#: ../libpurple/protocols/sametime/sametime.c:3466
 msgid "Invite user to a conference"
 msgstr "��亳亞仍舒�亳�� 仗仂仍�亰仂于舒�亠仍� 于 从仂仆�亠�亠仆�亳�"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3467
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -8471,69 +8500,69 @@
 "this user to."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3471
+#: ../libpurple/protocols/sametime/sametime.c:3472
 msgid "Invite to Conference"
 msgstr "��亳亞仍舒�亳�� 于 从仂仆�亠�亠仆�亳�"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
+#: ../libpurple/protocols/sametime/sametime.c:3563
 msgid "Invite to Conference..."
 msgstr "��亳亞仍舒�亳�� 于 从仂仆�亠�亠仆�亳�..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3567
+#: ../libpurple/protocols/sametime/sametime.c:3568
 msgid "Send TEST Announcement"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4250
+#: ../libpurple/protocols/sametime/sametime.c:3587 ../pidgin/gtkconv.c:4286
 msgid "Topic:"
 msgstr "丐亠仄舒:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
+#: ../libpurple/protocols/sametime/sametime.c:3615
 msgid "No Sametime Community Server specified"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3636
+#: ../libpurple/protocols/sametime/sametime.c:3637
 #, 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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "Meanwhile Connection Setup"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3643
 msgid "No Sametime Community Server Specified"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:3977
+#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4015
 msgid "Connect"
 msgstr "丕��舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
 
-#: ../libpurple/protocols/sametime/sametime.c:4135
+#: ../libpurple/protocols/sametime/sametime.c:4136
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "�亠亳亰于亠��仆仂 (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4137
+#: ../libpurple/protocols/sametime/sametime.c:4138
 msgid "Last Known Client"
 msgstr "�仂�仍亠亟仆亳亶 亳亰于亠��仆�亶 从仍亳亠仆�"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
+#: ../libpurple/protocols/sametime/sametime.c:4302
+#: ../libpurple/protocols/sametime/sametime.c:5507
 msgid "User Name"
 msgstr "�仄� 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
+#: ../libpurple/protocols/sametime/sametime.c:4305
+#: ../libpurple/protocols/sametime/sametime.c:5510
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4329
 msgid "An ambiguous user ID was entered"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4330
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. Please "
@@ -8543,26 +8572,26 @@
 "��弍亠�亳�亠 亳亰 �仗亳�从舒 仆亳亢亠 仂亟仆仂亞仂 亳亰 仆亳� 亟仍� 亟仂弍舒于仍亠仆亳� 亠亞仂 于 �仗亳�仂从 "
 "�仂弍亠�亠亟仆亳从仂于."
 
-#: ../libpurple/protocols/sametime/sametime.c:4334
+#: ../libpurple/protocols/sametime/sametime.c:4335
 msgid "Select User"
 msgstr "��弍亠�亳�亠 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../libpurple/protocols/sametime/sametime.c:4418
+#: ../libpurple/protocols/sametime/sametime.c:4419
 msgid "Unable to add user: user not found"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍�: 仗仂仍�亰仂于舒�亠仍� 仆亠 仆舒亶亟亠仆"
 
-#: ../libpurple/protocols/sametime/sametime.c:4420
+#: ../libpurple/protocols/sametime/sametime.c:4421
 #, 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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:4425
+#: ../libpurple/protocols/sametime/sametime.c:4426
 msgid "Unable to add user"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../libpurple/protocols/sametime/sametime.c:5011
+#: ../libpurple/protocols/sametime/sametime.c:5012
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -8571,63 +8600,63 @@
 "��亳弍从舒 ��亠仆亳� �舒亶仍舒 %s: \n"
 "%s\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
+#: ../libpurple/protocols/sametime/sametime.c:5147
 msgid "Remotely Stored Buddy List"
 msgstr "弌仂��舒仆�亠仄�亶 �亟舒仍�仆仆仂 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../libpurple/protocols/sametime/sametime.c:5151
+#: ../libpurple/protocols/sametime/sametime.c:5152
 msgid "Buddy List Storage Mode"
 msgstr "�亠亢亳仄 ��舒仆亠仆亳� �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../libpurple/protocols/sametime/sametime.c:5154
+#: ../libpurple/protocols/sametime/sametime.c:5155
 msgid "Local Buddy List Only"
 msgstr "丐仂仍�从仂 仍仂从舒仍�仆�亶 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../libpurple/protocols/sametime/sametime.c:5156
+#: ../libpurple/protocols/sametime/sametime.c:5157
 msgid "Merge List from Server"
 msgstr "�弍�亠亟亳仆亳�� �仂 �仗亳�从仂仄 � �亠�于亠�舒"
 
-#: ../libpurple/protocols/sametime/sametime.c:5158
+#: ../libpurple/protocols/sametime/sametime.c:5159
 msgid "Merge and Save List to Server"
 msgstr "�弍�亠亟亳仆亳�� 亳 �仂��舒仆亳�� �仗亳�仂从 仆舒 �亠�于亠�亠"
 
-#: ../libpurple/protocols/sametime/sametime.c:5160
+#: ../libpurple/protocols/sametime/sametime.c:5161
 msgid "Synchronize List with Server"
 msgstr "弌亳仆��仂仆亳亰亳�仂于舒�� �仂 �仗亳�从仂仄 � �亠�于亠�舒"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
+#: ../libpurple/protocols/sametime/sametime.c:5216
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "�仄仗仂��亳�仂于舒�� �仗亳�仂从 Sametime 亟仍� ����仆仂亶 亰舒仗亳�亳 %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5255
+#: ../libpurple/protocols/sametime/sametime.c:5256
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "亅从�仗仂��亳�仂于舒�� �仗亳�仂从 Sametime 亟仍� ����仆仂亶 亰舒仗亳�亳 %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
+#: ../libpurple/protocols/sametime/sametime.c:5310
 msgid "Unable to add group: group exists"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� 亞��仗仗�: 亞��仗仗舒 ���亠��于�亠�"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
+#: ../libpurple/protocols/sametime/sametime.c:5311
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "���仗仗舒 � 亳仄亠仆亠仄 '%s' �亢亠 仗�亳�����于�亠� 于 �仗亳�从亠 �仂弍亠�亠亟仆亳从仂于."
 
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5314
+#: ../libpurple/protocols/sametime/sametime.c:5444
 msgid "Unable to add group"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� 亞��仗仗�"
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
+#: ../libpurple/protocols/sametime/sametime.c:5373
 msgid "Possible Matches"
 msgstr "�亠�仂��仆�亠 �仂于仗舒亟亠仆亳�"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5389
 msgid "Notes Address Book group results"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5390
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -8635,37 +8664,37 @@
 "to your buddy list."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5394
+#: ../libpurple/protocols/sametime/sametime.c:5395
 msgid "Select Notes Address Book"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5438
 msgid "Unable to add group: group not found"
 msgstr "�亠 �亟舒���� 亟仂弍舒于亳�� 亞��仗仗�: 亞��仗仗舒 仆亠 仆舒亶亟亠仆舒"
 
-#: ../libpurple/protocols/sametime/sametime.c:5439
+#: ../libpurple/protocols/sametime/sametime.c:5440
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
 "Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid "Notes Address Book Group"
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5482
 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 ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5530
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid "Search results for '%s'"
 msgstr "�亠亰�仍��舒�� 仗仂亳�从舒 亟仍� '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5532
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -8676,59 +8705,60 @@
 "仄仂亢亠�亠 亟仂弍舒于亳�� ��亳� 仗仂仍�亰仂于舒�亠仍亠亶 于 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于 亳仍亳 仂�仗�舒于亳�� 亳仄 "
 "�仂仂弍�亠仆亳� � 仗仂仄仂��� 从仆仂仗仂从 亟亠亶��于亳� 仆亳亢亠."
 
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:716
+#. Create the window
+#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtknotify.c:718
 msgid "Search Results"
 msgstr "�亠亰�仍��舒�� 仗仂亳�从舒"
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: ../libpurple/protocols/sametime/sametime.c:5564
 msgid "No matches"
 msgstr "�亠� �仂于仗舒亟亠仆亳亶"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5565
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5568
+#: ../libpurple/protocols/sametime/sametime.c:5569
 msgid "No Matches"
 msgstr "�亠� �仂于仗舒亟亠仆亳亶"
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid "Search for a user"
 msgstr "��从舒�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5607
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5610
 msgid "User Search"
 msgstr "�仂亳�从 仗仂仍�亰仂于舒�亠仍亠亶"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5623
 msgid "Import Sametime List..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
+#: ../libpurple/protocols/sametime/sametime.c:5627
 msgid "Export Sametime List..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5630
+#: ../libpurple/protocols/sametime/sametime.c:5631
 msgid "Add Notes Address Book Group..."
 msgstr ""
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
+#: ../libpurple/protocols/sametime/sametime.c:5635
 msgid "User Search..."
 msgstr "�仂亳�从 仗仂仍�亰仂于舒�亠仍亠亶..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5741
 msgid "Force login (ignore server redirects)"
 msgstr ""
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5751
 msgid "Hide client identity"
 msgstr ""
 
@@ -9499,7 +9529,7 @@
 msgstr "�亠 �亟舒仍仂�� 于�仗仂仍仆亳�� �仂亞仍舒�仂于舒仆亳亠 从仍��亠亶"
 
 #: ../libpurple/protocols/silc/ft.c:114
-msgid "Connection timedout"
+msgid "Connection timed out"
 msgstr "���亠从仍仂 于�亠仄� 仂亢亳亟舒仆亳� �仂亠亟亳仆亠仆亳�"
 
 #: ../libpurple/protocols/silc/ft.c:118
@@ -9649,7 +9679,7 @@
 #: ../libpurple/protocols/silc/ops.c:1326
 #: ../libpurple/protocols/silc10/ops.c:1183
 #: ../libpurple/protocols/silc10/ops.c:1332
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1047
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "�舒��仂��亠亠 亳仄�"
 
@@ -9927,7 +9957,7 @@
 msgstr "�舒�亠 �亠从��亠亠 仆舒���仂亠仆亳亠"
 
 #: ../libpurple/protocols/silc/silc.c:741
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1566
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1636
 msgid "Normal"
 msgstr "�仂�仄舒仍�仆仂"
 
@@ -10314,68 +10344,68 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:1875
-#: ../libpurple/protocols/silc10/silc.c:1817
+#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 SILC"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:1877
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "��仂�仂从仂仍 Secure Internet Live Conferencing (SILC)"
 
-#: ../libpurple/protocols/silc/silc.c:1909
-#: ../libpurple/protocols/silc10/silc.c:1851 ../pidgin/gtkprefs.c:1959
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2029
 msgid "Network"
 msgstr "弌亠��"
 
-#: ../libpurple/protocols/silc/silc.c:1920
-#: ../libpurple/protocols/silc10/silc.c:1862
+#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "个舒亶仍 仗�弍仍亳�仆仂亞仂 从仍��舒"
 
-#: ../libpurple/protocols/silc/silc.c:1924
-#: ../libpurple/protocols/silc10/silc.c:1866
+#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "个舒亶仍 仍亳�仆仂亞仂 从仍��舒"
 
-#: ../libpurple/protocols/silc/silc.c:1934
-#: ../libpurple/protocols/silc10/silc.c:1876
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "丿亳��"
 
-#: ../libpurple/protocols/silc/silc.c:1944
-#: ../libpurple/protocols/silc10/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:1947
+#: ../libpurple/protocols/silc/silc.c:1948
 msgid "Use Perfect Forward Secrecy"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1951
-#: ../libpurple/protocols/silc10/silc.c:1889
+#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "���亠仆�亳�亳从舒�亳� 仗�弍仍亳�仆仂亞仂 从仍��舒"
 
-#: ../libpurple/protocols/silc/silc.c:1954
-#: ../libpurple/protocols/silc10/silc.c:1892
+#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "�仍仂从亳�仂于舒�� �仂仂弍�亠仆亳� 弍亠亰 仂弍仄亠仆舒 从仍��舒仄亳"
 
-#: ../libpurple/protocols/silc/silc.c:1957
-#: ../libpurple/protocols/silc10/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1960
-#: ../libpurple/protocols/silc10/silc.c:1898
+#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr ""
 
-#: ../libpurple/protocols/silc/silc.c:1963
-#: ../libpurple/protocols/silc10/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "�亠仍舒�� �亳��仂于�� 仗仂亟仗亳�� 亳 仗�仂于亠�从� 于�亠� �仂仂弍�亠仆亳亶"
 
@@ -10579,26 +10609,26 @@
 msgstr "�亠 �亟舒仍仂�� 亰舒仗亳�舒��"
 
 #: ../libpurple/protocols/simple/simple.c:438
-#: ../libpurple/protocols/simple/simple.c:1484
+#: ../libpurple/protocols/simple/simple.c:1489
 msgid "Could not connect"
 msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� �仂亠亟亳仆亠仆亳亠"
 
-#: ../libpurple/protocols/simple/simple.c:1518
-#: ../libpurple/protocols/simple/simple.c:1560
-#: ../libpurple/protocols/simple/simple.c:1573
-#: ../libpurple/protocols/simple/simple.c:1624
+#: ../libpurple/protocols/simple/simple.c:1523
+#: ../libpurple/protocols/simple/simple.c:1565
+#: ../libpurple/protocols/simple/simple.c:1578
+#: ../libpurple/protocols/simple/simple.c:1629
 msgid "Could not create listen socket"
 msgstr "�亠 �亟舒仍仂�� �仂亰亟舒�� �仂从亠� 亟仍� 仗�仂�仍��亳于舒仆亳�"
 
-#: ../libpurple/protocols/simple/simple.c:1541
+#: ../libpurple/protocols/simple/simple.c:1546
 msgid "Couldn't resolve host"
 msgstr "�亠 �亟舒仍仂�� �舒亰�亠�亳�� 亳仄� �亰仍舒"
 
-#: ../libpurple/protocols/simple/simple.c:1632
+#: ../libpurple/protocols/simple/simple.c:1637
 msgid "Could not resolve hostname"
 msgstr "�亠 �亟舒仍仂�� �舒亰�亠�亳�� 亳仄� �亰仍舒"
 
-#: ../libpurple/protocols/simple/simple.c:1649
+#: ../libpurple/protocols/simple/simple.c:1654
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr ""
 "�亟亠仆�亳�亳从舒�仂�� 仗仂仍�亰仂于舒�亠仍亠亶 SIP 仆亠 仄仂亞�� �仂亟亠�亢舒�� 仗�仂弍亠仍� 亳仍亳 �亳仄于仂仍� @"
@@ -10611,36 +10641,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1824
+#: ../libpurple/protocols/simple/simple.c:1829
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 SIP/SIMPLE"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1825
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "�仂亟�仍� 仗�仂�仂从仂仍舒 SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1858
 msgid "Publish status (note: everyone may watch you)"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1859
+#: ../libpurple/protocols/simple/simple.c:1864
 msgid "Use UDP"
 msgstr "��仗仂仍�亰仂于舒�� UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1861
+#: ../libpurple/protocols/simple/simple.c:1866
 msgid "Use proxy"
 msgstr "��仗仂仍�亰仂于舒�� 仗�仂从�亳"
 
-#: ../libpurple/protocols/simple/simple.c:1863
+#: ../libpurple/protocols/simple/simple.c:1868
 msgid "Proxy"
 msgstr "��仂从�亳"
 
-#: ../libpurple/protocols/simple/simple.c:1865
+#: ../libpurple/protocols/simple/simple.c:1870
 msgid "Auth User"
 msgstr ""
 
-#: ../libpurple/protocols/simple/simple.c:1867
+#: ../libpurple/protocols/simple/simple.c:1872
 msgid "Auth Domain"
 msgstr ""
 
@@ -10800,8 +10830,8 @@
 msgid "Password Change Successful"
 msgstr "�舒�仂仍� 亳亰仄亠仆�仆 ��仗亠�仆仂"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5460
-#: ../pidgin/gtkblist.c:5814
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5519
+#: ../pidgin/gtkblist.c:5873
 msgid "_Group:"
 msgstr "_���仗仗舒:"
 
@@ -10955,8 +10985,8 @@
 #: ../libpurple/protocols/yahoo/yahoo.c:2684
 #: ../libpurple/protocols/yahoo/yahoo.c:2787
 #: ../libpurple/protocols/yahoo/yahoo.c:2797
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
 #: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "��仂弍仍亠仄舒 � �仂亠亟亳仆亠仆亳亠仄"
@@ -11147,72 +11177,72 @@
 msgid "Yahoo Chat port"
 msgstr "�仂�� �舒�舒 Yahoo"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:203
+#: ../libpurple/protocols/yahoo/yahoochat.c:204
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:205
+#: ../libpurple/protocols/yahoo/yahoochat.c:206
 msgid "Invitation Rejected"
 msgstr "��亳亞仍舒�亠仆亳亠 仂�于亠�亞仆��仂"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:361
+#: ../libpurple/protocols/yahoo/yahoochat.c:362
 msgid "Failed to join chat"
 msgstr "�亠 �亟舒仍仂�� 仗�亳�仂亠亟亳仆亳���� 从 �舒��"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:364
+#: ../libpurple/protocols/yahoo/yahoochat.c:365
 msgid "Unknown room"
 msgstr "�亠亳亰于亠��仆舒� 从仂仄仆舒�舒"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:367
+#: ../libpurple/protocols/yahoo/yahoochat.c:368
 msgid "Maybe the room is full"
 msgstr "�仂亢亠� 弍���, 从仂仄仆舒�舒 仗仂仍仆舒?"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:370
+#: ../libpurple/protocols/yahoo/yahoochat.c:371
 msgid "Not available"
 msgstr "�亠亟仂���仗亠仆"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:374
+#: ../libpurple/protocols/yahoo/yahoochat.c:375
 msgid ""
 "Unknown error. You may need to logout and wait five minutes before being "
 "able to rejoin a chatroom"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:452
+#: ../libpurple/protocols/yahoo/yahoochat.c:453
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "�� �舒亰亞仂于舒�亳于舒亠�亠 于 %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:627
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
 msgid "Failed to join buddy in chat"
 msgstr "�亠 �亟舒仍仂�� 仗�亳�仂亠亟亳仆亳���� 从 �仂弍亠�亠亟仆亳从� 于 �舒�亠"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:629
 msgid "Maybe they're not in a chat?"
 msgstr "�仂亢亠� 弍���, 仂仆 仆亠 于 �舒�亠?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1357
-#: ../libpurple/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Fetching the room list failed."
 msgstr "�亠 �亟舒仍仂�� 亰舒亞��亰亳�� �仗亳�仂从 从仂仄仆舒�."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1441
+#: ../libpurple/protocols/yahoo/yahoochat.c:1404
 msgid "Voices"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1444
+#: ../libpurple/protocols/yahoo/yahoochat.c:1407
 msgid "Webcams"
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1455
-#: ../libpurple/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
 msgid "Unable to fetch room list."
 msgstr "�亠 �亟舒���� 亰舒亞��亰亳�� �仗亳�仂从 从仂仄仆舒�."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1518
+#: ../libpurple/protocols/yahoo/yahoochat.c:1481
 msgid "User Rooms"
 msgstr "�仂仄仆舒�� 仗仂仍�亰仂于舒�亠仍�"
 
@@ -11223,9 +11253,9 @@
 msgid "Sent Doodle request."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:269
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
 msgid "Unable to establish file descriptor."
 msgstr "�亠 �亟舒���� ���舒仆仂于亳�� 亟亠�从�亳仗�仂� �舒亶仍舒."
 
@@ -11234,21 +11264,21 @@
 msgid "Write Error"
 msgstr "��亳弍从舒 亰舒仗亳�亳"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "��仂�亳仍� Yahoo! Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "��仂�亳仍� Yahoo!"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:814
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
 msgid ""
 "Sorry, profiles marked as containing adult content are not supported at this "
 "time."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:816
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
 msgid ""
 "If you wish to view this profile, you will need to visit this link in your "
 "web browser:"
@@ -11256,66 +11286,66 @@
 "��仍亳 于� �仂�亳�亠 仗�仂�仄仂��亠�� ��仂� 仗�仂�亳仍�, 于舒仄 仗�亳亟���� 仂�从���� ��� ���仍从� 于 "
 "于舒�亠仄 弍�舒�亰亠�亠:"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "Yahoo! ID"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1085
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1089
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1093
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1109
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "丱仂弍弍亳"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1103
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "�仂�仍亠亟仆亳亠 仆仂于仂��亳"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "�仂仄舒�仆�� ���舒仆亳�舒"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "弌��仍从舒 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "弌��仍从舒 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "弌��仍从舒 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "�仂�仍亠亟仆亠亠 仂弍仆仂于仍亠仆亳亠"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "�仂仍�亰仂于舒�亠仍��从舒� 亳仆�仂�仄舒�亳� 亟仍� %s 仆亠亟仂���仗仆舒"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1181
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
 msgid ""
 "Sorry, this profile seems to be in a language or format that is not "
 "supported at this time."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1197
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
 msgid ""
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1200
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
 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 ""
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "��仂�亳仍� 仗仂仍�亰仂于舒�亠仍� 仗���."
 
@@ -11545,11 +11575,11 @@
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:47
 msgid "I'm not here right now"
 msgstr ""
 
-#: ../libpurple/savedstatuses.c:532
+#: ../libpurple/savedstatuses.c:534
 msgid "saved statuses"
 msgstr "�仂��舒仆�仆仆�亠 ��舒����"
 
@@ -11558,7 +11588,7 @@
 msgid "%s is now known as %s.\n"
 msgstr "%s �亠仗亠�� 亳亰于亠��亠仆 从舒从 %s.\n"
 
-#: ../libpurple/server.c:679
+#: ../libpurple/server.c:680
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -11567,12 +11597,12 @@
 "%s 仗�亳亞仍舒�舒亠� %s 于 �舒� %s:\n"
 "%s"
 
-#: ../libpurple/server.c:684
+#: ../libpurple/server.c:685
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s 仗�亳亞仍舒�舒亠� %s 于 �舒� %s\n"
 
-#: ../libpurple/server.c:688
+#: ../libpurple/server.c:689
 msgid "Accept chat invitation?"
 msgstr "��亳仆��� 仗�亳亞仍舒�亠仆亳亠 于 �舒�?"
 
@@ -11580,9 +11610,13 @@
 msgid "Unset"
 msgstr "�亠 ���舒仆仂于仍亠仆"
 
-#: ../libpurple/status.c:155
-msgid "Unavailable"
-msgstr "�亠亟仂���仗亠仆"
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+msgid "Do not disturb"
+msgstr "�亠 弍亠�仗仂从仂亳��"
+
+#: ../libpurple/status.c:158
+msgid "Extended away"
+msgstr "�舒��亳�亠仆仆�亶 \"��仂��仍\""
 
 #: ../libpurple/status.c:159
 msgid "Mobile"
@@ -11623,17 +11657,17 @@
 msgid "+++ %s became unidle"
 msgstr "+++ %s 仗亠�亠��舒仍 弍亠亰亟亠亶��于仂于舒��"
 
-#: ../libpurple/util.c:682
+#: ../libpurple/util.c:717
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2586
+#: ../libpurple/util.c:2692
 #, c-format
 msgid "Error Reading %s"
 msgstr "��亳弍从舒 ��亠仆亳� %s"
 
-#: ../libpurple/util.c:2587
+#: ../libpurple/util.c:2693
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -11642,15 +11676,15 @@
 "��仂亳亰仂�仍舒 仂�亳弍从舒 仗�亳 ��亠仆亳亳 %s. 个舒亶仍 仆亠 弍�仍 亰舒亞��亢亠仆, 舒 ��舒��亶 �舒亶仍 弍�仍 "
 "仗亠�亠亳仄亠仆仂于舒仆 于 %s~."
 
-#: ../libpurple/util.c:3060
+#: ../libpurple/util.c:3193
 msgid "Calculating..."
 msgstr "�仂亟����..."
 
-#: ../libpurple/util.c:3063
+#: ../libpurple/util.c:3196
 msgid "Unknown."
 msgstr "�亠亳亰于亠��仆仂."
 
-#: ../libpurple/util.c:3089
+#: ../libpurple/util.c:3222
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
@@ -11658,7 +11692,7 @@
 msgstr[1] "%d �亠从�仆亟�"
 msgstr[2] "%d �亠从�仆亟"
 
-#: ../libpurple/util.c:3101
+#: ../libpurple/util.c:3234
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
@@ -11666,7 +11700,7 @@
 msgstr[1] "%d 亟仆�"
 msgstr[2] "%d 亟仆亠亶"
 
-#: ../libpurple/util.c:3109
+#: ../libpurple/util.c:3242
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
@@ -11674,7 +11708,7 @@
 msgstr[1] "%s, %d �舒�舒"
 msgstr[2] "%s, %d �舒�仂于"
 
-#: ../libpurple/util.c:3115
+#: ../libpurple/util.c:3248
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
@@ -11682,7 +11716,7 @@
 msgstr[1] "%d �舒�舒"
 msgstr[2] "%d �舒�仂于"
 
-#: ../libpurple/util.c:3123
+#: ../libpurple/util.c:3256
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
@@ -11690,7 +11724,7 @@
 msgstr[1] "%s, %d 仄亳仆���"
 msgstr[2] "%s, %d 仄亳仆��"
 
-#: ../libpurple/util.c:3129
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
@@ -11698,34 +11732,34 @@
 msgstr[1] "%d 仄亳仆���"
 msgstr[2] "%d 仄亳仆��"
 
-#: ../libpurple/util.c:3389
+#: ../libpurple/util.c:3522
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr ""
 
-#: ../libpurple/util.c:3426 ../libpurple/util.c:3721
+#: ../libpurple/util.c:3559 ../libpurple/util.c:3854
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "�亠 �亟舒���� �仂亠亟亳仆亳���� � %s"
 
-#: ../libpurple/util.c:3549
+#: ../libpurple/util.c:3682
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
 
-#: ../libpurple/util.c:3584
+#: ../libpurple/util.c:3717
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "��亳弍从舒 ��亠仆亳� 亳亰 %s: %s"
 
-#: ../libpurple/util.c:3615
+#: ../libpurple/util.c:3748
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "��亳弍从舒 亰舒仗亳�亳 于 %s: %s"
 
-#: ../libpurple/util.c:3640
+#: ../libpurple/util.c:3773
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "�亠 �亟舒���� �仂亠亟亳仆亳���� � %s: %s"
@@ -11763,59 +11797,59 @@
 msgid "Screen _name:"
 msgstr "_�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�:"
 
-#: ../pidgin/gtkaccount.c:528
+#: ../pidgin/gtkaccount.c:531
 msgid "_Local alias:"
 msgstr "_�仂从舒仍�仆�亶 仗�亠于亟仂仆亳仄:"
 
-#: ../pidgin/gtkaccount.c:532
+#: ../pidgin/gtkaccount.c:535
 msgid "Remember pass_word"
 msgstr "�_舒仗仂仄仆亳�� 仗舒�仂仍�"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:590
+#: ../pidgin/gtkaccount.c:593
 msgid "User Options"
 msgstr "�舒�舒仄亠��� 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../pidgin/gtkaccount.c:603
+#: ../pidgin/gtkaccount.c:606
 msgid "New _mail notifications"
 msgstr "丕于亠亟仂仄仍亠仆亳� 仂 仆仂于仂亶 仗仂_��亠"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:608
+#: ../pidgin/gtkaccount.c:611
 msgid "Use this buddy _icon for this account:"
 msgstr "��仗仂仍�亰仂于舒�� ��仂� _亰仆舒�仂从 �仂弍亠�亠亟仆亳从舒 亟仍� ��仂亶 ����仆仂亶 亰舒仗亳�亳:"
 
 #. Build the protocol options frame.
-#: ../pidgin/gtkaccount.c:728
+#: ../pidgin/gtkaccount.c:731
 #, c-format
 msgid "%s Options"
 msgstr "�舒�舒仄亠��� %s"
 
-#: ../pidgin/gtkaccount.c:934
+#: ../pidgin/gtkaccount.c:936
 msgid "Use GNOME Proxy Settings"
 msgstr "��仗仂仍�亰仂于舒�� 仆舒���仂亶从亳 仗�仂从�亳 GNOME"
 
-#: ../pidgin/gtkaccount.c:935
+#: ../pidgin/gtkaccount.c:937
 msgid "Use Global Proxy Settings"
 msgstr "��仗仂仍�亰仂于舒�� 亞仍仂弍舒仍�仆�亠 仆舒���仂亶从亳 仗�仂从�亳"
 
-#: ../pidgin/gtkaccount.c:941
+#: ../pidgin/gtkaccount.c:943
 msgid "No Proxy"
 msgstr "�亠� 仗�仂从�亳"
 
-#: ../pidgin/gtkaccount.c:947
+#: ../pidgin/gtkaccount.c:949
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:953
+#: ../pidgin/gtkaccount.c:955
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:959
+#: ../pidgin/gtkaccount.c:961
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:965 ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1206
 msgid "Use Environmental Settings"
 msgstr "��仗仂仍�亰仂于舒�� 仆舒���仂亶从亳 仂从��亢亠仆亳�"
 
@@ -11824,60 +11858,60 @@
 #. 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:1004
+#: ../pidgin/gtkaccount.c:1006
 msgid "If you look real closely"
 msgstr "��仍亳 仗�亳亞仍�亟亳�亠��"
 
 #. This is an easter egg. See the comment on the previous line in the source.
-#: ../pidgin/gtkaccount.c:1007
+#: ../pidgin/gtkaccount.c:1009
 msgid "you can see the butterflies mating"
 msgstr "于� 仄仂亢亠�亠 �于亳亟亠�� �仗舒�亳于舒��亳��� 弍舒弍仂�亠从"
 
-#: ../pidgin/gtkaccount.c:1028
+#: ../pidgin/gtkaccount.c:1030
 msgid "Proxy Options"
 msgstr "�舒�舒仄亠��� 仗�仂从�亳"
 
-#: ../pidgin/gtkaccount.c:1042 ../pidgin/gtkprefs.c:1131
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1200
 msgid "Proxy _type:"
 msgstr "丐_亳仗 仗�仂从�亳:"
 
-#: ../pidgin/gtkaccount.c:1051 ../pidgin/gtkprefs.c:1152
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1221
 msgid "_Host:"
 msgstr "_丕亰亠仍:"
 
-#: ../pidgin/gtkaccount.c:1055 ../pidgin/gtkprefs.c:1170
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1239
 msgid "_Port:"
 msgstr "�_仂��:"
 
-#: ../pidgin/gtkaccount.c:1063
+#: ../pidgin/gtkaccount.c:1065
 msgid "_Username:"
 msgstr "_�仄� 仗仂仍�亰仂于舒�亠仍�:"
 
-#: ../pidgin/gtkaccount.c:1070 ../pidgin/gtkprefs.c:1207
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1276
 msgid "Pa_ssword:"
 msgstr "�舒_�仂仍�:"
 
-#: ../pidgin/gtkaccount.c:1476
+#: ../pidgin/gtkaccount.c:1473
 msgid "Add Account"
 msgstr "�仂弍舒于亳�� ����仆�� 亰舒仗亳��"
 
-#: ../pidgin/gtkaccount.c:1500
+#: ../pidgin/gtkaccount.c:1492
 msgid "_Basic"
 msgstr "_��仆仂于仆�亠"
 
-#: ../pidgin/gtkaccount.c:1511
+#: ../pidgin/gtkaccount.c:1503
 msgid "_Advanced"
 msgstr "_�仂仗仂仍仆亳�亠仍�仆�亠"
 
-#: ../pidgin/gtkaccount.c:1983 ../pidgin/gtkplugin.c:568
+#: ../pidgin/gtkaccount.c:1977 ../pidgin/gtkplugin.c:568
 msgid "Enabled"
 msgstr "�从仍��亠仆仂"
 
-#: ../pidgin/gtkaccount.c:2011
+#: ../pidgin/gtkaccount.c:2005
 msgid "Protocol"
 msgstr "��仂�仂从仂仍"
 
-#: ../pidgin/gtkaccount.c:2212
+#: ../pidgin/gtkaccount.c:2205
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Welcome to %s!</span>\n"
@@ -11901,11 +11935,11 @@
 "����仆�� 亰舒仗亳�亠亶 仗仂亰亢亠 �亠�亠亰 仄亠仆� <b>丕���仆�亠 亰舒仗亳�亳->�仂弍舒于亳��/�亰仄亠仆亳��</b> "
 "仂从仆舒 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于."
 
-#: ../pidgin/gtkblist.c:717
+#: ../pidgin/gtkblist.c:763
 msgid "Join a Chat"
 msgstr "��亳�仂亠亟亳仆亳���� 从 �舒��"
 
-#: ../pidgin/gtkblist.c:738
+#: ../pidgin/gtkblist.c:784
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
@@ -11914,210 +11948,219 @@
 "仗�亳�仂亠亟亳仆亳����.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:749 ../pidgin/gtkblist.c:5408
-#: ../pidgin/gtkblist.c:5775 ../pidgin/gtkpounce.c:531
-#: ../pidgin/gtkroomlist.c:399
+#: ../pidgin/gtkblist.c:795 ../pidgin/gtkblist.c:5467
+#: ../pidgin/gtkblist.c:5834 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkroomlist.c:395
 msgid "_Account:"
 msgstr "丕_���仆舒� 亰舒仗亳��:"
 
-#: ../pidgin/gtkblist.c:1038 ../pidgin/gtkprivacy.c:606
-#: ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkblist.c:1084 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
 msgid "_Block"
 msgstr "_�仍仂从亳�仂于舒��"
 
-#: ../pidgin/gtkblist.c:1038
+#: ../pidgin/gtkblist.c:1084
 msgid "Un_block"
 msgstr "�舒亰_弍仍仂从亳�仂于舒��"
 
-#: ../pidgin/gtkblist.c:1089
+#: ../pidgin/gtkblist.c:1135
 msgid "Get _Info"
 msgstr "_�仆�仂�仄舒�亳�"
 
-#: ../pidgin/gtkblist.c:1092 ../pidgin/pidginstock.c:84
+#: ../pidgin/gtkblist.c:1138 ../pidgin/pidginstock.c:84
 msgid "I_M"
 msgstr "�亞仆仂于亠仆仆仂亠 �仂仂弍_�亠仆亳亠"
 
-#: ../pidgin/gtkblist.c:1098
+#: ../pidgin/gtkblist.c:1144
 msgid "_Send File"
 msgstr "��仗�舒于亳�� _�舒亶仍"
 
-#: ../pidgin/gtkblist.c:1105
+#: ../pidgin/gtkblist.c:1151
 msgid "Add Buddy _Pounce"
 msgstr "�仂弍舒于亳�� 仗_�舒于亳仍仂"
 
-#: ../pidgin/gtkblist.c:1109 ../pidgin/gtkblist.c:1113
-#: ../pidgin/gtkblist.c:1215 ../pidgin/gtkblist.c:1238
+#: ../pidgin/gtkblist.c:1155 ../pidgin/gtkblist.c:1159
+#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
 msgid "View _Log"
 msgstr "��仂�仄仂��亠�� _亢��仆舒仍"
 
-#: ../pidgin/gtkblist.c:1125 ../pidgin/gtkblist.c:1134
-#: ../pidgin/gtkblist.c:1223 ../pidgin/gtkblist.c:1244
+#: ../pidgin/gtkblist.c:1171 ../pidgin/gtkblist.c:1180
+#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
 msgid "_Alias..."
 msgstr "_��亠于亟仂仆亳仄..."
 
-#: ../pidgin/gtkblist.c:1128 ../pidgin/gtkblist.c:1136
-#: ../pidgin/gtkblist.c:1225 ../pidgin/gtkblist.c:1246
+#: ../pidgin/gtkblist.c:1174 ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
 msgid "_Remove"
 msgstr "_丕亟舒仍亳��"
 
-#: ../pidgin/gtkblist.c:1185
+#: ../pidgin/gtkblist.c:1232
 msgid "Add a _Buddy"
 msgstr "�仂弍舒于亳�� _�仂弍亠�亠亟仆亳从舒"
 
-#: ../pidgin/gtkblist.c:1188
+#: ../pidgin/gtkblist.c:1235
 msgid "Add a C_hat"
 msgstr "�仂弍舒于亳�� _�舒�"
 
-#: ../pidgin/gtkblist.c:1191
+#: ../pidgin/gtkblist.c:1238
 msgid "_Delete Group"
 msgstr "_丕亟舒仍亳�� 亞��仗仗�"
 
-#: ../pidgin/gtkblist.c:1193
+#: ../pidgin/gtkblist.c:1240
 msgid "_Rename"
 msgstr "�亠�亠_亳仄亠仆仂于舒��"
 
 #. join button
-#: ../pidgin/gtkblist.c:1211 ../pidgin/gtkroomlist.c:306
-#: ../pidgin/gtkroomlist.c:463 ../pidgin/pidginstock.c:82
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
 msgid "_Join"
 msgstr "�_�亳�仂亠亟亳仆亳����"
 
-#: ../pidgin/gtkblist.c:1213
+#: ../pidgin/gtkblist.c:1260
 msgid "Auto-Join"
 msgstr "��亳�仂亠亟亳仆����� 舒于�仂仄舒�亳�亠�从亳"
 
-#: ../pidgin/gtkblist.c:1251 ../pidgin/gtkblist.c:1274
+#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1321
 msgid "_Collapse"
 msgstr "_弌于亠�仆���"
 
-#: ../pidgin/gtkblist.c:1279
+#: ../pidgin/gtkblist.c:1326
 msgid "_Expand"
 msgstr "�_舒亰于亠�仆���"
 
-#: ../pidgin/gtkblist.c:1524 ../pidgin/gtkblist.c:1536
-#: ../pidgin/gtkblist.c:4522 ../pidgin/gtkblist.c:4532
+#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkblist.c:1583
+#: ../pidgin/gtkblist.c:4561 ../pidgin/gtkblist.c:4571
 msgid "/Tools/Mute Sounds"
 msgstr "/�仆����仄亠仆��/��从仍��亳�� 亰于�从亳"
 
-#: ../pidgin/gtkblist.c:1996 ../pidgin/gtkconv.c:4610
-#: ../pidgin/gtkpounce.c:423
+#: ../pidgin/gtkblist.c:2043 ../pidgin/gtkconv.c:4619
+#: ../pidgin/gtkpounce.c:429
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
 msgstr ""
 "�� 仆亠 仗仂亟从仍��亠仆� � ����仆仂亶 亰舒仗亳���, 仗仂亰于仂仍���亠亶 亟仂弍舒于亳�� ��仂亞仂 �仂弍亠�亠亟仆亳从舒."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:2836
+#: ../pidgin/gtkblist.c:2838
 msgid "/_Buddies"
 msgstr "/_弌仂弍亠�亠亟仆亳从亳"
 
-#: ../pidgin/gtkblist.c:2837
-msgid "/Buddies/New Instant _Message..."
-msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂于仂亠 仄亞仆仂于亠仆仆仂亠 �仂仂弍_�亠仆亳亠..."
-
-#: ../pidgin/gtkblist.c:2838
-msgid "/Buddies/Join a _Chat..."
-msgstr "/弌仂弍亠�亠亟仆亳从亳/��亳�仂亠亟亳仆亳���� 从 _�舒��..."
-
 #: ../pidgin/gtkblist.c:2839
+msgid "/Buddies/New Instant _Message..."
+msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂于仂亠 仄亞仆仂于亠仆仆仂亠 �仂仂弍_�亠仆亳亠..."
+
+#: ../pidgin/gtkblist.c:2840
+msgid "/Buddies/Join a _Chat..."
+msgstr "/弌仂弍亠�亠亟仆亳从亳/��亳�仂亠亟亳仆亳���� 从 _�舒��..."
+
+#: ../pidgin/gtkblist.c:2841
 msgid "/Buddies/Get User _Info..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂仍��亳�� 仗仂仍�亰仂于舒�亠仍��从�� _亳仆�仂�仄舒�亳�..."
 
-#: ../pidgin/gtkblist.c:2840
+#: ../pidgin/gtkblist.c:2842
 msgid "/Buddies/View User _Log..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/��仂�仄仂��亠�� _亢��仆舒仍 仗仂仍�亰仂于舒�亠仍�..."
 
-#: ../pidgin/gtkblist.c:2842
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒�� �仂弍亠�亠亟仆亳从仂于 _仆亠 于 �亠�亳"
-
-#: ../pidgin/gtkblist.c:2843
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒�� 仗_����亠 亞��仗仗�"
-
 #: ../pidgin/gtkblist.c:2844
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒�� �仂弍亠�亠亟仆亳从仂于 _仆亠 于 �亠�亳"
+
+#: ../pidgin/gtkblist.c:2845
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒�� 仗_����亠 亞��仗仗�"
+
+#: ../pidgin/gtkblist.c:2846
 msgid "/Buddies/Show Buddy _Details"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒�� _仗仂亟�仂弍仆仂��亳 仂 �仂弍亠�亠亟仆亳从亠"
 
-#: ../pidgin/gtkblist.c:2845
+#: ../pidgin/gtkblist.c:2847
 msgid "/Buddies/Show Idle _Times"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒�� _于�亠仄� 弍亠亰亟亠亶��于亳�"
 
-#: ../pidgin/gtkblist.c:2846
+#: ../pidgin/gtkblist.c:2848
 msgid "/Buddies/_Sort Buddies"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/_弌仂��亳�仂于舒�� �仂弍亠�亠亟仆亳从仂于"
 
-#: ../pidgin/gtkblist.c:2848
+#: ../pidgin/gtkblist.c:2850
 msgid "/Buddies/_Add Buddy..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/_�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒..."
 
-#: ../pidgin/gtkblist.c:2849
+#: ../pidgin/gtkblist.c:2851
 msgid "/Buddies/Add C_hat..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� �_舒�..."
 
-#: ../pidgin/gtkblist.c:2850
+#: ../pidgin/gtkblist.c:2852
 msgid "/Buddies/Add _Group..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� _亞��仗仗�..."
 
-#: ../pidgin/gtkblist.c:2852
-msgid "/Buddies/_About Pidgin"
-msgstr "/弌仂弍亠�亠亟仆亳从亳/_� Pidgin"
-
-#: ../pidgin/gtkblist.c:2853
+#: ../pidgin/gtkblist.c:2854
 msgid "/Buddies/_Quit"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�_�亶�亳"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:2856
+#: ../pidgin/gtkblist.c:2857
 msgid "/_Accounts"
 msgstr "/_丕���仆�亠 亰舒仗亳�亳"
 
-#: ../pidgin/gtkblist.c:2857 ../pidgin/gtkblist.c:6473
+#: ../pidgin/gtkblist.c:2858 ../pidgin/gtkblist.c:6532
 msgid "/Accounts/Add\\/Edit"
 msgstr "/丕���仆�亠 亰舒仗亳�亳/�仂弍舒于亳��\\/�亰仄亠仆亳��"
 
 #. Tools
-#: ../pidgin/gtkblist.c:2860
+#: ../pidgin/gtkblist.c:2861
 msgid "/_Tools"
 msgstr "/_�仆����仄亠仆��"
 
-#: ../pidgin/gtkblist.c:2861
+#: ../pidgin/gtkblist.c:2862
 msgid "/Tools/Buddy _Pounces"
 msgstr "/�仆����仄亠仆��/_弌仍亠亢亠仆亳亠 亰舒 �仂弍亠�亠亟仆亳从舒仄亳"
 
-#: ../pidgin/gtkblist.c:2862
+#: ../pidgin/gtkblist.c:2863
 msgid "/Tools/Plu_gins"
 msgstr "/�仆����仄亠仆��/_�仂亟�仍亳"
 
-#: ../pidgin/gtkblist.c:2863
-msgid "/Tools/Pr_eferences"
-msgstr "/�仆����仄亠仆��/_�舒���仂亶从亳"
-
 #: ../pidgin/gtkblist.c:2864
+msgid "/Tools/Pr_eferences"
+msgstr "/�仆����仄亠仆��/_�舒���仂亶从亳"
+
+#: ../pidgin/gtkblist.c:2865
 msgid "/Tools/Pr_ivacy"
 msgstr "/�仆����仄亠仆��/�_仂仆�亳亟亠仆�亳舒仍�仆仂���"
 
-#: ../pidgin/gtkblist.c:2866
-msgid "/Tools/_File Transfers"
-msgstr "/�仆����仄亠仆��/�亠�亠亟舒�舒 _�舒亶仍仂于"
-
 #: ../pidgin/gtkblist.c:2867
-msgid "/Tools/R_oom List"
-msgstr "/�仆����仄亠仆��/弌仗亳�仂从 _从仂仄仆舒�"
+msgid "/Tools/_File Transfers"
+msgstr "/�仆����仄亠仆��/�亠�亠亟舒�舒 _�舒亶仍仂于"
 
 #: ../pidgin/gtkblist.c:2868
+msgid "/Tools/R_oom List"
+msgstr "/�仆����仄亠仆��/弌仗亳�仂从 _从仂仄仆舒�"
+
+#: ../pidgin/gtkblist.c:2869
 msgid "/Tools/System _Log"
 msgstr "/�仆����仄亠仆��/弌亳��亠仄仆�亶 _亢��仆舒仍"
 
-#: ../pidgin/gtkblist.c:2869
-msgid "/Tools/_Debug Window"
-msgstr "/�仆����仄亠仆��/�从仆仂 仂_�仍舒亟从亳"
-
 #: ../pidgin/gtkblist.c:2871
 msgid "/Tools/Mute _Sounds"
 msgstr "/�仆����仄亠仆��/��从仍��亳�� _亰于�从亳"
 
-#: ../pidgin/gtkblist.c:2899
+#. Help
+#: ../pidgin/gtkblist.c:2873
+msgid "/_Help"
+msgstr "/_�仂仄仂��"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Help/Online _Help"
+msgstr "/�仂仄仂��/�仂仄仂�� 于 _�亠�亳"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Help/_Debug Window"
+msgstr "/�仂仄仂��/�从仆仂 _仂�仍舒亟从亳"
+
+#: ../pidgin/gtkblist.c:2877 ../pidgin/gtkblist.c:2879
+msgid "/Help/_About"
+msgstr "/�仂仄仂��/� _仗�仂亞�舒仄仄亠"
+
+#: ../pidgin/gtkblist.c:2908
 #, c-format
 msgid ""
 "\n"
@@ -12126,73 +12169,78 @@
 "\n"
 "<b>丕���仆舒� 亰舒仗亳��:</b> %s"
 
-#: ../pidgin/gtkblist.c:2977
+#: ../pidgin/gtkblist.c:2986
 msgid "Buddy Alias"
 msgstr "��亠于亟仂仆亳仄 �仂弍亠�亠亟仆亳从舒"
 
-#: ../pidgin/gtkblist.c:2998
+#: ../pidgin/gtkblist.c:3015
 msgid "Logged In"
 msgstr "� �亠�亳"
 
-#: ../pidgin/gtkblist.c:3044
+#: ../pidgin/gtkblist.c:3061
 msgid "Last Seen"
 msgstr "�仂�仍亠亟仆亠亠 仗仂�于仍亠仆亳亠"
 
-#: ../pidgin/gtkblist.c:3064
+#: ../pidgin/gtkblist.c:3081
 msgid "Spooky"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3066
+#: ../pidgin/gtkblist.c:3083
 msgid "Awesome"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3068
+#: ../pidgin/gtkblist.c:3085
 msgid "Rockin'"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:3397
+#: ../pidgin/gtkblist.c:3428
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr "�亠亰亟亠亶��于�亠� %d亟 %d� %02d仄"
+
+#: ../pidgin/gtkblist.c:3430
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "�亠亰亟亠亶��于�亠� %d� %02d仄"
 
-#: ../pidgin/gtkblist.c:3399
+#: ../pidgin/gtkblist.c:3432
 #, c-format
 msgid "Idle %dm"
 msgstr "�亠亰亟亠亶��于�亠� %d仄"
 
-#: ../pidgin/gtkblist.c:3544
+#: ../pidgin/gtkblist.c:3577
 msgid "/Buddies/New Instant Message..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂于仂亠 仄亞仆仂于亠仆仆仂亠 �仂仂弍�亠仆亳亠..."
 
-#: ../pidgin/gtkblist.c:3545 ../pidgin/gtkblist.c:3578
+#: ../pidgin/gtkblist.c:3578 ../pidgin/gtkblist.c:3611
 msgid "/Buddies/Join a Chat..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/��亳�仂亠亟亳仆亳���� 从 �舒��..."
 
-#: ../pidgin/gtkblist.c:3546
+#: ../pidgin/gtkblist.c:3579
 msgid "/Buddies/Get User Info..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂仍��亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳�..."
 
-#: ../pidgin/gtkblist.c:3547
+#: ../pidgin/gtkblist.c:3580
 msgid "/Buddies/Add Buddy..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� �仂弍亠�亠亟仆亳从舒..."
 
-#: ../pidgin/gtkblist.c:3548 ../pidgin/gtkblist.c:3581
+#: ../pidgin/gtkblist.c:3581 ../pidgin/gtkblist.c:3614
 msgid "/Buddies/Add Chat..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� �舒�..."
 
-#: ../pidgin/gtkblist.c:3549
+#: ../pidgin/gtkblist.c:3582
 msgid "/Buddies/Add Group..."
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂弍舒于亳�� 亞��仗仗�..."
 
-#: ../pidgin/gtkblist.c:3584
+#: ../pidgin/gtkblist.c:3617
 msgid "/Tools/Privacy"
 msgstr "/�仆����仄亠仆��/�仂仆�亳亟亠仆�亳舒仍�仆仂���"
 
-#: ../pidgin/gtkblist.c:3587
+#: ../pidgin/gtkblist.c:3620
 msgid "/Tools/Room List"
 msgstr "/�仆����仄亠仆��/弌仗亳�仂从 从仂仄仆舒�"
 
-#: ../pidgin/gtkblist.c:3684 ../pidgin/gtkdocklet.c:153
+#: ../pidgin/gtkblist.c:3717 ../pidgin/gtkdocklet.c:153
 #, c-format
 msgid "%d unread message from %s\n"
 msgid_plural "%d unread messages from %s\n"
@@ -12200,54 +12248,54 @@
 msgstr[1] "%d 仆亠仗�仂�亳�舒仆仆�� �仂仂弍�亠仆亳� 仂� %s\n"
 msgstr[2] "%d 仆亠仗�仂�亳�舒仆仆�� �仂仂弍�亠仆亳亶 仂� %s\n"
 
-#: ../pidgin/gtkblist.c:3761
+#: ../pidgin/gtkblist.c:3797
 msgid "Manually"
 msgstr "����仆��"
 
-#: ../pidgin/gtkblist.c:3763
+#: ../pidgin/gtkblist.c:3799
 msgid "Alphabetically"
 msgstr "�仂 舒仍�舒于亳��"
 
-#: ../pidgin/gtkblist.c:3764
+#: ../pidgin/gtkblist.c:3800
 msgid "By status"
 msgstr "�仂 ��舒����"
 
-#: ../pidgin/gtkblist.c:3765
+#: ../pidgin/gtkblist.c:3801
 msgid "By log size"
 msgstr "�仂 �舒亰仄亠�� 亢��仆舒仍舒"
 
-#: ../pidgin/gtkblist.c:3967 ../pidgin/gtkconn.c:178
+#: ../pidgin/gtkblist.c:4005 ../pidgin/gtkconn.c:178
 #, c-format
 msgid "%s disconnected"
 msgstr "弌仂亠亟亳仆亠仆亳亠 � %s �舒亰仂�于舒仆仂"
 
-#: ../pidgin/gtkblist.c:3977
+#: ../pidgin/gtkblist.c:4015
 msgid "Re-enable Account"
 msgstr "�仂于�仂�仆仂 于从仍��亳�� ����仆�� 亰舒仗亳��"
 
-#: ../pidgin/gtkblist.c:4001
+#: ../pidgin/gtkblist.c:4039
 #, c-format
 msgid "<span color=\"red\">%s disconnected: %s</span>"
 msgstr "<span color=\"red\">弌仂亠亟亳仆亠仆亳亠 � %s �舒亰仂�于舒仆仂: %s</span>"
 
-#: ../pidgin/gtkblist.c:4153
+#: ../pidgin/gtkblist.c:4191
 msgid "<b>Username:</b>"
 msgstr "<b>�仄� 仗仂仍�亰仂于舒�亠仍�:</b>"
 
-#: ../pidgin/gtkblist.c:4160
+#: ../pidgin/gtkblist.c:4198
 msgid "<b>Password:</b>"
 msgstr "<b>�舒�仂仍�:</b>"
 
-#: ../pidgin/gtkblist.c:4171
+#: ../pidgin/gtkblist.c:4209
 msgid "_Login"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:4256
+#: ../pidgin/gtkblist.c:4292
 msgid "/Accounts"
 msgstr "/丕���仆�亠 亰舒仗亳�亳"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4270
+#: ../pidgin/gtkblist.c:4306
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -12266,23 +12314,23 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4516
+#: ../pidgin/gtkblist.c:4555
 msgid "/Buddies/Show Offline Buddies"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒�� �仂弍亠�亠亟仆亳从仂于 仆亠 于 �亠�亳"
 
-#: ../pidgin/gtkblist.c:4519
+#: ../pidgin/gtkblist.c:4558
 msgid "/Buddies/Show Empty Groups"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒�� 仗����亠 亞��仗仗�"
 
-#: ../pidgin/gtkblist.c:4525
+#: ../pidgin/gtkblist.c:4564
 msgid "/Buddies/Show Buddy Details"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒�� 仗仂亟�仂弍仆仂��亳 仂 �仂弍亠�亠亟仆亳从亠"
 
-#: ../pidgin/gtkblist.c:4528
+#: ../pidgin/gtkblist.c:4567
 msgid "/Buddies/Show Idle Times"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/�仂从舒亰�于舒�� 于�亠仄� 弍亠亰亟亠亶��于亳�"
 
-#: ../pidgin/gtkblist.c:5385
+#: ../pidgin/gtkblist.c:5444
 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. "
@@ -12294,25 +12342,25 @@
 "仗仂仍�亰仂于舒�亠仍�, 从仂亞亟舒 ��仂 于仂亰仄仂亢仆仂.\n"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5420
+#: ../pidgin/gtkblist.c:5479
 msgid "_Screen name:"
 msgstr "_�亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍�:"
 
-#: ../pidgin/gtkblist.c:5442 ../pidgin/gtkblist.c:5796
+#: ../pidgin/gtkblist.c:5501 ../pidgin/gtkblist.c:5855
 msgid "A_lias:"
 msgstr "_��亠于亟仂仆亳仄:"
 
-#: ../pidgin/gtkblist.c:5708
+#: ../pidgin/gtkblist.c:5767
 msgid "This protocol does not support chat rooms."
 msgstr "亅�仂� 仗�仂�仂从仂仍 仆亠 仗仂亟亟亠�亢亳于舒亠� �舒��."
 
-#: ../pidgin/gtkblist.c:5724
+#: ../pidgin/gtkblist.c:5783
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
 msgstr "�� 仆亠 仗仂亟从仍��亠仆� 仗仂 仗�仂�仂从仂仍舒仄, 亳仄亠��亳仄 仗仂亟亟亠�亢从� �舒�仂于."
 
-#: ../pidgin/gtkblist.c:5765
+#: ../pidgin/gtkblist.c:5824
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
@@ -12320,39 +12368,39 @@
 "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亳 �仂仂�于亠���于����� 亳仆�仂�仄舒�亳� 仂 �舒�亠, 从仂�仂��亶 于� �仂�亠仍亳 弍� "
 "亟仂弍舒于亳�� 于 �仗亳�仂从 �仂弍亠�亠亟仆亳从仂于.\n"
 
-#: ../pidgin/gtkblist.c:5853
+#: ../pidgin/gtkblist.c:5912
 msgid "Please enter the name of the group to be added."
 msgstr "�于亠亟亳�亠 亳仄� 亟仂弍舒于仍�亠仄仂亶 亞��仗仗�."
 
-#: ../pidgin/gtkblist.c:6493
+#: ../pidgin/gtkblist.c:6552
 msgid "<PurpleMain>/Accounts/"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6517
+#: ../pidgin/gtkblist.c:6576
 msgid "_Edit Account"
 msgstr "_�亰仄亠仆亳�� ����仆�� 亰舒仗亳��"
 
-#: ../pidgin/gtkblist.c:6530 ../pidgin/gtkconv.c:2984
+#: ../pidgin/gtkblist.c:6589 ../pidgin/gtkconv.c:2994
 msgid "No actions available"
 msgstr "�亠� 亟仂���仗仆�� 亟亠亶��于亳亶"
 
-#: ../pidgin/gtkblist.c:6538
+#: ../pidgin/gtkblist.c:6597
 msgid "_Disable"
 msgstr "_��从仍��亳��"
 
-#: ../pidgin/gtkblist.c:6550
+#: ../pidgin/gtkblist.c:6609
 msgid "Enable Account"
 msgstr "�从仍��亳�� ����仆�� 亰舒仗亳��"
 
-#: ../pidgin/gtkblist.c:6556
+#: ../pidgin/gtkblist.c:6615
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr ""
 
-#: ../pidgin/gtkblist.c:6605
+#: ../pidgin/gtkblist.c:6664
 msgid "/Tools"
 msgstr "/�仆����仄亠仆��"
 
-#: ../pidgin/gtkblist.c:6675
+#: ../pidgin/gtkblist.c:6734
 msgid "/Buddies/Sort Buddies"
 msgstr "/弌仂弍亠�亠亟仆亳从亳/弌仂��亳�仂于舒�� �仂弍亠�亠亟仆亳从仂于"
 
@@ -12365,22 +12413,26 @@
 "re-enable the account."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:792 ../pidgin/gtkconv.c:818
+#: ../pidgin/gtkconv.c:486
+msgid "Unknown command."
+msgstr "�亠亳亰于亠��仆舒� 从仂仄舒仆亟舒."
+
+#: ../pidgin/gtkconv.c:758 ../pidgin/gtkconv.c:784
 msgid "That buddy is not on the same protocol as this chat."
 msgstr ""
 
-#: ../pidgin/gtkconv.c:812
+#: ../pidgin/gtkconv.c:778
 msgid ""
 "You are not currently signed on with an account that can invite that buddy."
 msgstr ""
 "�� 仆亠 仗仂亟从仍��亠仆� � ����仆仂亶 亰舒仗亳���, 仗仂亰于仂仍���亠亶 仗�亳亞仍舒�亳�� ��仂亞仂 �仂弍亠�亠亟仆亳从舒."
 
-#: ../pidgin/gtkconv.c:865
+#: ../pidgin/gtkconv.c:831
 msgid "Invite Buddy Into Chat Room"
 msgstr "��亳亞仍舒�亳�� �仂弍亠�亠亟仆亳从舒 于 �舒�"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:895
+#: ../pidgin/gtkconv.c:861
 msgid ""
 "Please enter the name of the user you wish to invite, along with an optional "
 "invite message."
@@ -12388,299 +12440,303 @@
 "�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� �仂�亳�亠 仗�亳亞仍舒�亳��, 于仄亠��亠 � "
 "仆亠仂弍�亰舒�亠仍�仆�仄 �亠从��仂仄 仗�亳亞仍舒�亠仆亳�."
 
-#: ../pidgin/gtkconv.c:916
+#: ../pidgin/gtkconv.c:882
 msgid "_Buddy:"
 msgstr "_弌仂弍亠�亠亟仆亳从:"
 
-#: ../pidgin/gtkconv.c:936 ../pidgin/gtksavedstatuses.c:1141
-#: ../pidgin/gtksavedstatuses.c:1477
+#: ../pidgin/gtkconv.c:902 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1525
 msgid "_Message:"
 msgstr "弌仂仂弍_�亠仆亳亠:"
 
-#: ../pidgin/gtkconv.c:993 ../pidgin/gtkconv.c:2542 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkconv.c:959 ../pidgin/gtkconv.c:2518 ../pidgin/gtkdebug.c:218
 #: ../pidgin/gtkft.c:542
 msgid "Unable to open file."
 msgstr "�亠 �亟舒���� 仂�从���� �舒亶仍."
 
-#: ../pidgin/gtkconv.c:999
+#: ../pidgin/gtkconv.c:965
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>�亠�亠亟舒 � %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1035
+#: ../pidgin/gtkconv.c:1001
 msgid "Save Conversation"
 msgstr "弌仂��舒仆亳�� 弍亠�亠亟�"
 
-#: ../pidgin/gtkconv.c:1184 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+#: ../pidgin/gtkconv.c:1150 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
 msgid "Find"
 msgstr "�舒亶�亳"
 
-#: ../pidgin/gtkconv.c:1210 ../pidgin/gtkdebug.c:194
+#: ../pidgin/gtkconv.c:1176 ../pidgin/gtkdebug.c:194
 msgid "_Search for:"
 msgstr "_��从舒��:"
 
-#: ../pidgin/gtkconv.c:1393
+#: ../pidgin/gtkconv.c:1359
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "�亠亟亠仆亳亠 亢��仆舒仍舒 仆舒�舒�仂. �仂�仍亠亟���亳亠 �仂仂弍�亠仆亳� 于 ��仂亶 弍亠�亠亟亠 弍�亟�� 亰舒仗亳�舒仆�."
 
-#: ../pidgin/gtkconv.c:1401
+#: ../pidgin/gtkconv.c:1367
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "�亠亟亠仆亳亠 亢��仆舒仍舒 仂��舒仆仂于仍亠仆仂. �仂�仍亠亟���亳亠 �仂仂弍�亠仆亳� 于 ��仂亶 弍亠�亠亟亠 仆亠 弍�亟�� "
 "亰舒仗亳�舒仆�."
 
-#: ../pidgin/gtkconv.c:1649
+#: ../pidgin/gtkconv.c:1615
 msgid "Un-Ignore"
 msgstr "�亠 亳亞仆仂�亳�仂于舒��"
 
-#: ../pidgin/gtkconv.c:1652
+#: ../pidgin/gtkconv.c:1618
 msgid "Ignore"
 msgstr "�亞仆仂�亳�仂于舒��"
 
-#: ../pidgin/gtkconv.c:1672
+#: ../pidgin/gtkconv.c:1638
 msgid "Get Away Message"
 msgstr "�仂仍��亳�� �仂仂弍�亠仆亳亠 仂弍 仂������于亳亳"
 
-#: ../pidgin/gtkconv.c:1695
+#: ../pidgin/gtkconv.c:1661
 msgid "Last said"
 msgstr "�仂�仍亠亟仆亠亠 �从舒亰舒仆仆仂亠"
 
-#: ../pidgin/gtkconv.c:2550
+#: ../pidgin/gtkconv.c:2526
 msgid "Unable to save icon file to disk."
 msgstr "�亠 �亟舒���� �仂��舒仆亳�� �舒亶仍 亰仆舒�从舒 仆舒 亟亳�从."
 
-#: ../pidgin/gtkconv.c:2601
+#: ../pidgin/gtkconv.c:2577
 msgid "Save Icon"
 msgstr "弌仂��舒仆亳�� 亰仆舒�仂从"
 
-#: ../pidgin/gtkconv.c:2653
+#: ../pidgin/gtkconv.c:2629
 msgid "Animate"
 msgstr "�仆亳仄亳�仂于舒��"
 
-#: ../pidgin/gtkconv.c:2658
+#: ../pidgin/gtkconv.c:2634
 msgid "Hide Icon"
 msgstr "弌从���� 亰仆舒�仂从"
 
-#: ../pidgin/gtkconv.c:2661
+#: ../pidgin/gtkconv.c:2637
 msgid "Save Icon As..."
 msgstr "弌仂��舒仆亳�� 亰仆舒�仂从 从舒从..."
 
-#: ../pidgin/gtkconv.c:2665
+#: ../pidgin/gtkconv.c:2641
 msgid "Set Custom Icon..."
 msgstr "丕��舒仆仂于亳�� �仂弍��于亠仆仆�亶 亰仆舒�仂从..."
 
-#: ../pidgin/gtkconv.c:2678
+#: ../pidgin/gtkconv.c:2654
 msgid "Remove Custom Icon"
 msgstr "丕亟舒仍亳�� �仂弍��于亠仆仆�亶 亰仆舒�仂从"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2820
+#: ../pidgin/gtkconv.c:2796
 msgid "/_Conversation"
 msgstr "/_�亠�亠亟舒"
 
-#: ../pidgin/gtkconv.c:2822
+#: ../pidgin/gtkconv.c:2798
 msgid "/Conversation/New Instant _Message..."
 msgstr "/�亠�亠亟舒/�仂于仂亠 仄亞仆仂于亠仆仆仂亠 �仂仂弍_�亠仆亳亠..."
 
-#: ../pidgin/gtkconv.c:2827
+#: ../pidgin/gtkconv.c:2803
 msgid "/Conversation/_Find..."
 msgstr "/�亠�亠亟舒/_�舒亶�亳..."
 
-#: ../pidgin/gtkconv.c:2829
+#: ../pidgin/gtkconv.c:2805
 msgid "/Conversation/View _Log"
 msgstr "/�亠�亠亟舒/��仂�仄仂��亠�� _亢��仆舒仍"
 
-#: ../pidgin/gtkconv.c:2830
+#: ../pidgin/gtkconv.c:2806
 msgid "/Conversation/_Save As..."
 msgstr "/�亠�亠亟舒/弌仂_��舒仆亳�� 从舒从..."
 
-#: ../pidgin/gtkconv.c:2832
+#: ../pidgin/gtkconv.c:2808
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/�亠�亠亟舒/�_�亳��亳��"
 
-#: ../pidgin/gtkconv.c:2836
+#: ../pidgin/gtkconv.c:2812
 msgid "/Conversation/Se_nd File..."
 msgstr "/�亠�亠亟舒/��仗�舒于亳�� _�舒亶仍..."
 
-#: ../pidgin/gtkconv.c:2837
+#: ../pidgin/gtkconv.c:2813
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/�亠�亠亟舒/�仂弍舒于亳�� 仗_�舒于亳仍仂..."
 
-#: ../pidgin/gtkconv.c:2839
+#: ../pidgin/gtkconv.c:2815
 msgid "/Conversation/_Get Info"
 msgstr "/�亠�亠亟舒/�仂仍��亳�� _亳仆�仂�仄舒�亳�"
 
-#: ../pidgin/gtkconv.c:2841
+#: ../pidgin/gtkconv.c:2817
 msgid "/Conversation/In_vite..."
 msgstr "/�亠�亠亟舒/��亳亞_仍舒�亳��..."
 
-#: ../pidgin/gtkconv.c:2843
+#: ../pidgin/gtkconv.c:2819
 msgid "/Conversation/M_ore"
 msgstr "/�亠�亠亟舒/_���"
 
-#: ../pidgin/gtkconv.c:2847
+#: ../pidgin/gtkconv.c:2823
 msgid "/Conversation/Al_ias..."
 msgstr "/�亠�亠亟舒/_��亠于亟仂仆亳仄..."
 
-#: ../pidgin/gtkconv.c:2849
+#: ../pidgin/gtkconv.c:2825
 msgid "/Conversation/_Block..."
 msgstr "/�亠�亠亟舒/_�仍仂从亳�仂于舒��..."
 
-#: ../pidgin/gtkconv.c:2851
+#: ../pidgin/gtkconv.c:2827
 msgid "/Conversation/_Unblock..."
 msgstr "/�亠�亠亟舒/�舒亰_弍仍仂从亳�仂于舒��..."
 
-#: ../pidgin/gtkconv.c:2853
+#: ../pidgin/gtkconv.c:2829
 msgid "/Conversation/_Add..."
 msgstr "/�亠�亠亟舒/_�仂弍舒于亳��..."
 
-#: ../pidgin/gtkconv.c:2855
+#: ../pidgin/gtkconv.c:2831
 msgid "/Conversation/_Remove..."
 msgstr "/�亠�亠亟舒/_丕亟舒仍亳��..."
 
-#: ../pidgin/gtkconv.c:2860
+#: ../pidgin/gtkconv.c:2836
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/�亠�亠亟舒/���舒于亳�� _���仍从�..."
 
-#: ../pidgin/gtkconv.c:2862
+#: ../pidgin/gtkconv.c:2838
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/�亠�亠亟舒/���舒于亳�� 亳亰_仂弍�舒亢亠仆亳亠..."
 
-#: ../pidgin/gtkconv.c:2868
+#: ../pidgin/gtkconv.c:2844
 msgid "/Conversation/_Close"
 msgstr "/�亠�亠亟舒/_�舒从����"
 
 #. Options
-#: ../pidgin/gtkconv.c:2872
+#: ../pidgin/gtkconv.c:2848
 msgid "/_Options"
 msgstr "/_�舒�舒仄亠���"
 
-#: ../pidgin/gtkconv.c:2873
+#: ../pidgin/gtkconv.c:2849
 msgid "/Options/Enable _Logging"
 msgstr "/�舒�舒仄亠���/�亠��亳 _亢��仆舒仍"
 
-#: ../pidgin/gtkconv.c:2874
+#: ../pidgin/gtkconv.c:2850
 msgid "/Options/Enable _Sounds"
 msgstr "/�舒�舒仄亠���/�仂�仗�仂亳亰于仂亟亳�� _亰于�从亳"
 
-#: ../pidgin/gtkconv.c:2875
+#: ../pidgin/gtkconv.c:2851
 msgid "/Options/Show Buddy _Icon"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� 亰_仆舒�仂从 �仂弍亠�亠亟仆亳从舒"
 
-#: ../pidgin/gtkconv.c:2877
+#: ../pidgin/gtkconv.c:2853
 msgid "/Options/Show Formatting _Toolbars"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� _仗舒仆亠仍亳 �仂�仄舒�亳�仂于舒仆亳�"
 
-#: ../pidgin/gtkconv.c:2878
+#: ../pidgin/gtkconv.c:2854
 msgid "/Options/Show Ti_mestamps"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� _于�亠仄� �仂仂弍�亠仆亳亶"
 
-#: ../pidgin/gtkconv.c:2954
+#: ../pidgin/gtkconv.c:2930
 msgid "/Conversation/More"
 msgstr "/�亠�亠亟舒/���"
 
+#: ../pidgin/gtkconv.c:3038
+msgid "/Options"
+msgstr "/�舒�舒仄亠���"
+
 #. 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:3008 ../pidgin/gtkconv.c:3040
+#: ../pidgin/gtkconv.c:3073 ../pidgin/gtkconv.c:3105
 msgid "/Conversation"
 msgstr "/�亠�亠亟舒"
 
-#: ../pidgin/gtkconv.c:3048
+#: ../pidgin/gtkconv.c:3113
 msgid "/Conversation/View Log"
 msgstr "/�亠�亠亟舒/��仂�仄仂��亠�� 亢��仆舒仍"
 
-#: ../pidgin/gtkconv.c:3054
+#: ../pidgin/gtkconv.c:3119
 msgid "/Conversation/Send File..."
 msgstr "/�亠�亠亟舒/��仗�舒于亳�� �舒亶仍..."
 
-#: ../pidgin/gtkconv.c:3058
+#: ../pidgin/gtkconv.c:3123
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/�亠�亠亟舒/�仂弍舒于亳�� 仗�舒于亳仍仂..."
 
-#: ../pidgin/gtkconv.c:3064
+#: ../pidgin/gtkconv.c:3129
 msgid "/Conversation/Get Info"
 msgstr "/�亠�亠亟舒/�仂仍��亳�� 亳仆�仂�仄舒�亳�"
 
-#: ../pidgin/gtkconv.c:3068
+#: ../pidgin/gtkconv.c:3133
 msgid "/Conversation/Invite..."
 msgstr "/�亠�亠亟舒/��亳亞仍舒�亳��..."
 
-#: ../pidgin/gtkconv.c:3074
+#: ../pidgin/gtkconv.c:3139
 msgid "/Conversation/Alias..."
 msgstr "/�亠�亠亟舒/��亠于亟仂仆亳仄..."
 
-#: ../pidgin/gtkconv.c:3078
+#: ../pidgin/gtkconv.c:3143
 msgid "/Conversation/Block..."
 msgstr "/�亠�亠亟舒/�仍仂从亳�仂于舒��..."
 
-#: ../pidgin/gtkconv.c:3082
+#: ../pidgin/gtkconv.c:3147
 msgid "/Conversation/Unblock..."
 msgstr "/�亠�亠亟舒/�舒亰弍仍仂从亳�仂于舒��..."
 
-#: ../pidgin/gtkconv.c:3086
+#: ../pidgin/gtkconv.c:3151
 msgid "/Conversation/Add..."
 msgstr "/�亠�亠亟舒/�仂弍舒于亳��..."
 
-#: ../pidgin/gtkconv.c:3090
+#: ../pidgin/gtkconv.c:3155
 msgid "/Conversation/Remove..."
 msgstr "/�亠�亠亟舒/丕亟舒仍亳��..."
 
-#: ../pidgin/gtkconv.c:3096
+#: ../pidgin/gtkconv.c:3161
 msgid "/Conversation/Insert Link..."
 msgstr "/�亠�亠亟舒/���舒于亳�� ���仍从�..."
 
-#: ../pidgin/gtkconv.c:3100
+#: ../pidgin/gtkconv.c:3165
 msgid "/Conversation/Insert Image..."
 msgstr "/�亠�亠亟舒/���舒于亳�� 亳亰仂弍�舒亢亠仆亳亠..."
 
-#: ../pidgin/gtkconv.c:3106
+#: ../pidgin/gtkconv.c:3171
 msgid "/Options/Enable Logging"
 msgstr "/�舒�舒仄亠���/�亠��亳 亢��仆舒仍"
 
-#: ../pidgin/gtkconv.c:3109
+#: ../pidgin/gtkconv.c:3174
 msgid "/Options/Enable Sounds"
 msgstr "/�舒�舒仄亠���/�仂�仗�仂亳亰于仂亟亳�� 亰于�从亳"
 
-#: ../pidgin/gtkconv.c:3122
+#: ../pidgin/gtkconv.c:3187
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� 仗舒仆亠仍亳 �仂�仄舒�亳�仂于舒仆亳�"
 
-#: ../pidgin/gtkconv.c:3125
+#: ../pidgin/gtkconv.c:3190
 msgid "/Options/Show Timestamps"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� 于�亠仄� �仂仂弍�亠仆亳亶"
 
-#: ../pidgin/gtkconv.c:3128
+#: ../pidgin/gtkconv.c:3193
 msgid "/Options/Show Buddy Icon"
 msgstr "/�舒�舒仄亠���/�仂从舒亰�于舒�� 亰仆舒�仂从 �仂弍亠�亠亟仆亳从舒"
 
-#: ../pidgin/gtkconv.c:3212 ../pidgin/gtkconv.c:3254
+#: ../pidgin/gtkconv.c:3277 ../pidgin/gtkconv.c:3319
 msgid "User is typing..."
 msgstr "�仂仍�亰仂于舒�亠仍� 仆舒弍亳�舒亠� �仂仂弍�亠仆亳亠..."
 
-#: ../pidgin/gtkconv.c:3257
+#: ../pidgin/gtkconv.c:3322
 msgid "User has typed something and stopped"
 msgstr "�仂仍�亰仂于舒�亠仍� ��仂-�仂 仆舒弍�舒仍 亳 仂��舒仆仂于亳仍��"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3439
+#: ../pidgin/gtkconv.c:3504
 msgid "_Send To"
 msgstr "_�亟�亠�舒�"
 
-#: ../pidgin/gtkconv.c:4153
+#: ../pidgin/gtkconv.c:4218
 msgid "_Send"
 msgstr "_��仗�舒于亳��"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4304
+#: ../pidgin/gtkconv.c:4322
 msgid "0 people in room"
 msgstr "0 仗仂仍�亰仂于舒�亠仍亠亶 于 从仂仄仆舒�亠"
 
-#: ../pidgin/gtkconv.c:5496 ../pidgin/gtkconv.c:5617
+#: ../pidgin/gtkconv.c:5518 ../pidgin/gtkconv.c:5639
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
@@ -12688,71 +12744,75 @@
 msgstr[1] "%d 仗仂仍�亰仂于舒�亠仍� 于 从仂仄仆舒�亠"
 msgstr[2] "%d 仗仂仍�亰仂于舒�亠仍亠亶 于 从仂仄仆舒�亠"
 
-#: ../pidgin/gtkconv.c:6191 ../pidgin/gtkstatusbox.c:657
+#: ../pidgin/gtkconv.c:6238 ../pidgin/gtkstatusbox.c:659
 msgid "Typing"
 msgstr "�舒弍亳�舒亠� �仂仂弍�亠仆亳亠"
 
-#: ../pidgin/gtkconv.c:6197
+#: ../pidgin/gtkconv.c:6244
 msgid "Stopped Typing"
 msgstr "��亠从�舒�亳仍 仆舒弍仂� �仂仂弍�亠仆亳�"
 
-#: ../pidgin/gtkconv.c:6202
+#: ../pidgin/gtkconv.c:6249
 msgid "Nick Said"
 msgstr "��仂亳亰仆亠�亠仆仂 亳仄�"
 
-#: ../pidgin/gtkconv.c:6207 ../pidgin/gtkdocklet.c:492
+#: ../pidgin/gtkconv.c:6254 ../pidgin/gtkdocklet.c:492
 msgid "Unread Messages"
 msgstr "�亠仗�仂�亳�舒仆仆�亠 �仂仂弍�亠仆亳�"
 
-#: ../pidgin/gtkconv.c:6212
+#: ../pidgin/gtkconv.c:6259
 msgid "New Event"
 msgstr "�仂于仂亠 �仂弍��亳亠"
 
-#: ../pidgin/gtkconv.c:7344
+#: ../pidgin/gtkconv.c:7237
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "clear: ��亳��亳�� 于�亠 仂从仆舒 弍亠�亠亟."
+
+#: ../pidgin/gtkconv.c:7401
 msgid "Confirm close"
 msgstr "�仂亟�于亠�亟亳�� 亰舒从���亳亠"
 
-#: ../pidgin/gtkconv.c:7376
+#: ../pidgin/gtkconv.c:7433
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr "���� 仆亠仗�仂�亳�舒仆仆�亠 �仂仂弍�亠仆亳�. �� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 亰舒从���� 仂从仆仂?"
 
-#: ../pidgin/gtkconv.c:7898
+#: ../pidgin/gtkconv.c:8005
 msgid "Close other tabs"
 msgstr "�舒从���� 亟��亞亳亠 于从仍舒亟从亳"
 
-#: ../pidgin/gtkconv.c:7904
+#: ../pidgin/gtkconv.c:8011
 msgid "Close all tabs"
 msgstr "�舒从���� 于�亠 于从仍舒亟从亳"
 
-#: ../pidgin/gtkconv.c:7912
+#: ../pidgin/gtkconv.c:8019
 msgid "Detach this tab"
 msgstr "��亟亠仍亳�� ��� 于从仍舒亟从�"
 
-#: ../pidgin/gtkconv.c:7918
+#: ../pidgin/gtkconv.c:8025
 msgid "Close this tab"
 msgstr "�舒从���� ��� 于从仍舒亟从�"
 
-#: ../pidgin/gtkconv.c:8304
+#: ../pidgin/gtkconv.c:8506
 msgid "Close conversation"
 msgstr "�舒从���� 弍亠�亠亟�"
 
-#: ../pidgin/gtkconv.c:8827
+#: ../pidgin/gtkconv.c:9038
 msgid "Last created window"
 msgstr "�仂�仍亠亟仆亠亠 �仂亰亟舒仆仆仂亠 仂从仆仂"
 
-#: ../pidgin/gtkconv.c:8829
+#: ../pidgin/gtkconv.c:9040
 msgid "Separate IM and Chat windows"
 msgstr "��亟亠仍�仆�亠 仂从仆舒 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶 亳 �舒�仂于"
 
-#: ../pidgin/gtkconv.c:8831 ../pidgin/gtkprefs.c:1340
+#: ../pidgin/gtkconv.c:9042 ../pidgin/gtkprefs.c:1410
 msgid "New window"
 msgstr "�仂于仂亠 仂从仆仂"
 
-#: ../pidgin/gtkconv.c:8833
+#: ../pidgin/gtkconv.c:9044
 msgid "By group"
 msgstr "�仂 亞��仗仗亠"
 
-#: ../pidgin/gtkconv.c:8835
+#: ../pidgin/gtkconv.c:9046
 msgid "By account"
 msgstr "�仂 ����仆仂亶 亰舒仗亳�亳"
 
@@ -12877,7 +12937,7 @@
 msgstr "��舒弍�从亳亶"
 
 #: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:213
 msgid "Bulgarian"
 msgstr "�仂仍亞舒��从亳亶"
 
@@ -12890,8 +12950,8 @@
 msgid "Bosnian"
 msgstr "�仂�仆亳亶�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
 msgid "Catalan"
 msgstr "�舒�舒仍舒仆�从亳亶"
 
@@ -12899,7 +12959,7 @@
 msgid "Valencian-Catalan"
 msgstr "�舒仍亠仆�亳亶�从亳亶-从舒�舒仍舒仆�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:216
 msgid "Czech"
 msgstr "丼亠��从亳亶"
 
@@ -12908,7 +12968,7 @@
 msgstr "�舒��从亳亶"
 
 #: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:215
+#: ../pidgin/gtkdialogs.c:217
 msgid "German"
 msgstr "�亠仄亠�从亳亶"
 
@@ -12937,9 +12997,9 @@
 msgid "Esperanto"
 msgstr "亅�仗亠�舒仆�仂"
 
-#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217 ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
 msgid "Spanish"
 msgstr "��仗舒仆�从亳亶"
 
@@ -12952,201 +13012,206 @@
 msgid "Persian"
 msgstr "�亠��亳亟�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:220
-#: ../pidgin/gtkdialogs.c:221
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
 msgid "Finnish"
 msgstr "个亳仆�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:222
-#: ../pidgin/gtkdialogs.c:223 ../pidgin/gtkdialogs.c:224
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227
 msgid "French"
 msgstr "个�舒仆��亰�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:157
+#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
 msgid "Galician"
 msgstr "�舒仍亳�亳亶�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:158 ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:159 ../pidgin/gtkdialogs.c:160
 msgid "Gujarati"
 msgstr "��亟亢舒�舒�亳"
 
-#: ../pidgin/gtkdialogs.c:159
+#: ../pidgin/gtkdialogs.c:160
 msgid "Gujarati Language Team"
 msgstr "�仂仄舒仆亟舒 仗亠�亠于仂亟�亳从仂于 仆舒 亞�亟亢舒�舒�亳"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:228
 msgid "Hebrew"
 msgstr "�于�亳�"
 
-#: ../pidgin/gtkdialogs.c:161
+#: ../pidgin/gtkdialogs.c:162
 msgid "Hindi"
 msgstr "丱亳仆亟亳"
 
-#: ../pidgin/gtkdialogs.c:162
+#: ../pidgin/gtkdialogs.c:163
 msgid "Hungarian"
 msgstr "�亠仆亞亠��从亳亶"
 
-#: ../pidgin/gtkdialogs.c:163
+#: ../pidgin/gtkdialogs.c:164
 msgid "Indonesian"
 msgstr "�仆亟仂仆亠亰亳亶�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:164 ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:229
 msgid "Italian"
 msgstr "��舒仍��仆�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:232
 msgid "Japanese"
 msgstr "亊仗仂仆�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233
 msgid "Georgian"
 msgstr "���亰亳仆�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:166
+#: ../pidgin/gtkdialogs.c:167
 msgid "Ubuntu Georgian Translators"
 msgstr "�亠�亠于仂亟�亳从亳 Ubuntu 仆舒 亞��亰亳仆�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:168
 msgid "Kannada"
 msgstr "�舒仆仆舒亟舒"
 
-#: ../pidgin/gtkdialogs.c:167
+#: ../pidgin/gtkdialogs.c:168
 msgid "Kannada Translation team"
 msgstr "�仂仄舒仆亟舒 仗亠�亠于仂亟�亳从仂于 仆舒 从舒仆仆舒亟舒"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:232
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
 msgid "Korean"
 msgstr "�仂�亠亶�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:172
 msgid "Kurdish"
 msgstr "���亟�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:172 ../pidgin/gtkdialogs.c:233
-#: ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
 msgid "Lithuanian"
 msgstr "�亳�仂于�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:174
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:238
 msgid "Macedonian"
 msgstr "�舒从亠亟仂仆�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:176
 msgid "Bokm奪l Norwegian"
 msgstr "��从仄仂仍"
 
-#: ../pidgin/gtkdialogs.c:176
+#: ../pidgin/gtkdialogs.c:177
 msgid "Nepali"
 msgstr "�亠仗舒仍��从亳亶"
 
-#: ../pidgin/gtkdialogs.c:177
+#: ../pidgin/gtkdialogs.c:178
 msgid "Dutch, Flemish"
 msgstr "�亳亟亠�仍舒仆亟�从亳亶, �仍舒仄舒仆亟�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:178
+#: ../pidgin/gtkdialogs.c:179
 msgid "Norwegian"
 msgstr "�仂�于亠亢�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:180
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:180
+msgid "Norwegian Nynorsk"
+msgstr "�仂�于亠亢�从亳亶 仆�仆仂��从"
+
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:239
 msgid "Polish"
 msgstr "�仂仍��从亳亶"
 
-#: ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:184
 msgid "Portuguese"
 msgstr "�仂���亞舒仍��从亳亶"
 
-#: ../pidgin/gtkdialogs.c:183
-msgid "Portuguese-Brazil"
-msgstr "�仂���亞舒仍��从亳亶-弍�舒亰亳仍��从亳亶"
-
-#: ../pidgin/gtkdialogs.c:184
-msgid "Pashto"
-msgstr "�舒��仂"
-
 #: ../pidgin/gtkdialogs.c:185
+msgid "Portuguese-Brazil"
+msgstr "�仂���亞舒仍��从亳亶-弍�舒亰亳仍��从亳亶"
+
+#: ../pidgin/gtkdialogs.c:186
+msgid "Pashto"
+msgstr "�舒��仂"
+
+#: ../pidgin/gtkdialogs.c:187
 msgid "Romanian"
 msgstr "��仄�仆�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:237
-#: ../pidgin/gtkdialogs.c:238
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
 msgid "Russian"
 msgstr "����从亳亶"
 
-#: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:244
 msgid "Slovak"
 msgstr "弌仍仂于舒�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:245
 msgid "Slovenian"
 msgstr "弌仍仂于亠仆�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:192
 msgid "Albanian"
 msgstr "�仍弍舒仆�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:192
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:194
 msgid "Serbian"
 msgstr "弌亠�弍�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:246
 msgid "Swedish"
 msgstr "丿于亠亟�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:194
+#: ../pidgin/gtkdialogs.c:196
 msgid "Tamil"
 msgstr "丐舒仄亳仍��从亳亶"
 
-#: ../pidgin/gtkdialogs.c:195
+#: ../pidgin/gtkdialogs.c:197
 msgid "Telugu"
 msgstr "丐亠仍�亞�"
 
-#: ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:198
 msgid "Thai"
 msgstr "丐舒亶�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:247
 msgid "Turkish"
 msgstr "丐��亠�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:200
 msgid "Vietnamese"
 msgstr "��亠�仆舒仄�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:200
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh 亳 从仂仄舒仆亟舒 Gnome-Vi"
 
-#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:248
 msgid "Simplified Chinese"
 msgstr "丕仗�仂��仆仆�亶 从亳�舒亶�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:200 ../pidgin/gtkdialogs.c:201
-#: ../pidgin/gtkdialogs.c:202
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:204
 msgid "Hong Kong Chinese"
 msgstr "�仂仆从仂仆亞�从亳亶 从亳�舒亶�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:246
+#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:249
 msgid "Traditional Chinese"
 msgstr "丐�舒亟亳�亳仂仆仆�亶 从亳�舒亶�从亳亶"
 
-#: ../pidgin/gtkdialogs.c:210
+#: ../pidgin/gtkdialogs.c:212
 msgid "Amharic"
 msgstr "�仄�舒��从亳亶"
 
-#: ../pidgin/gtkdialogs.c:331
+#: ../pidgin/gtkdialogs.c:334
 #, c-format
 msgid "About %s"
 msgstr "� %s"
 
-#: ../pidgin/gtkdialogs.c:369
+#: ../pidgin/gtkdialogs.c:372
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -13168,43 +13233,43 @@
 "��舒��仆亳从仂于 仗�仂亠从�舒 �仄仂��亳�亠 于 �舒亶仍亠 'COPYRIGHT'.  �� 仆亠 仗�亠亟仂��舒于仍�亠仄 "
 "仆亳从舒从亳� 亞舒�舒仆�亳亶 仆舒 ��� 仗�仂亞�舒仄仄�.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:384
+#: ../pidgin/gtkdialogs.c:387
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin 仆舒 irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:389
+#: ../pidgin/gtkdialogs.c:392
 msgid "Current Developers"
 msgstr "丐亠从��亳亠 �舒亰�舒弍仂��亳从亳"
 
-#: ../pidgin/gtkdialogs.c:404
+#: ../pidgin/gtkdialogs.c:407
 msgid "Crazy Patch Writers"
 msgstr "�亟亠�亢亳仄�亠 仗亳�舒�亠仍亳 亰舒仗仍舒�仂从"
 
-#: ../pidgin/gtkdialogs.c:419
+#: ../pidgin/gtkdialogs.c:422
 msgid "Retired Developers"
 msgstr "�舒亰�舒弍仂��亳从亳, 仂�仂�亠亟�亳亠 仂� 亟亠仍"
 
-#: ../pidgin/gtkdialogs.c:434
+#: ../pidgin/gtkdialogs.c:437
 msgid "Artists"
 msgstr "丱�亟仂亢仆亳从亳"
 
-#: ../pidgin/gtkdialogs.c:449
+#: ../pidgin/gtkdialogs.c:452
 msgid "Current Translators"
 msgstr "丐亠从��亳亠 仗亠�亠于仂亟�亳从亳"
 
-#: ../pidgin/gtkdialogs.c:469
+#: ../pidgin/gtkdialogs.c:472
 msgid "Past Translators"
 msgstr "��亠亟�亟��亳亠 仗亠�亠于仂亟�亳从亳"
 
-#: ../pidgin/gtkdialogs.c:487
+#: ../pidgin/gtkdialogs.c:490
 msgid "Debugging Information"
 msgstr "��仍舒亟仂�仆舒� 亳仆�仂�仄舒�亳�"
 
-#: ../pidgin/gtkdialogs.c:865
+#: ../pidgin/gtkdialogs.c:859
 msgid "Get User Info"
 msgstr "�仂仍��亳�� 仗仂仍�亰仂于舒�亠仍��从�� 亳仆�仂�仄舒�亳�"
 
-#: ../pidgin/gtkdialogs.c:867
+#: ../pidgin/gtkdialogs.c:861
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
@@ -13212,11 +13277,11 @@
 "�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗�亠于亟仂仆亳仄 仗亠��仂仆�, 亳仆�仂�仄舒�亳� 仂 "
 "从仂�仂�仂亶 于� �仂�亠仍亳 弍� 仗�仂�仄仂��亠��."
 
-#: ../pidgin/gtkdialogs.c:957
+#: ../pidgin/gtkdialogs.c:951
 msgid "View User Log"
 msgstr "��仂�仄仂��亠�� 亢��仆舒仍 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../pidgin/gtkdialogs.c:959
+#: ../pidgin/gtkdialogs.c:953
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
@@ -13224,32 +13289,32 @@
 "�于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� 亳仍亳 仗�亠于亟仂仆亳仄 仗亠��仂仆�, 亢��仆舒仍 从仂�仂�仂亶 于� "
 "�仂�亠仍亳 弍� 仗�仂�仄仂��亠��."
 
-#: ../pidgin/gtkdialogs.c:979
+#: ../pidgin/gtkdialogs.c:973
 msgid "Alias Contact"
 msgstr "��亠于亟仂仆亳仄 从仂仆�舒从�舒"
 
-#: ../pidgin/gtkdialogs.c:980
+#: ../pidgin/gtkdialogs.c:974
 msgid "Enter an alias for this contact."
 msgstr "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亟仍� ��仂亞仂 从仂仆�舒从�舒."
 
-#: ../pidgin/gtkdialogs.c:1002
+#: ../pidgin/gtkdialogs.c:996
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亟仍� %s."
 
-#: ../pidgin/gtkdialogs.c:1004
+#: ../pidgin/gtkdialogs.c:998
 msgid "Alias Buddy"
 msgstr "��亠于亟仂仆亳仄 �仂弍亠�亠亟仆亳从舒"
 
-#: ../pidgin/gtkdialogs.c:1025
+#: ../pidgin/gtkdialogs.c:1019
 msgid "Alias Chat"
 msgstr "��亠于亟仂仆亳仄 �舒�舒"
 
-#: ../pidgin/gtkdialogs.c:1026
+#: ../pidgin/gtkdialogs.c:1020
 msgid "Enter an alias for this chat."
 msgstr "�于亠亟亳�亠 仗�亠于亟仂仆亳仄 亟仍� ��仂亞仂 �舒�舒."
 
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1059
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -13267,15 +13332,15 @@
 "�� �亟舒仍亳�亠 从仂仆�舒从�, �仂亟亠�亢舒�亳亶 %s 亳 %d 亟��亞亳� �仂弍亠�亠亟仆亳从仂于 亳亰 �仗亳�从舒 "
 "�仂弍亠�亠亟仆亳从仂于. 丱仂�亳�亠 仗�仂亟仂仍亢亳��?"
 
-#: ../pidgin/gtkdialogs.c:1073
+#: ../pidgin/gtkdialogs.c:1067
 msgid "Remove Contact"
 msgstr "丕亟舒仍亳�� 从仂仆�舒从�"
 
-#: ../pidgin/gtkdialogs.c:1076
+#: ../pidgin/gtkdialogs.c:1070
 msgid "_Remove Contact"
 msgstr "_丕亟舒仍亳�� 从仂仆�舒从�"
 
-#: ../pidgin/gtkdialogs.c:1107
+#: ../pidgin/gtkdialogs.c:1101
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
@@ -13283,15 +13348,15 @@
 msgstr ""
 "�� 亟仂弍舒于亳�亠 �仂亟亠�亢亳仄仂亠 亞��仗仗� %s 从 �仂亟亠�亢亳仄仂仄� 亞��仗仗� %s. 丱仂�亳�亠 仗�仂亟仂仍亢亳��?"
 
-#: ../pidgin/gtkdialogs.c:1114
+#: ../pidgin/gtkdialogs.c:1108
 msgid "Merge Groups"
 msgstr "�弍�亠亟亳仆亳�� 亞��仗仗�"
 
-#: ../pidgin/gtkdialogs.c:1117
+#: ../pidgin/gtkdialogs.c:1111
 msgid "_Merge Groups"
 msgstr "_�弍�亠亟亳仆亳�� 亞��仗仗�"
 
-#: ../pidgin/gtkdialogs.c:1167
+#: ../pidgin/gtkdialogs.c:1161
 #, c-format
 msgid ""
 "You are about to remove the group %s and all its members from your buddy "
@@ -13300,40 +13365,40 @@
 "�� �亟舒仍亳�亠 亞��仗仗� %s 亳 于�亠� 亠� �仍亠仆仂于 亳亰 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于. 丱仂�亳�亠 "
 "仗�仂亟仂仍亢亳��?"
 
-#: ../pidgin/gtkdialogs.c:1170
+#: ../pidgin/gtkdialogs.c:1164
 msgid "Remove Group"
 msgstr "丕亟舒仍亳�� 亞��仗仗�"
 
-#: ../pidgin/gtkdialogs.c:1173
+#: ../pidgin/gtkdialogs.c:1167
 msgid "_Remove Group"
 msgstr "_丕亟舒仍亳�� 亞��仗仗�"
 
-#: ../pidgin/gtkdialogs.c:1206
+#: ../pidgin/gtkdialogs.c:1200
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
 msgstr "�� �亟舒仍亳�亠 %s 亳亰 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于. 丱仂�亳�亠 仗�仂亟仂仍亢亳��?"
 
-#: ../pidgin/gtkdialogs.c:1209
+#: ../pidgin/gtkdialogs.c:1203
 msgid "Remove Buddy"
 msgstr "丕亟舒仍亳�� �仂弍亠�亠亟仆亳从舒"
 
-#: ../pidgin/gtkdialogs.c:1212
+#: ../pidgin/gtkdialogs.c:1206
 msgid "_Remove Buddy"
 msgstr "_丕亟舒仍亳�� �仂弍亠�亠亟仆亳从舒"
 
-#: ../pidgin/gtkdialogs.c:1233
+#: ../pidgin/gtkdialogs.c:1227
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr "�� �亟舒仍亳�亠 �舒� %s 亳亰 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于. 丱仂�亳�亠 仗�仂亟仂仍亢亳��?"
 
-#: ../pidgin/gtkdialogs.c:1236
+#: ../pidgin/gtkdialogs.c:1230
 msgid "Remove Chat"
 msgstr "丕亟舒仍亳�� �舒�"
 
-#: ../pidgin/gtkdialogs.c:1239
+#: ../pidgin/gtkdialogs.c:1233
 msgid "_Remove Chat"
 msgstr "_丕亟舒仍亳�� �舒�"
 
@@ -13429,66 +13494,66 @@
 msgid "Time Remaining:"
 msgstr "���舒仍仂�� 于�亠仄亠仆亳:"
 
-#: ../pidgin/gtkft.c:786
+#: ../pidgin/gtkft.c:783
 msgid "Close this window when all transfers _finish"
 msgstr "_�舒从��于舒�� ��仂 仂从仆仂 仗仂 亰舒于亠��亠仆亳亳 于�亠� 仗亠�亠亟舒�"
 
-#: ../pidgin/gtkft.c:796
+#: ../pidgin/gtkft.c:793
 msgid "C_lear finished transfers"
 msgstr "�_�亳�舒�� 亰舒于亠���仆仆�亠 仗亠�亠亟舒�亳"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:805
+#: ../pidgin/gtkft.c:802
 msgid "File transfer _details"
 msgstr "_�仂亟�仂弍仆仂��亳 仂 仗亠�亠亟舒�亠 �舒亶仍仂于"
 
 #. Pause button
-#: ../pidgin/gtkft.c:835 ../pidgin/pidginstock.c:89
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
 msgid "_Pause"
 msgstr "_�舒�亰舒"
 
 #. Resume button
-#: ../pidgin/gtkft.c:845
+#: ../pidgin/gtkft.c:842
 msgid "_Resume"
 msgstr "_�仂亰仂弍仆仂于亳��"
 
-#: ../pidgin/gtkimhtml.c:796
+#: ../pidgin/gtkimhtml.c:795
 msgid "Paste as Plain _Text"
 msgstr "���舒于亳�� 从舒从 仗�仂��仂亶 _�亠从��"
 
-#: ../pidgin/gtkimhtml.c:813
+#: ../pidgin/gtkimhtml.c:812
 msgid "_Reset formatting"
 msgstr "�仂���舒仆仂于亳�� _�仂�仄舒�亳�仂于舒仆亳亠"
 
-#: ../pidgin/gtkimhtml.c:1309
+#: ../pidgin/gtkimhtml.c:1349
 msgid "Hyperlink color"
 msgstr "丶于亠� 亞亳仗亠����仍从亳"
 
-#: ../pidgin/gtkimhtml.c:1310
+#: ../pidgin/gtkimhtml.c:1350
 msgid "Color to draw hyperlinks."
 msgstr "丶于亠� 亟仍� 仂�仂弍�舒亢亠仆亳� 亞亳仗亠����仍仂从."
 
-#: ../pidgin/gtkimhtml.c:1313
+#: ../pidgin/gtkimhtml.c:1353
 msgid "Hyperlink prelight color"
 msgstr "丶于亠� 仗仂亟�于亠�从亳 亞亳仗亠����仍从亳"
 
-#: ../pidgin/gtkimhtml.c:1314
+#: ../pidgin/gtkimhtml.c:1354
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "丶于亠� 亟仍� 仂�仂弍�舒亢亠仆亳� 亞亳仗亠����仍仂从 仗�亳 仆舒于亠亟亠仆亳亳 仆舒 仆亳� 从���仂�舒 仄��亳."
 
-#: ../pidgin/gtkimhtml.c:1530
+#: ../pidgin/gtkimhtml.c:1575
 msgid "_Copy E-Mail Address"
 msgstr "_弌从仂仗亳�仂于舒�� 舒亟�亠� e-mail"
 
-#: ../pidgin/gtkimhtml.c:1542
+#: ../pidgin/gtkimhtml.c:1587
 msgid "_Open Link in Browser"
 msgstr "_��从���� ���仍从� 于 弍�舒�亰亠�亠"
 
-#: ../pidgin/gtkimhtml.c:1552
+#: ../pidgin/gtkimhtml.c:1597
 msgid "_Copy Link Location"
 msgstr "_弌从仂仗亳�仂于舒�� ���仍从�"
 
-#: ../pidgin/gtkimhtml.c:3227
+#: ../pidgin/gtkimhtml.c:3341
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -13498,7 +13563,7 @@
 "\n"
 "��亳仆亳仄舒亠��� 亰舒 PNG."
 
-#: ../pidgin/gtkimhtml.c:3230
+#: ../pidgin/gtkimhtml.c:3344
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -13508,7 +13573,7 @@
 "\n"
 "��亳仆亳仄舒亠��� 亰舒 PNG."
 
-#: ../pidgin/gtkimhtml.c:3259
+#: ../pidgin/gtkimhtml.c:3373
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -13519,7 +13584,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3262
+#: ../pidgin/gtkimhtml.c:3376
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -13530,35 +13595,35 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3340 ../pidgin/gtkimhtml.c:3352
+#: ../pidgin/gtkimhtml.c:3454 ../pidgin/gtkimhtml.c:3466
 msgid "Save Image"
 msgstr "弌仂��舒仆亳�� 亳亰仂弍�舒亢亠仆亳亠"
 
-#: ../pidgin/gtkimhtml.c:3380
+#: ../pidgin/gtkimhtml.c:3494
 msgid "_Save Image..."
 msgstr "_弌仂��舒仆亳�� 亳亰仂弍�舒亢亠仆亳亠..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:151
+#: ../pidgin/gtkimhtmltoolbar.c:153
 msgid "Select Font"
 msgstr "��弍�舒�� ��亳��"
 
-#: ../pidgin/gtkimhtmltoolbar.c:230
+#: ../pidgin/gtkimhtmltoolbar.c:232
 msgid "Select Text Color"
 msgstr "��弍�舒�� �于亠� �亠从��舒"
 
-#: ../pidgin/gtkimhtmltoolbar.c:309
+#: ../pidgin/gtkimhtmltoolbar.c:311
 msgid "Select Background Color"
 msgstr "��弍�舒�� �于亠� �仂仆舒"
 
-#: ../pidgin/gtkimhtmltoolbar.c:398
+#: ../pidgin/gtkimhtmltoolbar.c:400
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:406
+#: ../pidgin/gtkimhtmltoolbar.c:408
 msgid "_Description"
 msgstr "_�仗亳�舒仆亳亠"
 
-#: ../pidgin/gtkimhtmltoolbar.c:409
+#: ../pidgin/gtkimhtmltoolbar.c:411
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -13566,85 +13631,93 @@
 "�于亠亟亳�亠 URL 亳 仂仗亳�舒仆亳亠 ���仍从亳, 从仂�仂��� 于� �仂�亳�亠 于��舒于亳��. �仗亳�舒仆亳亠 "
 "仆亠仂弍�亰舒�亠仍�仆仂."
 
-#: ../pidgin/gtkimhtmltoolbar.c:413
+#: ../pidgin/gtkimhtmltoolbar.c:415
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "�于亠亟亳�亠 URL ���仍从亳, 从仂�仂��� 于� �仂�亳�亠 于��舒于亳��."
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "Insert Link"
 msgstr "���舒于亳�� ���仍从�"
 
-#: ../pidgin/gtkimhtmltoolbar.c:422
+#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1155
 msgid "_Insert"
 msgstr "_���舒于亳��"
 
-#: ../pidgin/gtkimhtmltoolbar.c:491
+#: ../pidgin/gtkimhtmltoolbar.c:493
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "�亠 �亟舒仍仂�� �仂��舒仆亳�� 亳亰仂弍�舒亢亠仆亳亠: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:517 ../pidgin/gtkimhtmltoolbar.c:527
+#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
 msgid "Insert Image"
 msgstr "���舒于亳�� 亳亰仂弍�舒亢亠仆亳亠"
 
-#: ../pidgin/gtkimhtmltoolbar.c:725
+#: ../pidgin/gtkimhtmltoolbar.c:740
 msgid "This theme has no available smileys."
 msgstr "亅�舒 �亠仄舒 仆亠 亳仄亠亠� 亟仂���仗仆�� �仄舒亶仍亳从仂于."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:739
+#: ../pidgin/gtkimhtmltoolbar.c:757
 msgid "Smile!"
 msgstr "弌仄舒亶仍!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:926 ../pidgin/plugins/convcolors.c:287
-msgid "Bold"
-msgstr "�亳�仆�亶"
-
-#: ../pidgin/gtkimhtmltoolbar.c:937 ../pidgin/plugins/convcolors.c:294
-msgid "Italic"
-msgstr "�舒从仍仂仆仆�亶"
-
-#: ../pidgin/gtkimhtmltoolbar.c:948 ../pidgin/plugins/convcolors.c:301
-msgid "Underline"
-msgstr "�仂亟���从仆���亶"
-
-#: ../pidgin/gtkimhtmltoolbar.c:964
-msgid "Larger font size"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:976
-msgid "Smaller font size"
-msgstr ""
-
-#: ../pidgin/gtkimhtmltoolbar.c:993
-msgid "Font face"
-msgstr "�弍仍亳从 ��亳��舒"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1005
-msgid "Foreground font color"
-msgstr "丶于亠� ��亳��舒"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1017
-msgid "Background color"
-msgstr "丶于亠� �仂仆舒"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1033
-msgid "Reset formatting"
-msgstr "�仂���舒仆仂于亳�� �仂�仄舒�亳�仂于舒仆亳亠"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1048
-msgid "Insert link"
-msgstr "���舒于亳�� ���仍从�"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1058
-msgid "Insert image"
-msgstr "���舒于亳�� 亳亰仂弍�舒亢亠仆亳亠"
+#: ../pidgin/gtkimhtmltoolbar.c:1064
+msgid "_Bold"
+msgstr "_�亳�仆�亶"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1065
+msgid "_Italic"
+msgstr "_�舒从仍仂仆仆�亶"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1066
+msgid "_Underline"
+msgstr "_�仂亟���从仆���亶"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1067
+msgid "_Larger"
+msgstr "_�仂仍��亳亶"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1069
-msgid "Insert smiley"
-msgstr "���舒于亳�� �仄舒亶仍亳从"
-
-#: ../pidgin/gtklog.c:267
+msgid "_Normal"
+msgstr "_弌�亠亟仆亳亶"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1071
+msgid "_Smaller"
+msgstr "_�亠仆��亳亶"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1072
+msgid "_Font face"
+msgstr "_�弍仍亳从 ��亳��舒"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1073
+msgid "_Foreground color"
+msgstr "_丶于亠� ��亳��舒"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1074
+msgid "_Background color"
+msgstr "_丶于亠� �仂仆舒"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "_Font"
+msgstr "_丿�亳��"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1135
+msgid "_Reset font"
+msgstr "_弌弍�仂�亳�� ��亳��"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1162
+msgid "_Smiley"
+msgstr "_弌仄舒亶仍亳从"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1168
+msgid "_Image"
+msgstr "_�亰仂弍�舒亢亠仆亳亠"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1174
+msgid "_Link"
+msgstr "_弌��仍从舒"
+
+#: ../pidgin/gtklog.c:292
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation with "
@@ -13653,7 +13726,7 @@
 "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 弍亠亰于仂亰于�舒�仆仂 �亟舒仍亳�� 亢��仆舒仍 弍亠�亠亟� � %s, 仆舒�舒��亶 于 %"
 "s?"
 
-#: ../pidgin/gtklog.c:278
+#: ../pidgin/gtklog.c:303
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the log of the conversation in %"
@@ -13662,7 +13735,7 @@
 "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 弍亠亰于仂亰于�舒�仆仂 �亟舒仍亳�� 亢��仆舒仍 弍亠�亠亟� 于 %s, 仆舒�舒��亶 于 %"
 "s?"
 
-#: ../pidgin/gtklog.c:283
+#: ../pidgin/gtklog.c:308
 #, c-format
 msgid ""
 "Are you sure you want to permanently delete the system log which started at %"
@@ -13670,71 +13743,71 @@
 msgstr ""
 "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 弍亠亰于仂亰于�舒�仆仂 �亟舒仍亳�� �亳��亠仄仆�亶 亢��仆舒仍, 仆舒�舒��亶 于 %s?"
 
-#: ../pidgin/gtklog.c:427
+#: ../pidgin/gtklog.c:452
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>�亠�亠亟舒 于 %s 仆舒 %s</span>"
 
-#: ../pidgin/gtklog.c:430
+#: ../pidgin/gtklog.c:455
 #, c-format
 msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
 msgstr "<span size='larger' weight='bold'>�亠�亠亟舒 � %s 仆舒 %s</span>"
 
-#: ../pidgin/gtklog.c:477
+#: ../pidgin/gtklog.c:502
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:524
+#: ../pidgin/gtklog.c:549
 msgid ""
 "System events will only be logged if the \"Log all status changes to system "
 "log\" preference is enabled."
 msgstr ""
 
-#: ../pidgin/gtklog.c:528
+#: ../pidgin/gtklog.c:553
 msgid ""
 "Instant messages will only be logged if the \"Log all instant messages\" "
 "preference is enabled."
 msgstr ""
 
-#: ../pidgin/gtklog.c:531
+#: ../pidgin/gtklog.c:556
 msgid ""
 "Chats will only be logged if the \"Log all chats\" preference is enabled."
 msgstr ""
 
-#: ../pidgin/gtklog.c:535
+#: ../pidgin/gtklog.c:560
 msgid "No logs were found"
 msgstr "���仆舒仍� 仆亠 仆舒亶亟亠仆�"
 
 #. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../pidgin/gtklog.c:550
+#: ../pidgin/gtklog.c:575
 msgid "_Browse logs folder"
 msgstr ""
 
-#: ../pidgin/gtklog.c:614
+#: ../pidgin/gtklog.c:639
 msgid "Total log size:"
 msgstr "�弍�亳亶 �舒亰仄亠� 亢��仆舒仍仂于:"
 
-#: ../pidgin/gtklog.c:683
+#: ../pidgin/gtklog.c:708
 #, c-format
 msgid "Conversations in %s"
 msgstr "�亠�亠亟� 于 %s"
 
-#: ../pidgin/gtklog.c:691 ../pidgin/gtklog.c:753
+#: ../pidgin/gtklog.c:716 ../pidgin/gtklog.c:778
 #, c-format
 msgid "Conversations with %s"
 msgstr "�亠�亠亟� � %s"
 
-#: ../pidgin/gtklog.c:778
+#: ../pidgin/gtklog.c:803
 msgid "System Log"
 msgstr "弌亳��亠仄仆�亶 亢��仆舒仍"
 
-#: ../pidgin/gtkmain.c:373
+#: ../pidgin/gtkmain.c:385
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. �舒弍亠�亳�亠 `%s -h' 亟仍� 仗仂仍��亠仆亳� 亟仂仗仂仍仆亳�亠仍�仆仂亶 亳仆�仂�仄舒�亳亳.\n"
 
-#: ../pidgin/gtkmain.c:375
-#, c-format
+#: ../pidgin/gtkmain.c:387
+#, fuzzy, c-format
 msgid ""
 "%s %s\n"
 "Usage: %s [OPTION]...\n"
@@ -13742,6 +13815,7 @@
 "  -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"
+"  -m, --multiple      do not ensure single instance\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"
@@ -13759,7 +13833,7 @@
 "                      �舒亰亟亠仍�仆仆�� 亰舒仗���仄亳)\n"
 "  -v, --version       仗仂从舒亰舒�� �亠从���� 于亠��亳� 亳 于�亶�亳\n"
 
-#: ../pidgin/gtkmain.c:496
+#: ../pidgin/gtkmain.c:511
 #, c-format
 msgid ""
 "%s has segfaulted and attempted to dump a core file.\n"
@@ -13768,7 +13842,7 @@
 "\n"
 "If you can reproduce the crash, please notify the developers\n"
 "by reporting a bug at:\n"
-"%snewticket/\n"
+"%ssimpleticket/\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"
@@ -13781,19 +13855,21 @@
 "%swiki/DeveloperPages\n"
 msgstr ""
 
-#: ../pidgin/gtknotify.c:337
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/gtkmain.c:697 ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/gtknotify.c:343
 msgid "Open All Messages"
 msgstr "��从���� 于�亠 �仂仂弍�亠仆亳�"
 
-#: ../pidgin/gtknotify.c:389
+#: ../pidgin/gtknotify.c:395
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">�舒仄 仗�亳�仍舒 仗仂��舒!</span>"
 
-#: ../pidgin/gtknotify.c:483
-msgid "Sender"
-msgstr "��仗�舒于亳�亠仍�"
-
-#: ../pidgin/gtknotify.c:509
+#: ../pidgin/gtknotify.c:515
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
@@ -13801,7 +13877,7 @@
 msgstr[1] "%s 亳仄亠亠� %d 仆仂于�� �仂仂弍�亠仆亳�."
 msgstr[2] "%s 亳仄亠亠� %d 仆仂于�� �仂仂弍�亠仆亳亶."
 
-#: ../pidgin/gtknotify.c:520
+#: ../pidgin/gtknotify.c:526
 #, c-format
 msgid "<b>You have %d new e-mail.</b>"
 msgid_plural "<b>You have %d new e-mails.</b>"
@@ -13809,22 +13885,22 @@
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../pidgin/gtknotify.c:951
+#: ../pidgin/gtknotify.c:964
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "�仂仄舒仆亟舒 亰舒仗��从舒 弍�舒�亰亠�舒 \"%s\" 仆亠于亠�仆舒."
 
-#: ../pidgin/gtknotify.c:953 ../pidgin/gtknotify.c:965
-#: ../pidgin/gtknotify.c:978 ../pidgin/gtknotify.c:1106
+#: ../pidgin/gtknotify.c:966 ../pidgin/gtknotify.c:978
+#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1119
 msgid "Unable to open URL"
 msgstr "�亠 �亟舒���� 仂�从���� URL"
 
-#: ../pidgin/gtknotify.c:963 ../pidgin/gtknotify.c:976
+#: ../pidgin/gtknotify.c:976 ../pidgin/gtknotify.c:989
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "��亳弍从舒 亰舒仗��从舒 \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1107
+#: ../pidgin/gtknotify.c:1120
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "��仍 于�弍�舒仆 弍�舒�亰亠� \"���亞仂亶\", 仆仂 从仂仄舒仆亟舒 仆亠 弍�仍舒 亰舒亟舒仆舒."
@@ -13868,108 +13944,117 @@
 msgid "<b>Plugin Details</b>"
 msgstr "<b>�仂亟�仂弍仆仂��亳 仂 仄仂亟�仍亠</b>"
 
-#: ../pidgin/gtkpounce.c:155
+#: ../pidgin/gtkpounce.c:156
 msgid "Select a file"
 msgstr "��弍�舒�� �舒亶仍"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:524
+#: ../pidgin/gtkpounce.c:533
 msgid "Pounce on Whom"
 msgstr "�舒 从亠仄 �仍亠亟亳��"
 
-#: ../pidgin/gtkpounce.c:551
+#: ../pidgin/gtkpounce.c:560
 msgid "_Buddy name:"
 msgstr "_�仄� �仂弍亠�亠亟仆亳从舒:"
 
-#: ../pidgin/gtkpounce.c:585
+#: ../pidgin/gtkpounce.c:594
 msgid "Si_gns on"
 msgstr "_��仂亟亳�"
 
-#: ../pidgin/gtkpounce.c:587
+#: ../pidgin/gtkpounce.c:596
 msgid "Signs o_ff"
 msgstr "�_��仂亟亳�"
 
-#: ../pidgin/gtkpounce.c:589
+#: ../pidgin/gtkpounce.c:598
 msgid "Goes a_way"
 msgstr "���仂_亟亳�"
 
-#: ../pidgin/gtkpounce.c:591
+#: ../pidgin/gtkpounce.c:600
 msgid "Ret_urns from away"
 msgstr "�仂_亰于�舒�舒亠���"
 
-#: ../pidgin/gtkpounce.c:593
+#: ../pidgin/gtkpounce.c:602
 msgid "Becomes _idle"
 msgstr "�舒�亳仆舒亠� 弍亠亰亟亠_亶��于仂于舒��"
 
-#: ../pidgin/gtkpounce.c:595
+#: ../pidgin/gtkpounce.c:604
 msgid "Is no longer i_dle"
 msgstr "�亠�亠��舒�� 弍亠亰亟亠亶��于仂于舒�_�"
 
-#: ../pidgin/gtkpounce.c:597
+#: ../pidgin/gtkpounce.c:606
 msgid "Starts _typing"
 msgstr "�舒�亳仆舒亠� 仆_舒弍仂� �仂仂弍�亠仆亳�"
 
-#: ../pidgin/gtkpounce.c:599
+#: ../pidgin/gtkpounce.c:608
 msgid "P_auses while typing"
 msgstr "��亳仂��舒仆舒于仍亳于舒亠� 仆舒_弍仂� �仂仂弍�亠仆亳�"
 
-#: ../pidgin/gtkpounce.c:601
+#: ../pidgin/gtkpounce.c:610
 msgid "Stops t_yping"
 msgstr "��亠从�舒�舒亠� 仆舒弍仂_� �仂仂弍�亠仆亳�"
 
-#: ../pidgin/gtkpounce.c:603
+#: ../pidgin/gtkpounce.c:612
 msgid "Sends a _message"
 msgstr "��仗�舒于仍�亠� �仂仂弍_�亠仆亳亠"
 
-#: ../pidgin/gtkpounce.c:646
+#: ../pidgin/gtkpounce.c:655
 msgid "Ope_n an IM window"
 msgstr "��从���� 仂从_仆仂 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶"
 
-#: ../pidgin/gtkpounce.c:648
+#: ../pidgin/gtkpounce.c:657
 msgid "_Pop up a notification"
 msgstr "��于亠��亳 �于亠亟仂仄_仍亠仆亳亠"
 
-#: ../pidgin/gtkpounce.c:650
+#: ../pidgin/gtkpounce.c:659
 msgid "Send a _message"
 msgstr "��仗�舒于亳�� _�仂仂弍�亠仆亳亠"
 
-#: ../pidgin/gtkpounce.c:652
-msgid "E_xecute a command"
-msgstr "��仗仂仍仆亳�� 从仂_仄舒仆亟�"
-
-#: ../pidgin/gtkpounce.c:654
-msgid "P_lay a sound"
-msgstr "�仂�仗�仂亳亰于亠��亳 亰于_�从"
-
-#: ../pidgin/gtkpounce.c:659
-msgid "Brows_e..."
-msgstr "_��从����..."
-
 #: ../pidgin/gtkpounce.c:661
+msgid "E_xecute a command"
+msgstr "��仗仂仍仆亳�� 从仂_仄舒仆亟�"
+
+#: ../pidgin/gtkpounce.c:663
+msgid "P_lay a sound"
+msgstr "�仂�仗�仂亳亰于亠��亳 亰于_�从"
+
+#: ../pidgin/gtkpounce.c:669
+msgid "Brows_e..."
+msgstr "_��从����..."
+
+#: ../pidgin/gtkpounce.c:671
 msgid "Br_owse..."
 msgstr "��_从����..."
 
-#: ../pidgin/gtkpounce.c:662
+#: ../pidgin/gtkpounce.c:672
 msgid "Pre_view"
 msgstr "丐_亠��"
 
-#: ../pidgin/gtkpounce.c:786
+#: ../pidgin/gtkpounce.c:799
 msgid "P_ounce only when my status is not Available"
 msgstr "��仗仂仍仆_��� �仂仍�从仂 仗�亳 ��舒���亠, 仂�仍亳�仆仂仄 仂� \"�仂���仗亠仆\""
 
-#: ../pidgin/gtkpounce.c:791
+#: ../pidgin/gtkpounce.c:804
 msgid "_Recurring"
 msgstr "_�仂于�仂�亠仆亳亠"
 
-#: ../pidgin/gtkpounce.c:1247
+#: ../pidgin/gtkpounce.c:1260
 msgid "Pounce Target"
 msgstr "�弍�亠从� �仍亠亢亠仆亳�"
 
-#: ../pidgin/gtkprefs.c:509
+#: ../pidgin/gtkprefs.c:385
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "�仂 �仄仂仍�舒仆亳�"
+
+#: ../pidgin/gtkprefs.c:516
 msgid "Smiley theme failed to unpack."
 msgstr "�亠 �亟舒仍仂�� �舒�仗舒从仂于舒�� �亠仄� �仄舒亶仍亳从仂于."
 
-#: ../pidgin/gtkprefs.c:638
+#: ../pidgin/gtkprefs.c:643
+msgid "Install Theme"
+msgstr ""
+
+#: ../pidgin/gtkprefs.c:696
 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."
@@ -13977,255 +14062,259 @@
 "��弍亠�亳�亠 �亠仄� �仄舒亶仍亳从仂于, 从仂�仂��� 于� �仂�亠仍亳 弍� 亳�仗仂仍�亰仂于舒��. �仂于�亠 �亠仄� 仄仂亞�� "
 "弍��� ���舒仆仂于仍亠仆� 仗亠�亠�舒�从亳于舒仆亳亠仄 亳� 于 �仗亳�仂从 �亠仄."
 
-#: ../pidgin/gtkprefs.c:673
+#: ../pidgin/gtkprefs.c:731
 msgid "Icon"
 msgstr "�仆舒�仂从"
 
-#: ../pidgin/gtkprefs.c:816
+#: ../pidgin/gtkprefs.c:893
 msgid "System Tray Icon"
 msgstr "�仆舒�仂从 �亳��亠仄仆仂亞仂 仍仂�从舒"
 
-#: ../pidgin/gtkprefs.c:817
+#: ../pidgin/gtkprefs.c:894
 msgid "_Show system tray icon:"
 msgstr "_�仂从舒亰�于舒�� 亰仆舒�仂从 �亳��亠仄仆仂亞仂 仍仂�从舒:"
 
-#: ../pidgin/gtkprefs.c:819 ../pidgin/gtkprefs.c:831 ../pidgin/gtkprefs.c:1686
+#: ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1756
 #: ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:338
 msgid "Always"
 msgstr "��亠亞亟舒"
 
-#: ../pidgin/gtkprefs.c:821
+#: ../pidgin/gtkprefs.c:898
 msgid "On unread messages"
 msgstr "��亳 仆舒仍亳�亳亳 仆亠仗�仂�亳�舒仆仆�� �仂仂弍�亠仆亳亶"
 
-#: ../pidgin/gtkprefs.c:826
+#: ../pidgin/gtkprefs.c:903
 msgid "Conversation Window Hiding"
 msgstr "弌从���亳亠 仂从仂仆 弍亠�亠亟"
 
-#: ../pidgin/gtkprefs.c:827
+#: ../pidgin/gtkprefs.c:904
 msgid "_Hide new IM conversations:"
 msgstr "_弌从��于舒�� 仆仂于�亠 弍亠�亠亟�:"
 
-#: ../pidgin/gtkprefs.c:830 ../pidgin/gtkprefs.c:1867
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1937
 msgid "When away"
 msgstr "�仂 于�亠仄� 仂������于亳�"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:838
+#: ../pidgin/gtkprefs.c:915
 msgid "Tabs"
 msgstr "�从仍舒亟从亳"
 
-#: ../pidgin/gtkprefs.c:840
+#: ../pidgin/gtkprefs.c:917
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "�仂从舒亰�于舒�� 仄亞仆仂于亠仆仆�亠 �仂仂弍�亠仆亳� 亳 �舒�� 于 仂从仆舒� � _于从仍舒亟从舒仄亳"
 
-#: ../pidgin/gtkprefs.c:854
+#: ../pidgin/gtkprefs.c:931
 msgid "Show close b_utton on tabs"
 msgstr "�仂从舒亰�于舒�� _从仆仂仗从� 亰舒从���亳� 仆舒 于从仍舒亟从舒�"
 
-#: ../pidgin/gtkprefs.c:857
+#: ../pidgin/gtkprefs.c:934
 msgid "_Placement:"
 msgstr "_�舒�仗仂仍仂亢亠仆亳亠:"
 
-#: ../pidgin/gtkprefs.c:859
+#: ../pidgin/gtkprefs.c:936
 msgid "Top"
 msgstr "�于亠���"
 
-#: ../pidgin/gtkprefs.c:860
+#: ../pidgin/gtkprefs.c:937
 msgid "Bottom"
 msgstr "�仆亳亰�"
 
-#: ../pidgin/gtkprefs.c:861
+#: ../pidgin/gtkprefs.c:938
 msgid "Left"
 msgstr "弌仍亠于舒"
 
-#: ../pidgin/gtkprefs.c:862
+#: ../pidgin/gtkprefs.c:939
 msgid "Right"
 msgstr "弌仗�舒于舒"
 
-#: ../pidgin/gtkprefs.c:864
+#: ../pidgin/gtkprefs.c:941
 msgid "Left Vertical"
 msgstr "弌仍亠于舒 于亠��亳从舒仍�仆仂"
 
-#: ../pidgin/gtkprefs.c:865
+#: ../pidgin/gtkprefs.c:942
 msgid "Right Vertical"
 msgstr "弌仗�舒于舒 于亠��亳从舒仍�仆仂"
 
-#: ../pidgin/gtkprefs.c:872
+#: ../pidgin/gtkprefs.c:949
 msgid "N_ew conversations:"
 msgstr "_�仂于�亠 弍亠�亠亟�:"
 
-#: ../pidgin/gtkprefs.c:917
+#: ../pidgin/gtkprefs.c:994
 msgid "Show _formatting on incoming messages"
 msgstr "�仂从舒亰�于舒�� _�仂�仄舒�亳�仂于舒仆亳亠 于仂 于�仂亟��亳� �仂仂弍�亠仆亳��"
 
-#: ../pidgin/gtkprefs.c:920
-msgid "Show buddy _icons"
-msgstr "�仂从舒亰�于舒�� 亰_仆舒�从亳 �仂弍亠�亠亟仆亳从仂于"
-
-#: ../pidgin/gtkprefs.c:922
+#: ../pidgin/gtkprefs.c:997
+msgid "Show Buddy _Details"
+msgstr "�仂从舒亰�于舒�� _仗仂亟�仂弍仆仂��亳 仂 �仂弍亠�亠亟仆亳从亠"
+
+#: ../pidgin/gtkprefs.c:999
 msgid "Enable buddy ic_on animation"
 msgstr "�舒亰�亠�亳�� _舒仆亳仄舒�亳� 亰仆舒�从仂于 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../pidgin/gtkprefs.c:929
+#: ../pidgin/gtkprefs.c:1006
 msgid "_Notify buddies that you are typing to them"
 msgstr "_丕于亠亟仂仄仍��� �仂弍亠�亠亟仆亳从仂于, ��仂 于� 仆舒弍亳�舒亠�亠 亳仄 �仂仂弍�亠仆亳亠"
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:1009
 msgid "Highlight _misspelled words"
 msgstr "�仂亟�于亠�亳于舒�� �仍仂于舒 � _仂�亳弍从舒仄亳"
 
-#: ../pidgin/gtkprefs.c:936
+#: ../pidgin/gtkprefs.c:1013
 msgid "Use smooth-scrolling"
 msgstr "��仗仂仍�亰仂于舒�� 仗仍舒于仆�� 仗�仂从���从�"
 
-#: ../pidgin/gtkprefs.c:939
+#: ../pidgin/gtkprefs.c:1016
 msgid "F_lash window when IMs are received"
 msgstr "_�亠��舒�� 仂从仆仂仄 仗�亳 仗�亳仆��亳亳 仄亞仆仂于亠仆仆�� �仂仂弍�亠仆亳亶"
 
-#: ../pidgin/gtkprefs.c:943
+#: ../pidgin/gtkprefs.c:1018
+msgid "Minimi_ze new conversation windows"
+msgstr "_弌于仂�舒�亳于舒�� 仆仂于�亠 仂从仆舒 弍亠�亠亟"
+
+#: ../pidgin/gtkprefs.c:1022
 msgid "Font"
 msgstr "丿�亳��"
 
-#: ../pidgin/gtkprefs.c:945
+#: ../pidgin/gtkprefs.c:1024
 msgid "Use document font from _theme"
 msgstr "��仗仂仍�亰仂于舒�� ��亳�� 亟仂从�仄亠仆�舒 亳亰 _�亠仄�"
 
-#: ../pidgin/gtkprefs.c:947
+#: ../pidgin/gtkprefs.c:1026
 msgid "Use font from _theme"
 msgstr "��仗仂仍�亰仂于舒�� ��亳�� 亳亰 _�亠仄�"
 
-#: ../pidgin/gtkprefs.c:949
+#: ../pidgin/gtkprefs.c:1028
 msgid "Conversation _font:"
 msgstr "_丿�亳�� 弍亠�亠亟�:"
 
-#: ../pidgin/gtkprefs.c:962
+#: ../pidgin/gtkprefs.c:1041
 msgid "Default Formatting"
 msgstr "个仂�仄舒�亳�仂于舒仆亳亠 仗仂 �仄仂仍�舒仆亳�"
 
-#: ../pidgin/gtkprefs.c:978
+#: ../pidgin/gtkprefs.c:1057
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
-"that support formatting. :)"
+"that support formatting."
 msgstr ""
 "丐舒从 弍�亟亠� 于�亞仍�亟亠�� �亠从�� 于舒�亳� �仂仂弍�亠仆亳亶 � 亳�仗仂仍�亰仂于舒仆亳亠仄 仗�仂�仂从仂仍仂于, "
-"仗仂亟亟亠�亢亳于舒��亳� �仂�仄舒�亳�仂于舒仆亳亠. :)"
-
-#: ../pidgin/gtkprefs.c:1054
+"仗仂亟亟亠�亢亳于舒��亳� �仂�仄舒�亳�仂于舒仆亳亠."
+
+#: ../pidgin/gtkprefs.c:1123
 msgid "ST_UN server:"
 msgstr "ST_UN-�亠�于亠�:"
 
-#: ../pidgin/gtkprefs.c:1066
+#: ../pidgin/gtkprefs.c:1135
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">��亳仄亠�: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1070
+#: ../pidgin/gtkprefs.c:1139
 msgid "_Autodetect IP address"
 msgstr "�仗�亠亟亠仍��� IP-舒亟�亠� _舒于�仂仄舒�亳�亠�从亳"
 
-#: ../pidgin/gtkprefs.c:1079
+#: ../pidgin/gtkprefs.c:1148
 msgid "Public _IP:"
 msgstr "��弍仍亳�仆�亶 _IP:"
 
-#: ../pidgin/gtkprefs.c:1108
+#: ../pidgin/gtkprefs.c:1177
 msgid "Ports"
 msgstr "�仂���"
 
-#: ../pidgin/gtkprefs.c:1111
+#: ../pidgin/gtkprefs.c:1180
 msgid "_Manually specify range of ports to listen on"
 msgstr "丕从舒亰舒�� 亟亳舒仗舒亰仂仆 仗�仂�仍��亳于舒亠仄�� 仗仂��仂于 _于���仆��"
 
-#: ../pidgin/gtkprefs.c:1114
+#: ../pidgin/gtkprefs.c:1183
 msgid "_Start port:"
 msgstr "_�舒�舒仍�仆�亶 仗仂��:"
 
-#: ../pidgin/gtkprefs.c:1121
+#: ../pidgin/gtkprefs.c:1190
 msgid "_End port:"
 msgstr "_�仂仆亠�仆�亶 仗仂��:"
 
-#: ../pidgin/gtkprefs.c:1129
+#: ../pidgin/gtkprefs.c:1198
 msgid "Proxy Server"
 msgstr "��仂从�亳-�亠�于亠�"
 
-#: ../pidgin/gtkprefs.c:1133
+#: ../pidgin/gtkprefs.c:1202
 msgid "No proxy"
 msgstr "�亠� 仗�仂从�亳"
 
-#: ../pidgin/gtkprefs.c:1189
+#: ../pidgin/gtkprefs.c:1258
 msgid "_User:"
 msgstr "_�仂仍�亰仂于舒�亠仍�:"
 
-#: ../pidgin/gtkprefs.c:1253
+#: ../pidgin/gtkprefs.c:1323
 msgid "Seamonkey"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1254
+#: ../pidgin/gtkprefs.c:1324
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1255
+#: ../pidgin/gtkprefs.c:1325
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1256
+#: ../pidgin/gtkprefs.c:1326
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1257
+#: ../pidgin/gtkprefs.c:1327
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1258
+#: ../pidgin/gtkprefs.c:1328
 msgid "GNOME Default"
 msgstr "��舒�亰亠� GNOME 仗仂 �仄仂仍�舒仆亳�"
 
-#: ../pidgin/gtkprefs.c:1259
+#: ../pidgin/gtkprefs.c:1329
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1260
+#: ../pidgin/gtkprefs.c:1330
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1261
+#: ../pidgin/gtkprefs.c:1331
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1262
+#: ../pidgin/gtkprefs.c:1332
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1271
+#: ../pidgin/gtkprefs.c:1341
 msgid "Manual"
 msgstr "���亞仂亶"
 
-#: ../pidgin/gtkprefs.c:1324
+#: ../pidgin/gtkprefs.c:1394
 msgid "Browser Selection"
 msgstr "��弍仂� 弍�舒�亰亠�舒"
 
-#: ../pidgin/gtkprefs.c:1328
+#: ../pidgin/gtkprefs.c:1398
 msgid "_Browser:"
 msgstr "_��舒�亰亠�:"
 
-#: ../pidgin/gtkprefs.c:1336
+#: ../pidgin/gtkprefs.c:1406
 msgid "_Open link in:"
 msgstr "_��从��于舒�� ���仍从� 于:"
 
-#: ../pidgin/gtkprefs.c:1338
+#: ../pidgin/gtkprefs.c:1408
 msgid "Browser default"
 msgstr "�仂 �仄仂仍�舒仆亳�"
 
-#: ../pidgin/gtkprefs.c:1339
+#: ../pidgin/gtkprefs.c:1409
 msgid "Existing window"
 msgstr "弌��亠��于���亠亠 仂从仆仂"
 
-#: ../pidgin/gtkprefs.c:1341
+#: ../pidgin/gtkprefs.c:1411
 msgid "New tab"
 msgstr "�仂于舒� 于从仍舒亟从舒"
 
-#: ../pidgin/gtkprefs.c:1355
+#: ../pidgin/gtkprefs.c:1425
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -14234,80 +14323,80 @@
 "_����仆��:\n"
 "(%s 亟仍� URL)"
 
-#: ../pidgin/gtkprefs.c:1395
+#: ../pidgin/gtkprefs.c:1465
 msgid "Log _format:"
 msgstr "_个仂�仄舒� 亢��仆舒仍舒:"
 
-#: ../pidgin/gtkprefs.c:1400
+#: ../pidgin/gtkprefs.c:1470
 msgid "Log all _instant messages"
 msgstr "�舒仗亳��于舒�� 于�亠 _仄亞仆仂于亠仆仆�亠 �仂仂弍�亠仆亳�"
 
-#: ../pidgin/gtkprefs.c:1402
+#: ../pidgin/gtkprefs.c:1472
 msgid "Log all c_hats"
 msgstr "�舒仗亳��于舒�� 于�亠 _�舒��"
 
-#: ../pidgin/gtkprefs.c:1404
+#: ../pidgin/gtkprefs.c:1474
 msgid "Log all _status changes to system log"
 msgstr "�舒仗亳��于舒�� 于�亠 亳亰仄亠仆亠仆亳� _��舒���舒 于 �亳��亠仄仆�亶 亢��仆舒仍"
 
-#: ../pidgin/gtkprefs.c:1512 ../pidgin/gtkprefs.c:1601
-#: ../pidgin/gtkprefs.c:1795
+#: ../pidgin/gtkprefs.c:1582 ../pidgin/gtkprefs.c:1671
+#: ../pidgin/gtkprefs.c:1865
 msgid "(default)"
 msgstr ""
 
-#: ../pidgin/gtkprefs.c:1550
+#: ../pidgin/gtkprefs.c:1620
 msgid "Sound Selection"
 msgstr "��弍仂� 亰于�从舒"
 
-#: ../pidgin/gtkprefs.c:1560
+#: ../pidgin/gtkprefs.c:1630
 msgid "Quietest"
 msgstr "��亠仆� �亳�仂"
 
-#: ../pidgin/gtkprefs.c:1562
+#: ../pidgin/gtkprefs.c:1632
 msgid "Quieter"
 msgstr "丐亳�仂"
 
-#: ../pidgin/gtkprefs.c:1564
+#: ../pidgin/gtkprefs.c:1634
 msgid "Quiet"
 msgstr "�亳亢亠 ��亠亟仆亠亞仂"
 
-#: ../pidgin/gtkprefs.c:1568
+#: ../pidgin/gtkprefs.c:1638
 msgid "Loud"
 msgstr "���亠 ��亠亟仆亠亞仂"
 
-#: ../pidgin/gtkprefs.c:1570
+#: ../pidgin/gtkprefs.c:1640
 msgid "Louder"
 msgstr "��仂仄从仂"
 
-#: ../pidgin/gtkprefs.c:1572
+#: ../pidgin/gtkprefs.c:1642
 msgid "Loudest"
 msgstr "��亠仆� 亞�仂仄从仂"
 
-#: ../pidgin/gtkprefs.c:1635
+#: ../pidgin/gtkprefs.c:1705
 msgid "Sound Method"
 msgstr "�亠�仂亟 于仂�仗�仂亳亰于亠亟亠仆亳� 亰于�从舒"
 
-#: ../pidgin/gtkprefs.c:1636
+#: ../pidgin/gtkprefs.c:1706
 msgid "_Method:"
 msgstr "_�亠�仂亟:"
 
-#: ../pidgin/gtkprefs.c:1638
+#: ../pidgin/gtkprefs.c:1708
 msgid "Console beep"
 msgstr "弌亳亞仆舒仍 亟亳仆舒仄亳从仂仄"
 
-#: ../pidgin/gtkprefs.c:1640
+#: ../pidgin/gtkprefs.c:1710
 msgid "Automatic"
 msgstr "�于�仂仄舒�亳�亠�从亳"
 
-#: ../pidgin/gtkprefs.c:1644
+#: ../pidgin/gtkprefs.c:1714
 msgid "Command"
 msgstr "�仂仄舒仆亟舒"
 
-#: ../pidgin/gtkprefs.c:1645
+#: ../pidgin/gtkprefs.c:1715
 msgid "No sounds"
 msgstr "�亠� 亰于�从仂于"
 
-#: ../pidgin/gtkprefs.c:1653
+#: ../pidgin/gtkprefs.c:1723
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -14316,117 +14405,117 @@
 "_�仂仄舒仆亟舒 于仂�仗�仂亳亰于亠亟亠仆亳� 亰于�从舒:\n"
 "(%s 亟仍� 亳仄亠仆亳 �舒亶仍舒)"
 
-#: ../pidgin/gtkprefs.c:1679
+#: ../pidgin/gtkprefs.c:1749
 msgid "Sound Options"
 msgstr "�舒�舒仄亠��� 亰于�从舒"
 
-#: ../pidgin/gtkprefs.c:1680
+#: ../pidgin/gtkprefs.c:1750
 msgid "Sounds when conversation has _focus"
 msgstr "�于�从亳, 从仂亞亟舒 仂从仆仂 弍亠�亠亟� 于 _�仂从��亠"
 
-#: ../pidgin/gtkprefs.c:1682
+#: ../pidgin/gtkprefs.c:1752
 msgid "Enable sounds:"
 msgstr "�仂�仗�仂亳亰于仂亟亳�� 亰于�从亳:"
 
-#: ../pidgin/gtkprefs.c:1684
+#: ../pidgin/gtkprefs.c:1754
 msgid "Only when available"
 msgstr "丐仂仍�从仂 于仂 于�亠仄� 仗�亳�����于亳�"
 
-#: ../pidgin/gtkprefs.c:1685
+#: ../pidgin/gtkprefs.c:1755
 msgid "Only when not available"
 msgstr "丐仂仍�从仂 于仂 于�亠仄� 仂������于亳�"
 
-#: ../pidgin/gtkprefs.c:1693
+#: ../pidgin/gtkprefs.c:1763
 msgid "Volume:"
 msgstr "��仂仄从仂���:"
 
-#: ../pidgin/gtkprefs.c:1721
+#: ../pidgin/gtkprefs.c:1791
 msgid "Sound Events"
 msgstr "�于�从仂于�亠 �仂弍��亳�"
 
-#: ../pidgin/gtkprefs.c:1773
+#: ../pidgin/gtkprefs.c:1843
 msgid "Play"
 msgstr "�仂�仗�仂亳亰于仂亟亳��"
 
-#: ../pidgin/gtkprefs.c:1780
+#: ../pidgin/gtkprefs.c:1850
 msgid "Event"
 msgstr "弌仂弍��亳亠"
 
-#: ../pidgin/gtkprefs.c:1799
+#: ../pidgin/gtkprefs.c:1869
 msgid "Test"
 msgstr "丐亠��"
 
-#: ../pidgin/gtkprefs.c:1803
+#: ../pidgin/gtkprefs.c:1873
 msgid "Reset"
 msgstr "弌弍�仂�"
 
-#: ../pidgin/gtkprefs.c:1807
+#: ../pidgin/gtkprefs.c:1877
 msgid "Choose..."
 msgstr "��弍�舒��..."
 
-#: ../pidgin/gtkprefs.c:1850
+#: ../pidgin/gtkprefs.c:1920
 msgid "_Report idle time:"
 msgstr "弌仂仂弍�舒�� _于�亠仄� 弍亠亰亟亠亶��于亳�:"
 
-#: ../pidgin/gtkprefs.c:1855
+#: ../pidgin/gtkprefs.c:1925
 msgid "Based on keyboard or mouse use"
 msgstr "��仆仂于�于舒��� 仆舒 亳�仗仂仍�亰仂于舒仆亳亳 从仍舒于亳舒���� 亳仍亳 仄��亳"
 
-#: ../pidgin/gtkprefs.c:1864
+#: ../pidgin/gtkprefs.c:1934
 msgid "_Auto-reply:"
 msgstr "_�于�仂仄舒�亳�亠�从亳亶 仂�于亠�:"
 
-#: ../pidgin/gtkprefs.c:1868
+#: ../pidgin/gtkprefs.c:1938
 msgid "When both away and idle"
 msgstr "�仂 于�亠仄� 仂������于亳� 亳 弍亠亰亟亠亶��于亳�"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:1874
+#: ../pidgin/gtkprefs.c:1944
 msgid "Auto-away"
 msgstr "�于�仂-\"��仂��仍\""
 
-#: ../pidgin/gtkprefs.c:1876
+#: ../pidgin/gtkprefs.c:1946
 msgid "Change status when _idle"
 msgstr "�亠仆��� ��舒��� 仗�亳 _弍亠亰亟亠亶��于亳亳"
 
-#: ../pidgin/gtkprefs.c:1880
+#: ../pidgin/gtkprefs.c:1950
 msgid "_Minutes before changing status:"
 msgstr "_�亳仆�� 亟仂 亳亰仄亠仆亠仆亳� ��舒���舒:"
 
-#: ../pidgin/gtkprefs.c:1888
+#: ../pidgin/gtkprefs.c:1958
 msgid "Change _status to:"
 msgstr "�亠仆��� _��舒��� 仆舒:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:1909
+#: ../pidgin/gtkprefs.c:1979
 msgid "Status at Startup"
 msgstr "弌�舒��� 仗�亳 亰舒仗��从亠"
 
-#: ../pidgin/gtkprefs.c:1911
+#: ../pidgin/gtkprefs.c:1981
 msgid "Use status from last _exit at startup"
 msgstr "��仗仂仍�亰仂于舒�� 仗�亳 亰舒仗��从亠 ��舒���, 弍�于�亳亶 亟仂 于_��仂亟舒"
 
-#: ../pidgin/gtkprefs.c:1917
+#: ../pidgin/gtkprefs.c:1987
 msgid "Status to a_pply at startup:"
 msgstr "_��亳仄亠仆亳�� 仗�亳 亰舒仗��从亠 ��舒���:"
 
-#: ../pidgin/gtkprefs.c:1955
+#: ../pidgin/gtkprefs.c:2025
 msgid "Interface"
 msgstr "�仆�亠��亠亶�"
 
-#: ../pidgin/gtkprefs.c:1957
+#: ../pidgin/gtkprefs.c:2027
 msgid "Smiley Themes"
 msgstr "丐亠仄� �仄舒亶仍亳从仂于"
 
-#: ../pidgin/gtkprefs.c:1958
+#: ../pidgin/gtkprefs.c:2028
 msgid "Sounds"
 msgstr "�于�从亳"
 
-#: ../pidgin/gtkprefs.c:1964
+#: ../pidgin/gtkprefs.c:2034
 msgid "Browser"
 msgstr "��舒�亰亠�"
 
-#: ../pidgin/gtkprefs.c:1968
+#: ../pidgin/gtkprefs.c:2038
 msgid "Status / Idle"
 msgstr "弌�舒��� / �亠亰亟亠亶��于亳亠"
 
@@ -14450,64 +14539,64 @@
 msgid "Block only the users below"
 msgstr "�仍仂从亳�仂于舒�� �仂仍�从仂 仗仂仍�亰仂于舒�亠仍亠亶, �从舒亰舒仆仆�� 仆亳亢亠"
 
-#: ../pidgin/gtkprivacy.c:372
+#: ../pidgin/gtkprivacy.c:369
 msgid "Privacy"
 msgstr "�仂仆�亳亟亠仆�亳舒仍�仆仂���"
 
-#: ../pidgin/gtkprivacy.c:385
+#: ../pidgin/gtkprivacy.c:381
 msgid "Changes to privacy settings take effect immediately."
 msgstr "�亰仄亠仆亠仆亳� 仆舒���仂亠从 从仂仆�亳亟亠仆�亳舒仍�仆仂��亳 于���仗舒�� 于 �亳仍� 仆亠仄亠亟仍亠仆仆仂."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:397
+#: ../pidgin/gtkprivacy.c:393
 msgid "Set privacy for:"
 msgstr "丕��舒仆仂于亳�� 从仂仆�亳亟亠仆�亳舒仍�仆仂��� 亟仍�:"
 
-#: ../pidgin/gtkprivacy.c:560 ../pidgin/gtkprivacy.c:577
+#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
 msgid "Permit User"
 msgstr "�仂仗���亳�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../pidgin/gtkprivacy.c:561
+#: ../pidgin/gtkprivacy.c:557
 msgid "Type a user you permit to contact you."
 msgstr "丕从舒亢亳�亠 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� 亟仂仗��从舒亠�亠 从 仂弍�亠仆亳� � 于舒仄亳."
 
-#: ../pidgin/gtkprivacy.c:562
+#: ../pidgin/gtkprivacy.c:558
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr ""
 "�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� �仂�亳�亠 亟仂仗���亳�� 从 仂弍�亠仆亳� � 于舒仄亳."
 
-#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
 msgid "_Permit"
 msgstr "_�仂仗���亳��"
 
-#: ../pidgin/gtkprivacy.c:571
+#: ../pidgin/gtkprivacy.c:567
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "�仂亰于仂仍亳�� %s 仂弍�舒���� � 于舒仄亳?"
 
-#: ../pidgin/gtkprivacy.c:573
+#: ../pidgin/gtkprivacy.c:569
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 仗仂亰于仂仍亳�� %s 仂弍�舒���� � 于舒仄亳?"
 
-#: ../pidgin/gtkprivacy.c:602 ../pidgin/gtkprivacy.c:616
+#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
 msgid "Block User"
 msgstr "�仍仂从亳�仂于舒�� 仗仂仍�亰仂于舒�亠仍�"
 
-#: ../pidgin/gtkprivacy.c:603
+#: ../pidgin/gtkprivacy.c:599
 msgid "Type a user to block."
 msgstr "丕从舒亢亳�亠 弍仍仂从亳��亠仄仂亞仂 仗仂仍�亰仂于舒�亠仍�."
 
-#: ../pidgin/gtkprivacy.c:604
+#: ../pidgin/gtkprivacy.c:600
 msgid "Please enter the name of the user you wish to block."
 msgstr "�于亠亟亳�亠 亳仄� 仗仂仍�亰仂于舒�亠仍�, 从仂�仂�仂亞仂 于� �仂�亳�亠 弍仍仂从亳�仂于舒��."
 
-#: ../pidgin/gtkprivacy.c:612
+#: ../pidgin/gtkprivacy.c:608
 #, c-format
 msgid "Block %s?"
 msgstr "�仍仂从亳�仂于舒�� %s?"
 
-#: ../pidgin/gtkprivacy.c:614
+#: ../pidgin/gtkprivacy.c:610
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 弍仍仂从亳�仂于舒�� %s?"
@@ -14516,76 +14605,77 @@
 msgid "Apply"
 msgstr "��亳仄亠仆亳��"
 
-#: ../pidgin/gtkrequest.c:1482
+#: ../pidgin/gtkrequest.c:1483
 msgid "That file already exists"
 msgstr "丐舒从仂亶 �舒亶仍 �亢亠 ���亠��于�亠�"
 
-#: ../pidgin/gtkrequest.c:1483
+#: ../pidgin/gtkrequest.c:1484
 msgid "Would you like to overwrite it?"
 msgstr "丱仂�亳�亠 仗亠�亠亰舒仗亳�舒�� 亠亞仂?"
 
-#: ../pidgin/gtkrequest.c:1486
+#: ../pidgin/gtkrequest.c:1487
 msgid "Overwrite"
 msgstr "�亠�亠亰舒仗亳�舒��"
 
-#: ../pidgin/gtkrequest.c:1487
+#: ../pidgin/gtkrequest.c:1488
 msgid "Choose New Name"
 msgstr "��弍�舒�� 仆仂于仂亠 亳仄�"
 
-#: ../pidgin/gtkrequest.c:1625 ../pidgin/gtkrequest.c:1639
+#: ../pidgin/gtkrequest.c:1626 ../pidgin/gtkrequest.c:1640
 msgid "Select Folder..."
 msgstr "��弍�舒�� 仗舒仗从�..."
 
-#: ../pidgin/gtkroomlist.c:376
+#. Create the window.
+#: ../pidgin/gtkroomlist.c:374
 msgid "Room List"
 msgstr "弌仗亳�仂从 从仂仄仆舒�"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:446
+#: ../pidgin/gtkroomlist.c:442
 msgid "_Get List"
 msgstr "_�仂仍��亳�� �仗亳�仂从"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:454
+#: ../pidgin/gtkroomlist.c:450
 msgid "_Add Chat"
 msgstr "_�仂弍舒于亳�� �舒�"
 
-#: ../pidgin/gtksavedstatuses.c:331
+#: ../pidgin/gtksavedstatuses.c:336
 msgid "Are you sure you want to delete the selected saved statuses?"
 msgstr "�� 亟亠亶��于亳�亠仍�仆仂 �仂�亳�亠 �亟舒仍亳�� 于�弍�舒仆仆�亠 �仂��舒仆�仆仆�亠 ��舒����?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:580 ../pidgin/gtksavedstatuses.c:1213
+#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
 msgid "_Use"
 msgstr "_��亳仄亠仆亳��"
 
-#: ../pidgin/gtksavedstatuses.c:726
+#: ../pidgin/gtksavedstatuses.c:779
 msgid "Title already in use.  You must choose a unique title."
 msgstr "�舒亰于舒仆亳亠 �亢亠 亳�仗仂仍�亰�亠���. �� 亟仂仍亢仆� 于�弍�舒�� �仆亳从舒仍�仆仂亠 仆舒亰于舒仆亳亠."
 
-#: ../pidgin/gtksavedstatuses.c:914
+#: ../pidgin/gtksavedstatuses.c:969
 msgid "Different"
 msgstr "��仍亳�舒��亳亶��"
 
-#: ../pidgin/gtksavedstatuses.c:1106
+#: ../pidgin/gtksavedstatuses.c:1158
 msgid "_Title:"
 msgstr "_�舒亰于舒仆亳亠:"
 
-#: ../pidgin/gtksavedstatuses.c:1125 ../pidgin/gtksavedstatuses.c:1446
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
 msgid "_Status:"
 msgstr "_弌�舒���:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1157
+#: ../pidgin/gtksavedstatuses.c:1209
 msgid "Use a _different status for some accounts"
 msgstr "��仗仂仍�亰仂于舒�� _仂�仍亳�舒��亳亶�� ��舒��� 亟仍� 仆亠从仂�仂��� ����仆�� 亰舒仗亳�亠亶"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1221
+#: ../pidgin/gtksavedstatuses.c:1273
 msgid "Sa_ve & Use"
 msgstr "弌仂��舒仆亳�� _亳 仗�亳仄亠仆亳��"
 
-#: ../pidgin/gtksavedstatuses.c:1427
+#: ../pidgin/gtksavedstatuses.c:1477
 #, c-format
 msgid "Status for %s"
 msgstr "弌�舒��� 亟仍� %s"
@@ -14638,71 +14728,71 @@
 msgid "GStreamer failed to initialize."
 msgstr "�亠 �亟舒仍仂�� 亳仆亳�亳舒仍亳亰亳�仂于舒�� GStreamer."
 
-#: ../pidgin/gtkstatusbox.c:661
+#: ../pidgin/gtkstatusbox.c:663
 msgid "Waiting for network connection"
 msgstr "�亢亳亟舒仆亳亠 �亠�亠于仂亞仂 �仂亠亟亳仆亠仆亳�"
 
-#: ../pidgin/gtkutils.c:593
+#: ../pidgin/gtkutils.c:627
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1309 ../pidgin/gtkutils.c:1332
+#: ../pidgin/gtkutils.c:1384 ../pidgin/gtkutils.c:1407
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "��仂亳亰仂�仍舒 �仍亠亟���舒� 仂�亳弍从舒 仗�亳 亰舒亞��亰从亠 %s: %s"
 
-#: ../pidgin/gtkutils.c:1312 ../pidgin/gtkutils.c:1334
+#: ../pidgin/gtkutils.c:1387 ../pidgin/gtkutils.c:1409
 msgid "Failed to load image"
 msgstr "�亠 �亟舒仍仂�� 亰舒亞��亰亳�� 亳亰仂弍�舒亢亠仆亳亠"
 
-#: ../pidgin/gtkutils.c:1408
+#: ../pidgin/gtkutils.c:1483
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "�亠仍�亰� 仂�仗�舒于亳�� 仗舒仗从� %s."
 
-#: ../pidgin/gtkutils.c:1409
+#: ../pidgin/gtkutils.c:1484
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
 "individually."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1441 ../pidgin/gtkutils.c:1453
-#: ../pidgin/gtkutils.c:1460
+#: ../pidgin/gtkutils.c:1516 ../pidgin/gtkutils.c:1528
+#: ../pidgin/gtkutils.c:1535
 msgid "You have dragged an image"
 msgstr "�� 仗亠�亠�舒�亳仍亳 亳亰仂弍�舒亢亠仆亳亠"
 
-#: ../pidgin/gtkutils.c:1442
+#: ../pidgin/gtkutils.c:1517
 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:1448 ../pidgin/gtkutils.c:1468
+#: ../pidgin/gtkutils.c:1523 ../pidgin/gtkutils.c:1543
 msgid "Set as buddy icon"
 msgstr "丕��舒仆仂于亳�� 于 从舒�亠��于亠 亰仆舒�从舒 �仂弍亠�亠亟仆亳从舒"
 
-#: ../pidgin/gtkutils.c:1449 ../pidgin/gtkutils.c:1469
+#: ../pidgin/gtkutils.c:1524 ../pidgin/gtkutils.c:1544
 msgid "Send image file"
 msgstr "��仗�舒于亳�� �舒亶仍 亳亰仂弍�舒亢亠仆亳�"
 
-#: ../pidgin/gtkutils.c:1450 ../pidgin/gtkutils.c:1469
+#: ../pidgin/gtkutils.c:1525 ../pidgin/gtkutils.c:1544
 msgid "Insert in message"
 msgstr "���舒于亳�� 于 �仂仂弍�亠仆亳亠"
 
-#: ../pidgin/gtkutils.c:1454
+#: ../pidgin/gtkutils.c:1529
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr ""
 "丱仂�亳�亠 ���舒仆仂于亳�� ��仂 亳亰仂弍�舒亢亠仆亳亠 于 从舒�亠��于亠 亰仆舒�从舒 �仂弍亠�亠亟仆亳从舒 亟仍� ��仂亞仂 "
 "仗仂仍�亰仂于舒�亠仍�?"
 
-#: ../pidgin/gtkutils.c:1461
+#: ../pidgin/gtkutils.c:1536
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
 msgstr ""
 
-#: ../pidgin/gtkutils.c:1462
+#: ../pidgin/gtkutils.c:1537
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -14713,17 +14803,17 @@
 #. * 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:1520
+#: ../pidgin/gtkutils.c:1595
 msgid "Cannot send launcher"
 msgstr "�亠仍�亰� 仂�仗�舒于亳�� ��仍�从"
 
-#: ../pidgin/gtkutils.c:1520
+#: ../pidgin/gtkutils.c:1595
 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:2267
+#: ../pidgin/gtkutils.c:2317
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -14734,44 +14824,38 @@
 "<b>�舒亰仄亠� �舒亶仍舒:</b> %s\n"
 "<b>�舒亰仄亠� 亳亰仂弍�舒亢亠仆亳�:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2563
+#: ../pidgin/gtkutils.c:2613
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr ""
 
-#: ../pidgin/gtkutils.c:2565
+#: ../pidgin/gtkutils.c:2615
 msgid "Icon Error"
 msgstr "��亳弍从舒 亰仆舒�从舒"
 
-#: ../pidgin/gtkutils.c:2566
+#: ../pidgin/gtkutils.c:2616
 msgid "Could not set icon"
 msgstr "�亠 �亟舒仍仂�� ���舒仆仂于亳�� 亰仆舒�仂从"
 
-#: ../pidgin/gtkutils.c:2666
+#: ../pidgin/gtkutils.c:2716
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "�亠 �亟舒仍仂�� 仂�从���� �舒亶仍 '%s': %s"
 
-#: ../pidgin/gtkutils.c:2715
+#: ../pidgin/gtkutils.c:2765
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
 
-#: ../pidgin/gtkwhiteboard.c:760 ../pidgin/gtkwhiteboard.c:779
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
 msgid "Save File"
 msgstr "弌仂��舒仆亳�� �舒亶仍"
 
-#: ../pidgin/gtkwhiteboard.c:867
+#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "��弍�舒�� �于亠�"
 
-#. Translators may want to transliterate the name.
-#. It is not to be translated.
-#: ../pidgin/pidgin.h:50
-msgid "Pidgin"
-msgstr "Pidgin"
-
 #: ../pidgin/pidginstock.c:81
 msgid "_Alias"
 msgstr "_��亠于亟仂仆亳仄"
@@ -14796,10 +14880,6 @@
 msgid "_Open Mail"
 msgstr "��从���� _仗仂���"
 
-#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
-msgid "Default"
-msgstr "�仂 �仄仂仍�舒仆亳�"
-
 #: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
 msgid "Pidgin smileys"
 msgstr "弌仄舒亶仍亳从亳 Pidgin"
@@ -14854,18 +14934,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:934
+#: ../pidgin/plugins/cap/cap.c:935
 msgid "Contact Availability Prediction"
 msgstr ""
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:937
 msgid "Contact Availability Prediction plugin."
 msgstr ""
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:937
+#: ../pidgin/plugins/cap/cap.c:938
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
@@ -14963,11 +15043,23 @@
 msgid "Received Messages"
 msgstr "�仂仍��亠仆仆�亠 �仂仂弍�亠仆亳�"
 
-#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:320
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
 #, c-format
 msgid "Select Color for %s"
 msgstr "��弍亠�亳�亠 �于亠� 亟仍� %s"
 
+#: ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "�亳�仆�亶"
+
+#: ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "�舒从仍仂仆仆�亶"
+
+#: ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "�仂亟���从仆���亶"
+
 #: ../pidgin/plugins/convcolors.c:310
 msgid "Ignore incoming format"
 msgstr "�亞仆仂�亳�仂于舒�� 于�仂亟��亳亶 �仂�仄舒�"
@@ -15088,29 +15180,29 @@
 msgstr "�弍仄亠仆 仄亞仆仂于亠仆仆�仄亳 �仂仂弍�亠仆亳�仄亳"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:460
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
 msgid "Select a person from your address book below, or add a new person."
 msgstr "�亳亢亠 于�弍亠�亳�亠 仗亠��仂仆� 亳亰 舒亟�亠�仆仂亶 从仆亳亞亳 亳仍亳 亟仂弍舒于��亠 仆仂于�� 仗亠��仂仆�."
 
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:554
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:307
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
 msgid "Group:"
 msgstr "���仗仗舒:"
 
 #. "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
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
 msgid "New Person"
 msgstr "�仂于舒� 仗亠��仂仆舒"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:597
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
 msgid "Select Buddy"
 msgstr "��弍�舒�� �仂弍亠�亠亟仆亳从舒"
 
 #. Add the label.
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:345
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
 msgid ""
 "Select a person from your address book to add this buddy to, or create a new "
 "person."
@@ -15119,43 +15211,43 @@
 "�仂弍亠�亠亟仆亳从舒, 亳仍亳 �仂亰亟舒亶�亠 仆仂于�� 仗亠��仂仆�."
 
 #. Add the expander
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:433
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
 msgid "User _details"
 msgstr "�仂亟�仂弍仆仂��亳 仂 仗仂仍�亰仂于舒�亠仍亠"
 
 #. "Associate Buddy" button
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:486
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
 msgid "_Associate Buddy"
 msgstr "弌仂仂�仆亠��亳 �仂弍亠�亠亟仆亳从舒"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:238
-#: ../pidgin/plugins/gevolution/gevolution.c:244
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send e-mail"
 msgstr "�亠 �亟舒���� 仂�仗�舒于亳�� e-mail"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:239
+#: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
 msgstr "��仗仂仍仆�亠仄�亶 �舒亶仍 evolution 仆亠 弍�仍 仆舒亶亟亠仆 于 PATH."
 
-#: ../pidgin/plugins/gevolution/gevolution.c:245
+#: ../pidgin/plugins/gevolution/gevolution.c:247
 msgid "An e-mail address was not found for this buddy."
 msgstr ""
 
-#: ../pidgin/plugins/gevolution/gevolution.c:271
+#: ../pidgin/plugins/gevolution/gevolution.c:273
 msgid "Add to Address Book"
 msgstr "�仂弍舒于亳�� 于 舒亟�亠�仆�� 从仆亳亞�"
 
-#: ../pidgin/plugins/gevolution/gevolution.c:283
+#: ../pidgin/plugins/gevolution/gevolution.c:285
 msgid "Send E-Mail"
 msgstr "��仗�舒于亳�� e-mail"
 
 #. Configuration frame
-#: ../pidgin/plugins/gevolution/gevolution.c:410
+#: ../pidgin/plugins/gevolution/gevolution.c:412
 msgid "Evolution Integration Configuration"
 msgstr "�舒���仂亶从舒 亳仆�亠亞�舒�亳亳 � Evolution"
 
 #. Label
-#: ../pidgin/plugins/gevolution/gevolution.c:413
+#: ../pidgin/plugins/gevolution/gevolution.c:415
 msgid "Select all accounts that buddies should be auto-added to."
 msgstr ""
 "��弍亠�亳�亠 于�亠 ����仆�亠 亰舒仗亳�亳, �仂弍亠�亠亟仆亳从亳 从仂�仂��� 亟仂仍亢仆� 弍��� 亟仂弍舒于仍亠仆� "
@@ -15167,7 +15259,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:525
+#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "�仆�亠亞�舒�亳� � Evolution"
 
@@ -15175,38 +15267,38 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/gevolution/gevolution.c:528
 #: ../pidgin/plugins/gevolution/gevolution.c:530
+#: ../pidgin/plugins/gevolution/gevolution.c:532
 msgid "Provides integration with Evolution."
 msgstr "��亠亟仂��舒于仍�亠� 亳仆�亠亞�舒�亳� � Evolution."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
 msgid "Please enter the person's information below."
 msgstr "�亳亢亠 于于亠亟亳�亠 亳仆�仂�仄舒�亳� 仂 仗亠��仂仆亠."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:271
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
 msgid "Please enter the buddy's screen name and account type below."
 msgstr ""
 "�亳亢亠 于于亠亟亳�亠 亳亟亠仆�亳�亳从舒�仂� 仗仂仍�亰仂于舒�亠仍� �仂弍亠�亠亟仆亳从舒 亳 �亳仗 ����仆仂亶 亰舒仗亳�亳."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
 msgid "Account type:"
 msgstr "丐亳仗 ����仆仂亶 亰舒仗亳�亳:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:315
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
 msgid "Optional information:"
 msgstr "�亠仂弍�亰舒�亠仍�仆舒� 亳仆�仂�仄舒�亳�:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:350
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
 msgid "First name:"
 msgstr "�仄�:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:362
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
 msgid "Last name:"
 msgstr "个舒仄亳仍亳�:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:382
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
 msgid "E-mail:"
 msgstr "E-mail:"
 
@@ -15502,24 +15594,24 @@
 msgid "Notify Dialog"
 msgstr "�亳舒仍仂亞 �于亠亟仂仄仍亠仆亳�"
 
-#: ../pidgin/plugins/pidginrc.c:322
+#: ../pidgin/plugins/pidginrc.c:253
 msgid "Select Color"
 msgstr "��弍亠�亳�亠 �于亠�"
 
-#: ../pidgin/plugins/pidginrc.c:361
+#: ../pidgin/plugins/pidginrc.c:300
+msgid "Select Interface Font"
+msgstr "��弍亠�亳�亠 ��亳��"
+
+#: ../pidgin/plugins/pidginrc.c:303
 #, c-format
 msgid "Select Font for %s"
 msgstr "��弍亠�亳�亠 ��亳�� 亟仍� %s"
 
-#: ../pidgin/plugins/pidginrc.c:398
-msgid "Select Interface Font"
-msgstr "��弍亠�亳�亠 ��亳��"
-
-#: ../pidgin/plugins/pidginrc.c:453
+#: ../pidgin/plugins/pidginrc.c:371
 msgid "GTK+ Interface Font"
 msgstr "丿�亳�� 亳仆�亠��亠亶�舒 GTK+"
 
-#: ../pidgin/plugins/pidginrc.c:473
+#: ../pidgin/plugins/pidginrc.c:391
 msgid "GTK+ Text Shortcut Theme"
 msgstr ""
 
@@ -15543,36 +15635,36 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:510
+#: ../pidgin/plugins/pidginrc.c:428
 msgid "Interface colors"
 msgstr "丶于亠�舒 亳仆�亠��亠亶�舒"
 
-#: ../pidgin/plugins/pidginrc.c:534
+#: ../pidgin/plugins/pidginrc.c:452
 msgid "Widget Sizes"
 msgstr "�舒亰仄亠� 于亳亟亢亠�仂于"
 
-#: ../pidgin/plugins/pidginrc.c:555
+#: ../pidgin/plugins/pidginrc.c:473
 msgid "Fonts"
 msgstr "丿�亳���"
 
-#: ../pidgin/plugins/pidginrc.c:578
-msgid "Tools"
-msgstr "�仆����仄亠仆��"
-
-#: ../pidgin/plugins/pidginrc.c:583
+#: ../pidgin/plugins/pidginrc.c:497
+msgid "Gtkrc File Tools"
+msgstr ""
+
+#: ../pidgin/plugins/pidginrc.c:502
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "�舒仗亳�舒�� 仆舒���仂亶从亳 于 %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:591
+#: ../pidgin/plugins/pidginrc.c:511
 msgid "Re-read gtkrc files"
 msgstr "�仂于�仂�仆仂 仗�仂�亳�舒�� �舒亶仍� gtkrc"
 
-#: ../pidgin/plugins/pidginrc.c:624
+#: ../pidgin/plugins/pidginrc.c:544
 msgid "Pidgin GTK+ Theme Control"
 msgstr "丕仗�舒于仍亠仆亳亠 �亠仄仂亶 GTK+ 亟仍� Pidgin"
 
-#: ../pidgin/plugins/pidginrc.c:626 ../pidgin/plugins/pidginrc.c:627
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
 msgid "Provides access to commonly used gtkrc settings."
 msgstr "��亠亟仂��舒于仍�亠� 亟仂���仗 从 �舒��仂 亳�仗仂仍�亰�亠仄�仄 仆舒���仂亶从舒仄 gtkrc."
 
@@ -15599,17 +15691,17 @@
 #, c-format
 msgid ""
 "You are using %s version %s.  The current version is %s.  You can get it "
-"from <a href=\""
+"from <a href=\"%s\">%s</a><hr>"
 msgstr ""
 "�� 亳�仗仂仍�亰�亠�亠 %s 于亠��亳亳 %s. �仂�仍亠亟仆�� 亟仂���仗仆舒� 于亠��亳� %s. �� 仄仂亢亠�亠 "
-"仗仂仍��亳�� 亠� 仗仂 舒亟�亠�� <a href=\""
-
-#: ../pidgin/plugins/relnot.c:78
+"仗仂仍��亳�� 亠� 仗仂 舒亟�亠�� <a href=\"%s\">%s</a><hr>"
+
+#: ../pidgin/plugins/relnot.c:79
 #, c-format
 msgid "<b>ChangeLog:</b><br>%s"
 msgstr "<b>弌仗亳�仂从 亳亰仄亠仆亠仆亳亶:</b><br>%s"
 
-#: ../pidgin/plugins/relnot.c:83 ../pidgin/plugins/relnot.c:84
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
 msgid "New Version Available"
 msgstr "�仂���仗仆舒 仆仂于舒� 于亠��亳�"
 
@@ -15619,19 +15711,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/relnot.c:142
+#: ../pidgin/plugins/relnot.c:143
 msgid "Release Notification"
 msgstr "丕于亠亟仂仄仍亠仆亳亠 仂 于�仗��从亠"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/relnot.c:145
+#: ../pidgin/plugins/relnot.c:146
 msgid "Checks periodically for new releases."
 msgstr "�亠�亳仂亟亳�亠�从亳 仗�仂于亠��亠� 仆舒仍亳�亳亠 仆仂于�� 于亠��亳亶."
 
 #. *  description
-#: ../pidgin/plugins/relnot.c:147
+#: ../pidgin/plugins/relnot.c:148
 msgid ""
 "Checks periodically for new releases and notifies the user with the "
 "ChangeLog."
@@ -15639,68 +15731,68 @@
 "�亠�亳仂亟亳�亠�从亳 仗�仂于亠��亠� 仆舒仍亳�亳亠 仆仂于�� 于亠��亳亶 亳 �于亠亟仂仄仍�亠� 仂 仆亳� 仗仂仍�亰仂于舒�亠仍�, "
 "仗�亳于仂亟� �仗亳�仂从 亳亰仄亠仆亠仆亳亶."
 
-#: ../pidgin/plugins/spellchk.c:1965
+#: ../pidgin/plugins/spellchk.c:1962
 msgid "Duplicate Correction"
 msgstr "丕亟舒仍亠仆亳亠 仗仂于�仂�仂于"
 
-#: ../pidgin/plugins/spellchk.c:1966
+#: ../pidgin/plugins/spellchk.c:1963
 msgid "The specified word already exists in the correction list."
 msgstr "丕从舒亰舒仆仆仂亠 �仍仂于仂 �亢亠 仗�亳�����于�亠� 于 �仗亳�从亠 亳�仗�舒于仍亠仆亳亶."
 
-#: ../pidgin/plugins/spellchk.c:2180
+#: ../pidgin/plugins/spellchk.c:2177
 msgid "Text Replacements"
 msgstr "�舒仄亠�亠仆亳亠 �亠从��舒"
 
-#: ../pidgin/plugins/spellchk.c:2203
+#: ../pidgin/plugins/spellchk.c:2200
 msgid "You type"
 msgstr "�� 仆舒弍亳�舒亠�亠"
 
-#: ../pidgin/plugins/spellchk.c:2217
+#: ../pidgin/plugins/spellchk.c:2214
 msgid "You send"
 msgstr "�� 仂�仗�舒于仍�亠�亠"
 
-#: ../pidgin/plugins/spellchk.c:2231
+#: ../pidgin/plugins/spellchk.c:2228
 msgid "Whole words only"
 msgstr "丐仂仍�从仂 �亠仍�亠 �仍仂于舒"
 
-#: ../pidgin/plugins/spellchk.c:2243
+#: ../pidgin/plugins/spellchk.c:2240
 msgid "Case sensitive"
 msgstr "丕�亳��于舒�� �亠亞亳���"
 
-#: ../pidgin/plugins/spellchk.c:2269
+#: ../pidgin/plugins/spellchk.c:2266
 msgid "Add a new text replacement"
 msgstr "�仂弍舒于亳�� 仆仂于仂亠 亰舒仄亠�亠仆亳亠 �亠从��舒"
 
-#: ../pidgin/plugins/spellchk.c:2285
+#: ../pidgin/plugins/spellchk.c:2282
 msgid "You _type:"
 msgstr "�� _仆舒弍亳�舒亠�亠:"
 
-#: ../pidgin/plugins/spellchk.c:2302
+#: ../pidgin/plugins/spellchk.c:2299
 msgid "You _send:"
 msgstr "�� _仂�仗�舒于仍�亠�亠:"
 
 #. Created here so it can be passed to whole_words_button_toggled.
-#: ../pidgin/plugins/spellchk.c:2314
+#: ../pidgin/plugins/spellchk.c:2311
 msgid "_Exact case match (uncheck for automatic case handling)"
 msgstr "_丐仂�仆仂亠 �仂于仗舒亟亠仆亳亠 �亠亞亳���舒"
 
-#: ../pidgin/plugins/spellchk.c:2316
+#: ../pidgin/plugins/spellchk.c:2313
 msgid "Only replace _whole words"
 msgstr "�舒仄亠�舒�� �仂仍�从仂 _�亠仍�亠 �仍仂于舒"
 
-#: ../pidgin/plugins/spellchk.c:2341
+#: ../pidgin/plugins/spellchk.c:2338
 msgid "General Text Replacement Options"
 msgstr "��仆仂于仆�亠 仗舒�舒仄亠��� 亰舒仄亠�亠仆亳� �亠从��舒"
 
-#: ../pidgin/plugins/spellchk.c:2342
+#: ../pidgin/plugins/spellchk.c:2339
 msgid "Enable replacement of last word on send"
 msgstr "�舒亰�亠�亳�� 亰舒仄亠�亠仆亳亠 仗仂�仍亠亟仆亠亞仂 �仍仂于舒 仗�亳 仂�仗�舒于从亠"
 
-#: ../pidgin/plugins/spellchk.c:2373
+#: ../pidgin/plugins/spellchk.c:2370
 msgid "Text replacement"
 msgstr "�舒仄亠�亠仆亳亠 �亠从��舒"
 
-#: ../pidgin/plugins/spellchk.c:2375 ../pidgin/plugins/spellchk.c:2376
+#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr ""
 "�舒仄亠�舒亠� �亠从�� 于 亳��仂亟��亳� �仂仂弍�亠仆亳�� 于 �仂仂�于亠���于亳亳 � 仗�舒于亳仍舒仄亳, "
@@ -15712,7 +15804,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:77 ../pidgin/plugins/ticker/ticker.c:355
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
 msgid "Buddy Ticker"
 msgstr "�亠仆�舒 �仂弍亠�亠亟仆亳从仂于"
 
@@ -15720,7 +15812,7 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:358 ../pidgin/plugins/ticker/ticker.c:360
+#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
 msgid "A horizontal scrolling version of the buddy list."
 msgstr "�仂�亳亰仂仆�舒仍�仆舒� 仗�仂从���从舒 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于."
 
@@ -15806,44 +15898,44 @@
 "亅�仂� 仄仂亟�仍� 仗仂亰于仂仍�亠� 仗仂仍�亰仂于舒�亠仍� 亳亰仄亠仆��� �仂�仄舒�� 于�亠仄亠仆亳 �仂仂弍�亠仆亳亶 亟仍� "
 "弍亠�亠亟 亳 亢��仆舒仍仂于."
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:183
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:569
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:616
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:589
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636
 msgid "Opacity:"
 msgstr "�亠仗�仂亰�舒�仆仂���:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:533
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
 msgid "IM Conversation Windows"
 msgstr "�从仆舒 弍亠�亠亟"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:534
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554
 msgid "_IM window transparency"
 msgstr "_��仂亰�舒�仆仂��� 仂从仆舒 弍亠�亠亟�"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:548
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568
 msgid "_Show slider bar in IM window"
 msgstr "�仂从舒亰�于舒�� _仗仂仍仂�� 仗�仂从���从亳 于 仂从仆舒� 弍亠�亠亟"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:555
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575
 msgid "Remove IM window transparency on focus"
 msgstr "丕弍亳�舒�� 仗�仂亰�舒�仆仂��� 仂从仆舒 弍亠�亠亟� 于 �仂从��亠"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:558
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:606
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:578
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626
 msgid "Always on top"
 msgstr "��亠亞亟舒 仆舒于亠���"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:590
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
 msgid "Buddy List Window"
 msgstr "�从仆仂 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:591
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611
 msgid "_Buddy List window transparency"
 msgstr "��仂亰�舒�仆仂��� 仂从仆舒 _�仗亳�从舒 �仂弍亠�亠亟仆亳从仂于"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:604
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624
 msgid "Remove Buddy List window transparency on focus"
 msgstr "丕弍亳�舒�� 仗�仂亰�舒�仆仂��� 仂从仆舒 �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于 于 �仂从��亠"
 
@@ -15853,19 +15945,19 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:664
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684
 msgid "Transparency"
 msgstr "��仂亰�舒�仆仂���"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:667
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "�舒��亳��亠仄舒� 仗�仂亰�舒�仆仂��� 亟仍� �仗亳�从舒 �仂弍亠�亠亟仆亳从仂于 亳 弍亠�亠亟."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:669
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:689
 msgid ""
 "This plugin enables variable alpha transparency on conversation windows and "
 "the buddy list.\n"
@@ -15924,7 +16016,7 @@
 "�舒�舒仄亠���, �仗亠�亳�亳�仆�亠 亟仍� Pidgin 亟仍� Windows, �舒从亳亠 从舒从 亰舒从�亠仗仍亠仆亳亠 �仗亳�从舒 "
 "�仂弍亠�亠亟仆亳从仂于."
 
-#: ../pidgin/plugins/xmppconsole.c:666
+#: ../pidgin/plugins/xmppconsole.c:667
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr ""
 
@@ -15934,39 +16026,39 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:842
-#: ../pidgin/plugins/xmppconsole.c:861
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:860
 msgid "XMPP Console"
 msgstr "�仂仆�仂仍� XMPP"
 
-#: ../pidgin/plugins/xmppconsole.c:754
+#: ../pidgin/plugins/xmppconsole.c:753
 msgid "Account: "
 msgstr "丕���仆舒� 亰舒仗亳��: "
 
-#: ../pidgin/plugins/xmppconsole.c:781
+#: ../pidgin/plugins/xmppconsole.c:780
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr ""
 
-#: ../pidgin/plugins/xmppconsole.c:791
+#: ../pidgin/plugins/xmppconsole.c:790
 msgid "Insert an <iq/> stanza."
 msgstr "���舒于亳�� ��舒仆� <iq/>."
 
-#: ../pidgin/plugins/xmppconsole.c:800
+#: ../pidgin/plugins/xmppconsole.c:799
 msgid "Insert a <presence/> stanza."
 msgstr "���舒于亳�� ��舒仆� <presence/>."
 
-#: ../pidgin/plugins/xmppconsole.c:809
+#: ../pidgin/plugins/xmppconsole.c:808
 msgid "Insert a <message/> stanza."
 msgstr "���舒于亳�� ��舒仆� <message/>."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:864
+#: ../pidgin/plugins/xmppconsole.c:863
 msgid "Send and receive raw XMPP stanzas."
 msgstr ""
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:866
+#: ../pidgin/plugins/xmppconsole.c:865
 msgid "This plugin is useful for debbuging XMPP servers or clients."
 msgstr ""
--- a/po/sv.po	Thu Aug 02 04:12:57 2007 +0000
+++ b/po/sv.po	Thu Aug 02 04:16:37 2007 +0000
@@ -1,881 +1,36 @@
-# Gaim Swedish translation
+# Pidgin Swedish translation
 # Copyright (C) 2001, Christian Rose <menthos@menthos.com>
 # Copyright (C) 2003-2004, Tore Lundqvist
 # Copyright (C) 2004-2005, Peter Hjalmarsson
 #
-# This file is distributed under the same license as the Gaim package.
+# This file is distributed under the same license as the Pidgin package.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Gaim\n"
+"Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-20 04:21+0100\n"
-"PO-Revision-Date: 2007-01-20 05:03+0100\n"
+"POT-Creation-Date: 2007-07-24 19:34+0200\n"
+"PO-Revision-Date: 2007-07-17 11:57+0100\n"
 "Last-Translator: Peter Hjalmarsson <xake@telia.com>\n"
 "Language-Team: Swedish <sv@li.org>\n"
 "MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=utf-8\n"
+"Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../gaim.desktop.in.h:1
-msgid "Gaim Internet Messenger"
-msgstr "Gaim"
-
-#: ../gaim.desktop.in.h:2
-msgid "Internet Messenger"
-msgstr "Meddelandeklient"
-
-#: ../gaim.desktop.in.h:3
-msgid "Send instant messages over multiple protocols"
-msgstr "S辰nder snabbmeddelande 旦ver multibla protokoll"
-
-#: ../console/gntaccount.c:119
-#: ../console/gntblist.c:272
-#: ../console/gntblist.c:390
-#: ../console/gntblist.c:403
-#: ../console/gntplugin.c:169
-#: ../console/gntplugin.c:214
-#: ../console/gntstatus.c:291
-#: ../console/gntstatus.c:299
-#: ../libgaim/protocols/jabber/buddy.c:1369
-#: ../libgaim/protocols/jabber/chat.c:679
-#: ../libgaim/protocols/jabber/chat.c:690
-#: ../libgaim/protocols/jabber/jabber.c:1211
-#: ../libgaim/protocols/qq/group_join.c:324
-#: ../libgaim/protocols/silc/ops.c:1451
-msgid "Error"
-msgstr "Fel"
-
-#: ../console/gntaccount.c:119
-msgid "Account was not added"
-msgstr "Kontot lades inte till"
-
-#: ../console/gntaccount.c:120
-msgid "Screenname of an account must be non-empty."
-msgstr "Sk辰rmnamnet f旦r ett konto f奪r inte vara tomt."
-
-#: ../console/gntaccount.c:423
-#: ../gtk/gtkaccount.c:566
-msgid "New mail notifications"
-msgstr "Rapportering av ny e-post"
-
-#: ../console/gntaccount.c:433
-#: ../gtk/gtkaccount.c:495
-msgid "Remember password"
-msgstr "Kom ih奪g l旦senordet"
-
-#: ../console/gntaccount.c:474
-#: ../gtk/gtkaccount.c:1427
-#: ../gtk/gtkblist.c:3789
-msgid "Modify Account"
-msgstr "�ndra konto"
-
-#: ../console/gntaccount.c:474
-msgid "New Account"
-msgstr "Nytt konto"
-
-#: ../console/gntaccount.c:500
-#: ../gtk/gtkaccount.c:407
-#: ../gtk/gtkft.c:695
-msgid "Protocol:"
-msgstr "Protokoll:"
-
-#: ../console/gntaccount.c:508
-#: ../gtk/gtkaccount.c:412
-#: ../gtk/gtkblist.c:5129
-#: ../gtk/plugins/gevolution/new_person_dialog.c:295
-msgid "Screen name:"
-msgstr "Sk辰rmnamn:"
-
-#: ../console/gntaccount.c:521
-#: ../gtk/gtkaccount.c:486
-msgid "Password:"
-msgstr "L旦senord:"
-
-#: ../console/gntaccount.c:531
-#: ../gtk/gtkblist.c:5150
-#: ../gtk/gtkblist.c:5512
-msgid "Alias:"
-msgstr "Alias:"
-
-#. 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:2016
-#: ../console/gntprefs.c:224
-#: ../console/gntstatus.c:139
-#: ../console/gntstatus.c:472
-#: ../console/gntstatus.c:597
-#: ../gtk/gtkaccount.c:1863
-#: ../gtk/gtkaccount.c:2413
-#: ../gtk/gtkblist.c:5568
-#: ../gtk/gtkdialogs.c:682
-#: ../gtk/gtkdialogs.c:819
-#: ../gtk/gtkdialogs.c:910
-#: ../gtk/gtkdialogs.c:929
-#: ../gtk/gtkdialogs.c:951
-#: ../gtk/gtkdialogs.c:971
-#: ../gtk/gtkdialogs.c:1015
-#: ../gtk/gtkdialogs.c:1053
-#: ../gtk/gtkdialogs.c:1107
-#: ../gtk/gtkdialogs.c:1144
-#: ../gtk/gtkdialogs.c:1169
-#: ../gtk/gtkimhtmltoolbar.c:419
-#: ../gtk/gtkplugin.c:296
-#: ../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:296
-#: ../libgaim/account.c:961
-#: ../libgaim/account.c:1149
-#: ../libgaim/account.c:1183
-#: ../libgaim/conversation.c:1164
-#: ../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:1731
-#: ../libgaim/protocols/jabber/buddy.c:1765
-#: ../libgaim/protocols/jabber/chat.c:788
-#: ../libgaim/protocols/jabber/jabber.c:859
-#: ../libgaim/protocols/jabber/jabber.c:1366
-#: ../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: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:6043
-#: ../libgaim/protocols/oscar/oscar.c:6068
-#: ../libgaim/protocols/oscar/oscar.c:6124
-#: ../libgaim/protocols/oscar/oscar.c:6193
-#: ../libgaim/protocols/oscar/peer.c:1018
-#: ../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/sendqueue.c:138
-#: ../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:3399
-#: ../libgaim/protocols/sametime/sametime.c:3484
-#: ../libgaim/protocols/sametime/sametime.c:3654
-#: ../libgaim/protocols/sametime/sametime.c:5395
-#: ../libgaim/protocols/sametime/sametime.c:5484
-#: ../libgaim/protocols/sametime/sametime.c:5608
-#: ../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
-#: ../libgaim/request.h:1344
-#: ../libgaim/request.h:1354
-msgid "Cancel"
-msgstr "Avbryt"
-
-# src/menus.c:280
-#. 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/protocols/jabber/buddy.c:587
-msgid "Save"
-msgstr "Spara"
-
-#: ../console/gntaccount.c:610
-#: ../gtk/gtkaccount.c:1857
-#: ../gtk/gtksavedstatuses.c:293
-#, c-format
-msgid "Are you sure you want to delete %s?"
-msgstr "�r du s辰ker p奪 att du vill ta bort %s?"
-
-#. Close any other opened delete window
-#: ../console/gntaccount.c:614
-msgid "Delete Account"
-msgstr "Ta bort konto"
-
-#: ../console/gntaccount.c:615
-#: ../console/gntaccount.c:681
-#: ../console/gntstatus.c:139
-#: ../console/gntstatus.c:201
-#: ../gtk/gtkaccount.c:1862
-#: ../gtk/gtkpounce.c:1097
-#: ../gtk/gtkrequest.c:273
-#: ../gtk/gtksavedstatuses.c:295
-msgid "Delete"
-msgstr "Ta bort"
-
-#: ../console/gntaccount.c:644
-#: ../console/gntblist.c:1922
-#: ../console/gntui.c:70
-#: ../gtk/gtkaccount.c:2243
-#: ../gtk/gtkdocklet.c:543
-msgid "Accounts"
-msgstr "Konton"
-
-#: ../console/gntaccount.c:650
-msgid "You can enable/disable accounts from the following list."
-msgstr "Du kan aktivera/avaktivera konton fr奪n f旦ljande lista."
-
-#: ../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:2412
-#: ../gtk/gtkblist.c:5567
-#: ../gtk/gtkconv.c:1634
-#: ../gtk/gtkrequest.c:274
-#: ../libgaim/protocols/gg/gg.c:870
-#: ../libgaim/protocols/oscar/oscar.c:2466
-#: ../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:5483
-#: ../libgaim/protocols/silc/chat.c:596
-msgid "Add"
-msgstr "L辰gg till"
-
-#: ../console/gntaccount.c:677
-msgid "Modify"
-msgstr "�ndra"
-
-#: ../console/gntaccount.c:758
-#: ../gtk/gtkaccount.c:2359
-#, c-format
-msgid "%s%s%s%s has made %s his or her buddy%s%s"
-msgstr "%s%s%s%s har gjort %s till sin kompis%s%s"
-
-#: ../console/gntaccount.c:831
-#: ../gtk/gtkaccount.c:2411
-msgid "Add buddy to your list?"
-msgstr "L辰gg till kompisen i din lista?"
-
-#: ../console/gntblist.c:264
-msgid "You must provide a screename for the buddy."
-msgstr "Du m奪ste ange ett skr辰mnamn f旦r kompisen."
-
-#: ../console/gntblist.c:266
-msgid "You must provide a group."
-msgstr "Du m奪ste ange en grupp."
-
-#: ../console/gntblist.c:268
-msgid "You must select an account."
-msgstr "Du m奪ste v辰lja ett konto."
-
-#: ../console/gntblist.c:272
-msgid "Error adding buddy"
-msgstr "Gick inte l辰gga till kompis"
-
-#: ../console/gntblist.c:297
-#: ../gtk/gtkaccount.c:1938
-#: ../gtk/gtksavedstatuses.c:893
-#: ../libgaim/protocols/oscar/oscar.c:2849
-msgid "Screen Name"
-msgstr "Anv辰ndar-ID"
-
-#: ../console/gntblist.c:300
-#: ../console/gntblist.c:372
-#: ../gtk/gtkdialogs.c:928
-#: ../gtk/gtkdialogs.c:950
-#: ../gtk/gtkdialogs.c:970
-#: ../gtk/gtkrequest.c:277
-#: ../libgaim/protocols/msn/msn.c:1360
-#: ../libgaim/protocols/silc/chat.c:587
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:680
-#: ../libgaim/protocols/zephyr/zephyr.c:789
-#: ../libgaim/protocols/zephyr/zephyr.c:1212
-msgid "Alias"
-msgstr "Alias"
-
-#: ../console/gntblist.c:303
-#: ../console/gntblist.c:375
-msgid "Group"
-msgstr "Grupp"
-
-#: ../console/gntblist.c:306
-#: ../console/gntblist.c:363
-#: ../console/gntblist.c:1161
-#: ../console/gntnotify.c:155
-#: ../console/gntstatus.c:563
-#: ../gtk/gtkblist.c:2646
-#: ../gtk/gtknotify.c:420
-#: ../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:5083
-#: ../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 "L辰gg till kompis"
-
-#: ../console/gntblist.c:312
-msgid "Please enter buddy information."
-msgstr "Fel d奪 kompisen skulle l辰ggas till"
-
-#: ../console/gntblist.c:335
-#: ../libgaim/blist.c:1195
-msgid "Chats"
-msgstr "Chattar"
-
-#. Extract their Name and put it in
-#: ../console/gntblist.c:369
-#: ../gtk/gtkplugin.c:589
-#: ../gtk/gtkroomlist.c:614
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:132
-#: ../gtk/plugins/gevolution/assoc-buddy.c:123
-#: ../libgaim/protocols/jabber/jabber.c:790
-#: ../libgaim/protocols/msn/msn.c:1533
-#: ../libgaim/protocols/msn/msn.c:1598
-#: ../libgaim/protocols/msn/msn.c:1625
-#: ../libgaim/protocols/qq/buddy_info.c:44
-msgid "Name"
-msgstr "Namn"
-
-#: ../console/gntblist.c:378
-#: ../console/gntblist.c:786
-#: ../gtk/gtkblist.c:5458
-msgid "Add Chat"
-msgstr "L辰gg till chatt"
-
-#: ../console/gntblist.c:379
-msgid "You can edit more information from the context menu later."
-msgstr "Du kan 辰ndra mer information fr奪n omgivningsmenyn senare."
-
-#: ../console/gntblist.c:390
-#: ../console/gntblist.c:403
-msgid "Error adding group"
-msgstr "Fel d奪 gruppen skulle l辰ggas till"
-
-#: ../console/gntblist.c:391
-msgid "You must give a name for the group to add."
-msgstr "Du m奪ste ange ett namn f旦r gruppen som ska l辰ggas till."
-
-#: ../console/gntblist.c:404
-msgid "A group with the name already exists."
-msgstr "En grupp med det namnet finns redan."
-
-#: ../console/gntblist.c:411
-#: ../console/gntblist.c:788
-#: ../gtk/gtkblist.c:5564
-#: ../libgaim/protocols/sametime/sametime.c:5394
-#: ../libgaim/protocols/sametime/sametime.c:5481
-msgid "Add Group"
-msgstr "L辰gg till grupp"
-
-#: ../console/gntblist.c:411
-msgid "Enter the name of the group"
-msgstr "Ange namnet p奪 gruppen"
-
-#: ../console/gntblist.c:736
-msgid "Edit Chat"
-msgstr "�ndra chatt"
-
-#: ../console/gntblist.c:736
-msgid "Please Update the necessary fields."
-msgstr "Var v辰nlig uppdatera de n旦dv辰ndiga f辰lten."
-
-#: ../console/gntblist.c:737
-#: ../console/gntstatus.c:196
-msgid "Edit"
-msgstr "Redigera"
-
-#: ../console/gntblist.c:751
-msgid "Auto-join"
-msgstr "Anslut automatiskt"
-
-#: ../console/gntblist.c:760
-msgid "Edit Settings"
-msgstr "�ndra inst辰llningar"
-
-#: ../console/gntblist.c:806
-#: ../libgaim/protocols/silc/chat.c:878
-msgid "Get Info"
-msgstr "Info"
-
-#: ../console/gntblist.c:811
-msgid "Add Buddy Pounce"
-msgstr "L辰gg till kompis旦vervakning"
-
-#: ../console/gntblist.c:818
-#: ../gtk/gtkconv.c:1582
-#: ../libgaim/protocols/oscar/oscar.c:633
-msgid "Send File"
-msgstr "Skicka fil"
-
-#: ../console/gntblist.c:822
-msgid "View Log"
-msgstr "Visa logg"
-
-#: ../console/gntblist.c:902
-#, c-format
-msgid "Please enter the new name for %s"
-msgstr "Ange det nya namnet f旦r %s"
-
-#: ../console/gntblist.c:904
-#: ../console/gntblist.c:905
-#: ../console/gntblist.c:1111
-msgid "Rename"
-msgstr "Byt namn"
-
-#: ../console/gntblist.c:904
-msgid "Enter empty string to reset the name."
-msgstr "Ange en tom str辰ng f旦r att nollst辰lla namnet."
-
-#: ../console/gntblist.c:977
-msgid "Removing this contact will also remove all the buddies in the contact"
-msgstr "Tar du bort kontakten tar du ocks奪 bort alla kompisar i kontakten"
-
-#: ../console/gntblist.c:985
-msgid "Removing this group will also remove all the buddies in the group"
-msgstr "Tar du bort gruppen tar du ocks奪 bort alla kompisar i gruppen"
-
-#: ../console/gntblist.c:990
-#, c-format
-msgid "Are you sure you want to remove %s?"
-msgstr "�r du s辰ker p奪 att du vill ta bort %s?"
-
-#. XXX: anything to do with the returned ui-handle?
-#: ../console/gntblist.c:993
-msgid "Confirm Remove"
-msgstr "Bekr辰fta borttagning"
-
-#: ../console/gntblist.c:996
-#: ../console/gntblist.c:1113
-#: ../gtk/gtkblist.c:1041
-#: ../gtk/gtkconv.c:1631
-#: ../gtk/gtkrequest.c:275
-#: ../gtk/gtkstatusbox.c:248
-msgid "Remove"
-msgstr "Ta bort"
-
-#. Buddy List
-#: ../console/gntblist.c:1088
-#: ../console/gntblist.c:2083
-#: ../console/gntprefs.c:219
-#: ../console/gntui.c:71
-#: ../gtk/gtkblist.c:4005
-#: ../gtk/plugins/win32/winprefs/winprefs.c:327
-msgid "Buddy List"
-msgstr "Kompislista"
-
-#: ../console/gntblist.c:1118
-msgid "Place tagged"
-msgstr "Platsen 辰r markerad"
-
-#: ../console/gntblist.c:1123
-msgid "Toggle Tag"
-msgstr "V辰lj tagg"
-
-#. General
-#: ../console/gntblist.c:1156
-#: ../gtk/gtkblist.c:2670
-#: ../libgaim/protocols/gg/gg.c:627
-#: ../libgaim/protocols/gg/gg.c:1035
-#: ../libgaim/protocols/gg/gg.c:1110
-#: ../libgaim/protocols/gg/gg.c:2203
-#: ../libgaim/protocols/jabber/buddy.c:274
-#: ../libgaim/protocols/jabber/buddy.c:806
-#: ../libgaim/protocols/jabber/buddy.c:1532
-#: ../libgaim/protocols/jabber/buddy.c:1714
-#: ../libgaim/protocols/jabber/jabber.c:800
-#: ../libgaim/protocols/msn/msn.c:1368
-#: ../libgaim/protocols/msn/msn.c:1536
-#: ../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 "Smeknamn"
-
-#. Idle stuff
-#: ../console/gntblist.c:1176
-#: ../gtk/gtkblist.c:2690
-#: ../gtk/gtkblist.c:3243
-#: ../gtk/gtkprefs.c:1806
-#: ../libgaim/protocols/bonjour/bonjour.c:333
-#: ../libgaim/protocols/jabber/buddy.c:633
-#: ../libgaim/protocols/jabber/buddy.c:671
-#: ../libgaim/protocols/msn/msn.c:546
-#: ../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 "Inaktiv"
-
-#: ../console/gntblist.c:1265
-#, c-format
-msgid ""
-"Online: %d\n"
-"Total: %d"
-msgstr ""
-"Ansluten: %d\n"
-"Totalt: %d"
-
-#: ../console/gntblist.c:1274
-#, c-format
-msgid "Account: %s (%s)"
-msgstr "Konto: %s (%s)"
-
-#: ../console/gntblist.c:1286
-#, c-format
-msgid ""
-"\n"
-"Last Seen: %s ago"
-msgstr ""
-"\n"
-"S奪gs senast: f旦r %s sedan"
-
-#: ../console/gntblist.c:1535
-#: ../gtk/gtkdocklet.c:491
-#: ../gtk/gtkstatusbox.c:1000
-msgid "New..."
-msgstr "Nytt..."
-
-#: ../console/gntblist.c:1542
-#: ../gtk/gtkdocklet.c:492
-#: ../gtk/gtkstatusbox.c:1001
-msgid "Saved..."
-msgstr "Sparad..."
-
-#: ../console/gntblist.c:1890
-#: ../console/gntplugin.c:231
-#: ../console/gntui.c:73
-#: ../gtk/gtkdocklet.c:544
-#: ../gtk/gtkplugin.c:538
-msgid "Plugins"
-msgstr "Insticksmoduler"
-
-#: ../console/gntblist.c:1997
-#: ../gtk/gtkdialogs.c:663
-#: ../gtk/gtkdialogs.c:800
-#: ../gtk/gtkdialogs.c:880
-msgid "_Name"
-msgstr "_Namn"
-
-#: ../console/gntblist.c:2002
-#: ../gtk/gtkdialogs.c:668
-#: ../gtk/gtkdialogs.c:805
-#: ../gtk/gtkdialogs.c:885
-msgid "_Account"
-msgstr "_Konto"
-
-#: ../console/gntblist.c:2010
-#: ../gtk/gtkdialogs.c:676
-msgid "New Instant Message"
-msgstr "Nytt snabbmeddelanden"
-
-#: ../console/gntblist.c:2012
-#: ../gtk/gtkdialogs.c:678
-msgid "Please enter the screen name or alias of the person you would like to IM."
-msgstr "Ange anv辰ndar-ID eller alias f旦r den person som du vill skicka snabbmeddelande till."
-
-#. *
-#. * A wrapper for gaim_request_action() that uses @c OK and @c Cancel buttons.
-#.
-#: ../console/gntblist.c:2015
-#: ../console/gntnotify.c:79
-#: ../gtk/gtkblist.c:3788
-#: ../gtk/gtkdialogs.c:681
-#: ../gtk/gtkdialogs.c:818
-#: ../gtk/gtkdialogs.c:909
-#: ../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:1365
-#: ../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:1431
-#: ../libgaim/protocols/oscar/oscar.c:2233
-#: ../libgaim/protocols/oscar/oscar.c:2279
-#: ../libgaim/protocols/oscar/oscar.c:5837
-#: ../libgaim/protocols/oscar/oscar.c:6042
-#: ../libgaim/protocols/oscar/oscar.c:6067
-#: ../libgaim/protocols/oscar/oscar.c:6123
-#: ../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
-#: ../libgaim/request.h:1344
-msgid "OK"
-msgstr "OK"
-
-# src/menus.c:311
-#. Create the "Options" frame.
-#: ../console/gntblist.c:2034
-#: ../gtk/gtkpounce.c:776
-msgid "Options"
-msgstr "Alternativ"
-
-#: ../console/gntblist.c:2040
-msgid "Send IM..."
-msgstr "Skicka IM..."
-
-#: ../console/gntblist.c:2044
-msgid "Toggle offline buddies"
-msgstr "V辰lj fr奪nkopplade kompisar"
-
-#: ../console/gntblist.c:2048
-msgid "Sort by status"
-msgstr "Sortera efter status"
-
-#: ../console/gntblist.c:2052
-msgid "Sort alphabetically"
-msgstr "Sortera alfabetiskt"
-
-#: ../console/gntblist.c:2056
-msgid "Sort by log size"
-msgstr "Sortera efter loggstorlek"
-
-#: ../console/gntconn.c:36
-#, c-format
-msgid "%s (%s)"
-msgstr "%s (%s)"
-
-#: ../console/gntconn.c:39
-#, c-format
-msgid "%s disconnected."
-msgstr "%s kopplades ifr奪n."
-
-#: ../console/gntconn.c:40
-#, c-format
-msgid ""
-"%s was disconnected due to the following error:\n"
-"%s"
-msgstr ""
-"%s kopplades ifr奪n av f旦ljande fel:\n"
-"%s"
-
-#: ../console/gntconn.c:43
-#: ../gtk/gtkblist.c:3786
-#: ../libgaim/account.c:988
-#: ../libgaim/connection.c:107
-msgid "Connection Error"
-msgstr "Anslutningsfel"
-
-#: ../console/gntconv.c:97
-msgid "No such command."
-msgstr "Finns inget s奪dant kommando."
-
-#: ../console/gntconv.c:101
-#: ../gtk/gtkconv.c:493
-msgid "Syntax Error:  You typed the wrong number of arguments to that command."
-msgstr "Syntaxfel: Du skrev fel antal argument till det kommandot."
-
-#: ../console/gntconv.c:106
-#: ../gtk/gtkconv.c:498
-msgid "Your command failed for an unknown reason."
-msgstr "Ditt kommando misslyckades av ok辰nd anledning."
-
-#: ../console/gntconv.c:111
-#: ../gtk/gtkconv.c:504
-msgid "That command only works in chats, not IMs."
-msgstr "Det kommandot fungerar bara i chattar, inte i snabbmeddelanden."
-
-#: ../console/gntconv.c:114
-#: ../gtk/gtkconv.c:507
-msgid "That command only works in IMs, not chats."
-msgstr "Det kommandot fungerar bara i snabbmeddelanden, inte chattar."
-
-#: ../console/gntconv.c:118
-#: ../gtk/gtkconv.c:511
-msgid "That command doesn't work on this protocol."
-msgstr "Det kommandot funkar inte under detta protokoll."
-
-#: ../console/gntconv.c:125
-msgid "Commands are not supported yet. Message was NOT sent."
-msgstr "Finns inget st旦d f旦r kommandon 辰n. Meddelandet s辰ndes INTE."
-
-#: ../console/gntconv.c:227
-#, c-format
-msgid "%s (%s -- %s)"
-msgstr "%s (%s -- %s)"
-
-#: ../console/gntconv.c:250
-#, c-format
-msgid "%s [%s]"
-msgstr "%s [%s]"
-
-#: ../console/gntconv.c:255
-#: ../console/gntconv.c:427
-#, c-format
-msgid ""
-"\n"
-"%s is typing..."
-msgstr ""
-"\n"
-"%s skriver..."
-
-#: ../console/gntconv.c:394
-msgid "<AUTO-REPLY> "
-msgstr "<AUTO-SVAR>"
-
-#. Print the list of users in the room
-#: ../console/gntconv.c:496
-msgid "List of users:\n"
-msgstr "Lista 旦ver anv辰ndare:\n"
-
-#: ../console/gntconv.c:620
-#: ../gtk/gtkconv.c:386
-msgid "Supported debug options are:  version"
-msgstr "De fels旦kningsalternativ som st旦ds 辰r: version"
-
-#: ../console/gntconv.c:655
-#: ../gtk/gtkconv.c:422
-msgid "No such command (in this context)."
-msgstr "Det finns inget s奪dant kommando (i denna kontext)."
-
-#: ../console/gntconv.c:658
-#: ../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 ""
-"Anv辰nde \"/help &lt;kommando&gt;\" f旦r hj辰lp om ett specifikt kommando.\n"
-"F旦ljande kommandon 辰r tillg辰ngliga i sammanhanget:\n"
-
-#: ../console/gntconv.c:697
-#: ../gtk/gtkconv.c:6788
-msgid "say &lt;message&gt;:  Send a message normally as if you weren't using a command."
-msgstr "say &lt;meddelande&gt;:  Skickar ett meddelande normalt som om du inte anv辰nde ett kommando."
-
-#: ../console/gntconv.c:700
-#: ../gtk/gtkconv.c:6791
-msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
-msgstr "me &lt;奪tg辰rd&gt;:  Skickar en 奪tg辰rd i IRC-stil till en kompis eller chatt."
-
-#: ../console/gntconv.c:703
-#: ../gtk/gtkconv.c:6794
-msgid "debug &lt;option&gt;:  Send various debug information to the current conversation."
-msgstr "debug &lt;alternativ&gt;:  Skickar all m旦jlig fels旦kningsinformation till den nuvarande konversationen."
-
-#: ../console/gntconv.c:706
-#: ../gtk/gtkconv.c:6797
-msgid "clear: Clears the conversation scrollback."
-msgstr "clear: Rensar konversationens tillbakablick."
-
-#: ../console/gntconv.c:709
-#: ../gtk/gtkconv.c:6800
-msgid "help &lt;command&gt;:  Help on a specific command."
-msgstr "help &lt;kommando&gt;:  Hj辰lp f旦r ett specifikt kommando."
-
-#: ../console/gntconv.c:714
-msgid "plugins: Show the plugins window."
-msgstr "plugins: Visa f旦nstret med insticksmoduler."
-
-#: ../console/gntconv.c:717
-msgid "buddylist: Show the buddylist."
-msgstr "buddylist: Visa kompislistan."
-
-#: ../console/gntconv.c:720
-msgid "accounts: Show the accounts window."
-msgstr "accounts: Visa kontohanteraren."
-
-#: ../console/gntconv.c:723
-msgid "debugwin: Show the debug window."
-msgstr "debugwin: Visa fels旦kningsf旦nstret."
-
-#: ../console/gntconv.c:726
-msgid "prefs: Show the preference window."
-msgstr "prefs: Visa inst辰llningsf旦nstret."
-
-#: ../console/gntconv.c:729
-msgid "statuses: Show the savedstatuses window."
-msgstr "statuses: Visar statushanteraren."
-
-#: ../console/gntdebug.c:214
-#: ../console/gntui.c:72
-#: ../gtk/gtkdebug.c:708
-msgid "Debug Window"
-msgstr "Fels旦kningsf旦nster"
-
-#. 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 "Rensa"
-
-#: ../console/gntdebug.c:240
-#: ../gtk/gtkdebug.c:776
-msgid "Pause"
-msgstr "Pausa"
-
-#: ../console/gntdebug.c:245
-#: ../gtk/gtkdebug.c:783
-#: ../gtk/gtkdebug.c:784
-msgid "Timestamps"
-msgstr "Tidsst辰mplar"
-
-#: ../console/gntgaim.c:227
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../finch/finch.c:70 ../finch/finch.c:298 ../finch/finch.c:327
+#: ../finch/finch.c:404
+msgid "Finch"
+msgstr "Finch"
+
+#: ../finch/finch.c:204
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. F旦rs旦k med '%s -h' f旦r mer information.\n"
 
-#: ../console/gntgaim.c:229
+#: ../finch/finch.c:206
 #, c-format
 msgid ""
 "%s\n"
@@ -896,90 +51,995 @@
 "  -n, --nologin       logga inte in automatiskt\n"
 "  -v, --version       visa den nuvarande versionen och avsluta\n"
 
-#: ../console/gntnotify.c:146
+#: ../finch/finch.c:325 ../pidgin/gtkmain.c:708
+#, c-format
+msgid ""
+"%s encountered errors migrating your settings from %s to %s. Please "
+"investigate and complete the migration by hand. Please report this error at "
+"http://developer.pidgin.im"
+msgstr ""
+"%s st旦tte p奪 problem d奪 dina inst辰llningar flyttades fr奪n %s till %s. Du kan "
+"unders旦ka och flytta inst辰llningarna f旦r han och rapportera felet p奪 sidan "
+"http://developer.pidgin.im"
+
+#: ../finch/gntaccount.c:123 ../finch/gntaccount.c:478 ../finch/gntblist.c:299
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445 ../finch/gntplugin.c:185
+#: ../finch/gntplugin.c:233 ../finch/gntstatus.c:300 ../finch/gntstatus.c:308
+#: ../libpurple/protocols/jabber/buddy.c:1464
+#: ../libpurple/protocols/jabber/chat.c:677
+#: ../libpurple/protocols/jabber/chat.c:688
+#: ../libpurple/protocols/jabber/jabber.c:1227
+#: ../libpurple/protocols/qq/group_join.c:328
+#: ../libpurple/protocols/silc/ops.c:57 ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
+msgid "Error"
+msgstr "Fel"
+
+#: ../finch/gntaccount.c:123
+msgid "Account was not added"
+msgstr "Kontot lades inte till"
+
+#: ../finch/gntaccount.c:124
+msgid "Screenname of an account must be non-empty."
+msgstr "Sk辰rmnamnet f旦r ett konto f奪r inte vara tomt."
+
+#: ../finch/gntaccount.c:431
+msgid "New mail notifications"
+msgstr "Rapportering av ny e-post"
+
+#: ../finch/gntaccount.c:441
+msgid "Remember password"
+msgstr "Kom ih奪g l旦senordet"
+
+#: ../finch/gntaccount.c:479
+msgid "There's no protocol plugins installed."
+msgstr "Det finns inga moduler f旦r protokoll installerade."
+
+#: ../finch/gntaccount.c:480
+msgid "(You probably forgot to 'make install'.)"
+msgstr "(Du gl旦mde antagligen att k旦ra 'make install'.)"
+
+#: ../finch/gntaccount.c:490 ../pidgin/gtkaccount.c:1473
+#: ../pidgin/gtkblist.c:4014
+msgid "Modify Account"
+msgstr "�ndra konto"
+
+#: ../finch/gntaccount.c:490
+msgid "New Account"
+msgstr "Nytt konto"
+
+#: ../finch/gntaccount.c:515 ../pidgin/gtkft.c:695
+msgid "Protocol:"
+msgstr "Protokoll:"
+
+#: ../finch/gntaccount.c:523
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:291
+msgid "Screen name:"
+msgstr "Sk辰rmnamn:"
+
+#: ../finch/gntaccount.c:536
+msgid "Password:"
+msgstr "L旦senord:"
+
+#: ../finch/gntaccount.c:546
+msgid "Alias:"
+msgstr "Alias:"
+
+#. Cancel button
+#. Cancel
+#: ../finch/gntaccount.c:569 ../finch/gntaccount.c:632
+#: ../finch/gntaccount.c:878 ../finch/gntblist.c:343 ../finch/gntblist.c:420
+#: ../finch/gntblist.c:455 ../finch/gntblist.c:802 ../finch/gntblist.c:1004
+#: ../finch/gntblist.c:1100 ../finch/gntblist.c:2207 ../finch/gntplugin.c:378
+#: ../finch/gntpounce.c:458 ../finch/gntpounce.c:656 ../finch/gntprefs.c:264
+#: ../finch/gntstatus.c:144 ../finch/gntstatus.c:481 ../finch/gntstatus.c:606
+#: ../libpurple/account.c:984 ../libpurple/account.c:1234
+#: ../libpurple/account.c:1269 ../libpurple/conversation.c:1173
+#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:502
+#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:798
+#: ../libpurple/protocols/gg/gg.c:879
+#: ../libpurple/protocols/jabber/buddy.c:588
+#: ../libpurple/protocols/jabber/buddy.c:1826
+#: ../libpurple/protocols/jabber/buddy.c:1862
+#: ../libpurple/protocols/jabber/chat.c:786
+#: ../libpurple/protocols/jabber/jabber.c:882
+#: ../libpurple/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/si.c:868
+#: ../libpurple/protocols/jabber/xdata.c:337
+#: ../libpurple/protocols/msn/msn.c:259 ../libpurple/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:293 ../libpurple/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:331
+#: ../libpurple/protocols/oscar/oscar.c:6073
+#: ../libpurple/protocols/oscar/peer.c:1023
+#: ../libpurple/protocols/qq/buddy_info.c:484
+#: ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/protocols/qq/buddy_opt.c:409
+#: ../libpurple/protocols/qq/group.c:124
+#: ../libpurple/protocols/qq/group_join.c:140
+#: ../libpurple/protocols/qq/group_join.c:365
+#: ../libpurple/protocols/qq/group_opt.c:144
+#: ../libpurple/protocols/qq/group_opt.c:399
+#: ../libpurple/protocols/qq/sys_msg.c:115
+#: ../libpurple/protocols/qq/sys_msg.c:174
+#: ../libpurple/protocols/qq/sys_msg.c:269
+#: ../libpurple/protocols/sametime/sametime.c:3389
+#: ../libpurple/protocols/sametime/sametime.c:3475
+#: ../libpurple/protocols/sametime/sametime.c:3646
+#: ../libpurple/protocols/sametime/sametime.c:5398
+#: ../libpurple/protocols/sametime/sametime.c:5488
+#: ../libpurple/protocols/sametime/sametime.c:5613
+#: ../libpurple/protocols/silc/buddy.c:455
+#: ../libpurple/protocols/silc/buddy.c:1076
+#: ../libpurple/protocols/silc/buddy.c:1191
+#: ../libpurple/protocols/silc/chat.c:616
+#: ../libpurple/protocols/silc/chat.c:746
+#: ../libpurple/protocols/silc/ops.c:1816
+#: ../libpurple/protocols/silc/silc.c:823
+#: ../libpurple/protocols/silc/silc.c:1031
+#: ../libpurple/protocols/silc10/buddy.c:468
+#: ../libpurple/protocols/silc10/buddy.c:1084
+#: ../libpurple/protocols/silc10/buddy.c:1189
+#: ../libpurple/protocols/silc10/chat.c:600
+#: ../libpurple/protocols/silc10/chat.c:730
+#: ../libpurple/protocols/silc10/ops.c:1904
+#: ../libpurple/protocols/silc10/silc.c:736
+#: ../libpurple/protocols/silc10/silc.c:942
+#: ../libpurple/protocols/yahoo/yahoo.c:989
+#: ../libpurple/protocols/yahoo/yahoo.c:3248
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkaccount.c:1912
+#: ../pidgin/gtkaccount.c:2506 ../pidgin/gtkblist.c:5915
+#: ../pidgin/gtkdialogs.c:727 ../pidgin/gtkdialogs.c:865
+#: ../pidgin/gtkdialogs.c:957 ../pidgin/gtkdialogs.c:977
+#: ../pidgin/gtkdialogs.c:1001 ../pidgin/gtkdialogs.c:1023
+#: ../pidgin/gtkdialogs.c:1071 ../pidgin/gtkdialogs.c:1112
+#: ../pidgin/gtkdialogs.c:1168 ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1234 ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtklog.c:327 ../pidgin/gtkplugin.c:288 ../pidgin/gtkpounce.c:1115
+#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:603 ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkrequest.c:270 ../pidgin/gtksavedstatuses.c:344
+#: ../pidgin/gtkstatusbox.c:1582
+msgid "Cancel"
+msgstr "Avbryt"
+
+# src/menus.c:280
+#. Save button
+#. Save
+#: ../finch/gntaccount.c:573 ../finch/gntplugin.c:378 ../finch/gntpounce.c:464
+#: ../finch/gntprefs.c:264 ../finch/gntstatus.c:484 ../finch/gntstatus.c:594
+#: ../libpurple/account.c:1268 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:587 ../pidgin/gtkdebug.c:748
+#: ../pidgin/gtkrequest.c:276
+msgid "Save"
+msgstr "Spara"
+
+#: ../finch/gntaccount.c:626 ../pidgin/gtkaccount.c:1904
+#: ../pidgin/gtksavedstatuses.c:332 ../pidgin/gtkstatusbox.c:1576
+#, c-format
+msgid "Are you sure you want to delete %s?"
+msgstr "�r du s辰ker p奪 att du vill ta bort %s?"
+
+#: ../finch/gntaccount.c:629
+msgid "Delete Account"
+msgstr "Ta bort konto"
+
+#. Delete button
+#: ../finch/gntaccount.c:631 ../finch/gntaccount.c:701
+#: ../finch/gntpounce.c:655 ../finch/gntpounce.c:718 ../finch/gntstatus.c:143
+#: ../finch/gntstatus.c:209 ../pidgin/gtkaccount.c:1911 ../pidgin/gtklog.c:326
+#: ../pidgin/gtkpounce.c:1114 ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtksavedstatuses.c:343 ../pidgin/gtkstatusbox.c:1581
+msgid "Delete"
+msgstr "Ta bort"
+
+#: ../finch/gntaccount.c:663 ../finch/gntblist.c:2113 ../finch/gntui.c:77
+#: ../pidgin/gtkaccount.c:2329 ../pidgin/gtkdocklet.c:522
+msgid "Accounts"
+msgstr "Konton"
+
+#: ../finch/gntaccount.c:669
+msgid "You can enable/disable accounts from the following list."
+msgstr "Du kan aktivera/avaktivera konton fr奪n f旦ljande lista."
+
+#. Add button
+#: ../finch/gntaccount.c:692 ../finch/gntaccount.c:877 ../finch/gntblist.c:342
+#: ../finch/gntblist.c:420 ../finch/gntblist.c:455 ../finch/gntnotify.c:379
+#: ../finch/gntpounce.c:702 ../finch/gntstatus.c:198
+#: ../libpurple/protocols/gg/gg.c:878 ../libpurple/protocols/qq/sys_msg.c:116
+#: ../libpurple/protocols/qq/sys_msg.c:175
+#: ../libpurple/protocols/qq/sys_msg.c:270
+#: ../libpurple/protocols/sametime/sametime.c:5487
+#: ../libpurple/protocols/silc/chat.c:615
+#: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2505
+#: ../pidgin/gtkblist.c:5914 ../pidgin/gtkconv.c:1652
+#: ../pidgin/gtkrequest.c:274
+msgid "Add"
+msgstr "L辰gg till"
+
+#. Modify button
+#: ../finch/gntaccount.c:697 ../finch/gntpounce.c:710
+msgid "Modify"
+msgstr "�ndra"
+
+#: ../finch/gntaccount.c:800 ../pidgin/gtkaccount.c:2452
+#, c-format
+msgid "%s%s%s%s has made %s his or her buddy%s%s"
+msgstr "%s%s%s%s har gjort %s till sin kompis%s%s"
+
+#: ../finch/gntaccount.c:873 ../pidgin/gtkaccount.c:2504
+msgid "Add buddy to your list?"
+msgstr "L辰gg till kompisen i din lista?"
+
+#: ../finch/gntaccount.c:927 ../pidgin/gtkaccount.c:2556
+#, c-format
+msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
+msgstr "%s%s%s%s vill l辰gga till %s i sin kompislista%s%s"
+
+#: ../finch/gntaccount.c:952 ../finch/gntaccount.c:955
+#: ../finch/gntaccount.c:982 ../pidgin/gtkaccount.c:2579
+#: ../pidgin/gtkaccount.c:2585
+msgid "Authorize buddy?"
+msgstr "Auktorisera kompis?"
+
+#: ../finch/gntaccount.c:959 ../finch/gntaccount.c:986
+#: ../pidgin/gtkaccount.c:2580 ../pidgin/gtkaccount.c:2586
+msgid "Authorize"
+msgstr "Auktorisera"
+
+#: ../finch/gntaccount.c:960 ../finch/gntaccount.c:987
+#: ../pidgin/gtkaccount.c:2581 ../pidgin/gtkaccount.c:2587
+msgid "Deny"
+msgstr "Neka"
+
+#: ../finch/gntblist.c:288
+msgid "You must provide a screename for the buddy."
+msgstr "Du m奪ste ange ett skr辰mnamn f旦r kompisen."
+
+#: ../finch/gntblist.c:290
+msgid "You must provide a group."
+msgstr "Du m奪ste ange en grupp."
+
+#: ../finch/gntblist.c:292
+msgid "You must select an account."
+msgstr "Du m奪ste v辰lja ett konto."
+
+#: ../finch/gntblist.c:294
+msgid "The selected account is not online."
+msgstr "Det valda kontot 辰r inte anslutet."
+
+#: ../finch/gntblist.c:299
+msgid "Error adding buddy"
+msgstr "Gick inte l辰gga till kompis"
+
+#: ../finch/gntblist.c:324 ../libpurple/protocols/oscar/oscar.c:2860
+#: ../pidgin/gtkaccount.c:1985 ../pidgin/gtksavedstatuses.c:979
+msgid "Screen Name"
+msgstr "Anv辰ndar-ID"
+
+#: ../finch/gntblist.c:327 ../finch/gntblist.c:409 ../finch/gntblist.c:1249
+#: ../libpurple/protocols/msn/msn.c:1364
+#: ../libpurple/protocols/silc/chat.c:606
+#: ../libpurple/protocols/silc10/chat.c:590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:704
+#: ../libpurple/protocols/zephyr/zephyr.c:788
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:976
+#: ../pidgin/gtkdialogs.c:1000 ../pidgin/gtkdialogs.c:1022
+#: ../pidgin/gtkrequest.c:277
+msgid "Alias"
+msgstr "Alias"
+
+#: ../finch/gntblist.c:330 ../finch/gntblist.c:412
+msgid "Group"
+msgstr "Grupp"
+
+#: ../finch/gntblist.c:334 ../finch/gntblist.c:400 ../finch/gntblist.c:1301
+#: ../finch/gntnotify.c:173 ../finch/gntstatus.c:572
+#: ../libpurple/plugins/idle.c:153 ../libpurple/plugins/idle.c:190
+#: ../pidgin/gtkblist.c:2974 ../pidgin/gtknotify.c:482
+#: ../pidgin/gtkpounce.c:1282 ../pidgin/plugins/gevolution/gevolution.c:445
+msgid "Account"
+msgstr "Konto"
+
+#: ../finch/gntblist.c:340 ../finch/gntblist.c:851
+#: ../libpurple/protocols/silc/buddy.c:725
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/buddy.c:1072
+#: ../libpurple/protocols/silc/buddy.c:1182
+#: ../libpurple/protocols/silc10/buddy.c:737
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/buddy.c:1080
+#: ../libpurple/protocols/silc10/buddy.c:1180
+#: ../libpurple/protocols/yahoo/yahoo.c:3161 ../pidgin/gtkblist.c:5420
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
+msgid "Add Buddy"
+msgstr "L辰gg till kompis"
+
+#: ../finch/gntblist.c:340
+msgid "Please enter buddy information."
+msgstr "Fel d奪 kompisen skulle l辰ggas till"
+
+#: ../finch/gntblist.c:369 ../libpurple/blist.c:1190
+msgid "Chats"
+msgstr "Chattar"
+
+#. Extract their Name and put it in
+#: ../finch/gntblist.c:406 ../libpurple/protocols/jabber/jabber.c:813
+#: ../libpurple/protocols/msn/msn.c:1553 ../libpurple/protocols/msn/msn.c:1618
+#: ../libpurple/protocols/msn/msn.c:1645
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:581
+#: ../pidgin/gtkroomlist.c:617
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
+msgid "Name"
+msgstr "Namn"
+
+#: ../finch/gntblist.c:415 ../finch/gntblist.c:818
+msgid "Auto-join"
+msgstr "Anslut automatiskt"
+
+#: ../finch/gntblist.c:418 ../finch/gntblist.c:853 ../pidgin/gtkblist.c:5800
+msgid "Add Chat"
+msgstr "L辰gg till chatt"
+
+#: ../finch/gntblist.c:419
+msgid "You can edit more information from the context menu later."
+msgstr "Du kan 辰ndra mer information fr奪n omgivningsmenyn senare."
+
+#: ../finch/gntblist.c:432 ../finch/gntblist.c:445
+msgid "Error adding group"
+msgstr "Fel d奪 gruppen skulle l辰ggas till"
+
+#: ../finch/gntblist.c:433
+msgid "You must give a name for the group to add."
+msgstr "Du m奪ste ange ett namn f旦r gruppen som ska l辰ggas till."
+
+#: ../finch/gntblist.c:446
+msgid "A group with the name already exists."
+msgstr "En grupp med det namnet finns redan."
+
+#: ../finch/gntblist.c:453 ../finch/gntblist.c:855
+#: ../libpurple/protocols/sametime/sametime.c:5397
+#: ../libpurple/protocols/sametime/sametime.c:5485 ../pidgin/gtkblist.c:5911
+msgid "Add Group"
+msgstr "L辰gg till grupp"
+
+#: ../finch/gntblist.c:453
+msgid "Enter the name of the group"
+msgstr "Ange namnet p奪 gruppen"
+
+#: ../finch/gntblist.c:801
+msgid "Edit Chat"
+msgstr "�ndra chatt"
+
+#: ../finch/gntblist.c:801
+msgid "Please Update the necessary fields."
+msgstr "Var v辰nlig uppdatera de n旦dv辰ndiga f辰lten."
+
+#: ../finch/gntblist.c:802 ../finch/gntstatus.c:204
+msgid "Edit"
+msgstr "Redigera"
+
+#: ../finch/gntblist.c:827
+msgid "Edit Settings"
+msgstr "�ndra inst辰llningar"
+
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:926
+msgid "Information"
+msgstr "Information"
+
+#: ../finch/gntblist.c:863 ../pidgin/gtkutils.c:926
+msgid "Retrieving..."
+msgstr "H辰mtar..."
+
+#: ../finch/gntblist.c:903 ../finch/gntconv.c:407
+#: ../libpurple/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc10/chat.c:883
+msgid "Get Info"
+msgstr "H辰mta info"
+
+#: ../finch/gntblist.c:907
+msgid "Add Buddy Pounce"
+msgstr "L辰gg till kompis旦vervakning"
+
+#. if (q_bud && is_online(q_bud->status)) {
+#: ../finch/gntblist.c:914 ../finch/gntconv.c:419
+#: ../libpurple/protocols/jabber/si.c:868
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:585
+#: ../pidgin/gtkconv.c:1600
+msgid "Send File"
+msgstr "Skicka fil"
+
+#: ../finch/gntblist.c:918
+msgid "View Log"
+msgstr "Visa logg"
+
+#: ../finch/gntblist.c:999
+#, c-format
+msgid "Please enter the new name for %s"
+msgstr "Ange det nya namnet f旦r %s"
+
+#: ../finch/gntblist.c:1001 ../finch/gntblist.c:1249
+msgid "Rename"
+msgstr "Byt namn"
+
+#: ../finch/gntblist.c:1001
+msgid "Set Alias"
+msgstr "Ange alias"
+
+#: ../finch/gntblist.c:1002
+msgid "Enter empty string to reset the name."
+msgstr "Ange en tom str辰ng f旦r att nollst辰lla namnet."
+
+#: ../finch/gntblist.c:1078
+msgid "Removing this contact will also remove all the buddies in the contact"
+msgstr "Tar du bort kontakten tar du ocks奪 bort alla kompisar i kontakten"
+
+#: ../finch/gntblist.c:1086
+msgid "Removing this group will also remove all the buddies in the group"
+msgstr "Tar du bort gruppen tar du ocks奪 bort alla kompisar i gruppen"
+
+#: ../finch/gntblist.c:1091
+#, c-format
+msgid "Are you sure you want to remove %s?"
+msgstr "�r du s辰ker p奪 att du vill ta bort %s?"
+
+#. XXX: anything to do with the returned ui-handle?
+#: ../finch/gntblist.c:1094
+msgid "Confirm Remove"
+msgstr "Bekr辰fta borttagning"
+
+#: ../finch/gntblist.c:1099 ../finch/gntblist.c:1251 ../finch/gntft.c:224
+#: ../pidgin/gtkconv.c:1649 ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkstatusbox.c:263
+msgid "Remove"
+msgstr "Ta bort"
+
+#. Buddy List
+#: ../finch/gntblist.c:1225 ../finch/gntblist.c:2292 ../finch/gntprefs.c:257
+#: ../finch/gntui.c:78 ../pidgin/gtkblist.c:4256
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:330
+msgid "Buddy List"
+msgstr "Kompislista"
+
+#: ../finch/gntblist.c:1256
+msgid "Place tagged"
+msgstr "Platsen 辰r markerad"
+
+#: ../finch/gntblist.c:1261
+msgid "Toggle Tag"
+msgstr "V辰lj tagg"
+
+#. General
+#: ../finch/gntblist.c:1296 ../libpurple/protocols/gg/gg.c:632
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1118
+#: ../libpurple/protocols/gg/gg.c:2202
+#: ../libpurple/protocols/jabber/buddy.c:274
+#: ../libpurple/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:1627
+#: ../libpurple/protocols/jabber/buddy.c:1809
+#: ../libpurple/protocols/jabber/jabber.c:823
+#: ../libpurple/protocols/msn/msn.c:1372 ../libpurple/protocols/msn/msn.c:1556
+#: ../libpurple/protocols/qq/buddy_info.c:43
+#: ../libpurple/protocols/silc/buddy.c:1535
+#: ../libpurple/protocols/silc/ops.c:1002
+#: ../libpurple/protocols/silc/ops.c:1186
+#: ../libpurple/protocols/silc/ops.c:1322
+#: ../libpurple/protocols/silc10/buddy.c:1535
+#: ../libpurple/protocols/silc10/ops.c:1036
+#: ../libpurple/protocols/silc10/ops.c:1179
+#: ../libpurple/protocols/silc10/ops.c:1328
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:2998
+msgid "Nickname"
+msgstr "Smeknamn"
+
+#. Idle stuff
+#: ../finch/gntblist.c:1316 ../finch/gntprefs.c:260
+#: ../libpurple/protocols/bonjour/bonjour.c:314
+#: ../libpurple/protocols/jabber/buddy.c:647
+#: ../libpurple/protocols/jabber/buddy.c:687
+#: ../libpurple/protocols/msn/msn.c:516 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2884
+#: ../libpurple/protocols/yahoo/yahoo.c:2915
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3026
+#: ../pidgin/gtkblist.c:3435 ../pidgin/gtkprefs.c:1918
+msgid "Idle"
+msgstr "Inaktiv"
+
+#: ../finch/gntblist.c:1329
+msgid "On Mobile"
+msgstr "Mobil"
+
+#: ../finch/gntblist.c:1409
+#, c-format
+msgid ""
+"Online: %d\n"
+"Total: %d"
+msgstr ""
+"Ansluten: %d\n"
+"Totalt: %d"
+
+#: ../finch/gntblist.c:1418
+#, c-format
+msgid "Account: %s (%s)"
+msgstr "Konto: %s (%s)"
+
+#: ../finch/gntblist.c:1430
+#, c-format
+msgid ""
+"\n"
+"Last Seen: %s ago"
+msgstr ""
+"\n"
+"S奪gs senast: f旦r %s sedan"
+
+#: ../finch/gntblist.c:1696 ../pidgin/gtkdocklet.c:470
+#: ../pidgin/gtkstatusbox.c:1070
+msgid "New..."
+msgstr "Nytt..."
+
+#: ../finch/gntblist.c:1703 ../pidgin/gtkdocklet.c:471
+#: ../pidgin/gtkstatusbox.c:1071
+msgid "Saved..."
+msgstr "Sparad..."
+
+#: ../finch/gntblist.c:2081 ../finch/gntplugin.c:254 ../finch/gntui.c:82
+#: ../pidgin/gtkdocklet.c:523 ../pidgin/gtkplugin.c:530
+msgid "Plugins"
+msgstr "Insticksmoduler"
+
+#: ../finch/gntblist.c:2188 ../pidgin/gtkdialogs.c:708
+#: ../pidgin/gtkdialogs.c:846 ../pidgin/gtkdialogs.c:927
+msgid "_Name"
+msgstr "_Namn"
+
+#: ../finch/gntblist.c:2193 ../pidgin/gtkdialogs.c:713
+#: ../pidgin/gtkdialogs.c:851 ../pidgin/gtkdialogs.c:932
+msgid "_Account"
+msgstr "_Konto"
+
+#: ../finch/gntblist.c:2201 ../pidgin/gtkdialogs.c:721
+msgid "New Instant Message"
+msgstr "Nytt snabbmeddelanden"
+
+#: ../finch/gntblist.c:2203 ../pidgin/gtkdialogs.c:723
+msgid ""
+"Please enter the screen name or alias of the person you would like to IM."
+msgstr ""
+"Ange anv辰ndar-ID eller alias f旦r den person som du vill skicka "
+"snabbmeddelande till."
+
+#: ../finch/gntblist.c:2206 ../finch/gntnotify.c:79 ../libpurple/account.c:983
+#: ../libpurple/account.c:1233 ../libpurple/protocols/gg/gg.c:501
+#: ../libpurple/protocols/gg/gg.c:660 ../libpurple/protocols/gg/gg.c:797
+#: ../libpurple/protocols/jabber/jabber.c:1383
+#: ../libpurple/protocols/jabber/xdata.c:336
+#: ../libpurple/protocols/msn/msn.c:258 ../libpurple/protocols/msn/msn.c:275
+#: ../libpurple/protocols/msn/msn.c:292 ../libpurple/protocols/msn/msn.c:309
+#: ../libpurple/protocols/oscar/oscar.c:6072
+#: ../libpurple/protocols/silc/buddy.c:454
+#: ../libpurple/protocols/silc/buddy.c:1190
+#: ../libpurple/protocols/silc/chat.c:447
+#: ../libpurple/protocols/silc/chat.c:482
+#: ../libpurple/protocols/silc/chat.c:745
+#: ../libpurple/protocols/silc/ops.c:1291
+#: ../libpurple/protocols/silc/ops.c:1815
+#: ../libpurple/protocols/silc/silc.c:822
+#: ../libpurple/protocols/silc10/buddy.c:467
+#: ../libpurple/protocols/silc10/buddy.c:1188
+#: ../libpurple/protocols/silc10/chat.c:425
+#: ../libpurple/protocols/silc10/chat.c:464
+#: ../libpurple/protocols/silc10/chat.c:729
+#: ../libpurple/protocols/silc10/ops.c:1297
+#: ../libpurple/protocols/silc10/ops.c:1903
+#: ../libpurple/protocols/silc10/silc.c:735
+#: ../libpurple/protocols/yahoo/yahoo.c:988
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3258 ../pidgin/gtkblist.c:4013
+#: ../pidgin/gtkdialogs.c:726 ../pidgin/gtkdialogs.c:864
+#: ../pidgin/gtkdialogs.c:956 ../pidgin/gtkrequest.c:269
+msgid "OK"
+msgstr "OK"
+
+# src/menus.c:311
+#. Create the "Options" frame.
+#: ../finch/gntblist.c:2226 ../finch/gntpounce.c:446 ../pidgin/gtkpounce.c:791
+msgid "Options"
+msgstr "Alternativ"
+
+#: ../finch/gntblist.c:2232
+msgid "Send IM..."
+msgstr "Skicka IM..."
+
+#: ../finch/gntblist.c:2236
+msgid "Show empty groups"
+msgstr "Visa tomma grupper"
+
+#: ../finch/gntblist.c:2242
+msgid "Show offline buddies"
+msgstr "Visa fr奪nkopplade kompisar"
+
+#: ../finch/gntblist.c:2248
+msgid "Sort by status"
+msgstr "Sortera efter status"
+
+#: ../finch/gntblist.c:2252
+msgid "Sort alphabetically"
+msgstr "Sortera alfabetiskt"
+
+#: ../finch/gntblist.c:2256
+msgid "Sort by log size"
+msgstr "Sortera efter loggstorlek"
+
+#: ../finch/gntconn.c:110
+#, c-format
+msgid "%s (%s)"
+msgstr "%s (%s)"
+
+#: ../finch/gntconn.c:113
+#, c-format
+msgid "%s disconnected."
+msgstr "%s kopplades ifr奪n."
+
+#: ../finch/gntconn.c:114
+#, c-format
+msgid ""
+"%s\n"
+"\n"
+"Finch will not attempt to reconnect the account until you correct the error "
+"and re-enable the account."
+msgstr ""
+"%s\n"
+"\n"
+"Finch kommer inte f旦rs旦ka ansluta f旦rr辰n du har r辰ttat till felet och "
+"奪teraktiverat kontot."
+
+#: ../finch/gntconv.c:117
+msgid "No such command."
+msgstr "Finns inget s奪dant kommando."
+
+#: ../finch/gntconv.c:121 ../pidgin/gtkconv.c:493
+msgid "Syntax Error:  You typed the wrong number of arguments to that command."
+msgstr "Syntaxfel: Du skrev fel antal argument till det kommandot."
+
+#: ../finch/gntconv.c:126 ../pidgin/gtkconv.c:499
+msgid "Your command failed for an unknown reason."
+msgstr "Ditt kommando misslyckades av ok辰nd anledning."
+
+#: ../finch/gntconv.c:131 ../pidgin/gtkconv.c:506
+msgid "That command only works in chats, not IMs."
+msgstr "Det kommandot fungerar bara i chattar, inte i snabbmeddelanden."
+
+#: ../finch/gntconv.c:134 ../pidgin/gtkconv.c:509
+msgid "That command only works in IMs, not chats."
+msgstr "Det kommandot fungerar bara i snabbmeddelanden, inte chattar."
+
+#: ../finch/gntconv.c:138 ../pidgin/gtkconv.c:514
+msgid "That command doesn't work on this protocol."
+msgstr "Det kommandot funkar inte under detta protokoll."
+
+#: ../finch/gntconv.c:224
+#, c-format
+msgid "%s (%s -- %s)"
+msgstr "%s (%s -- %s)"
+
+#: ../finch/gntconv.c:247
+#, c-format
+msgid "%s [%s]"
+msgstr "%s [%s]"
+
+#: ../finch/gntconv.c:252 ../finch/gntconv.c:647
+#, c-format
+msgid ""
+"\n"
+"%s is typing..."
+msgstr ""
+"\n"
+"%s skriver..."
+
+#: ../finch/gntconv.c:271
+msgid "You have left this chat."
+msgstr "Du har l辰mnat denna chatt."
+
+#: ../finch/gntconv.c:342
+msgid "Send To"
+msgstr "Skicka till"
+
+#: ../finch/gntconv.c:386
+msgid "Conversation"
+msgstr "Konversation"
+
+#: ../finch/gntconv.c:392
+msgid "Clear Scrollback"
+msgstr "Rensa tillbakablick"
+
+#: ../finch/gntconv.c:396 ../finch/gntprefs.c:190
+msgid "Show Timestamps"
+msgstr "Visa tidsst辰mplar"
+
+#: ../finch/gntconv.c:412
+msgid "Add Buddy Pounce..."
+msgstr "L辰gg till kompisattack..."
+
+#: ../finch/gntconv.c:614
+msgid "<AUTO-REPLY> "
+msgstr "<AUTO-SVAR>"
+
+#. Print the list of users in the room
+#: ../finch/gntconv.c:735
+msgid "List of users:\n"
+msgstr "Lista 旦ver anv辰ndare:\n"
+
+#: ../finch/gntconv.c:880 ../pidgin/gtkconv.c:336
+msgid "Supported debug options are:  version"
+msgstr "De fels旦kningsalternativ som st旦ds 辰r: version"
+
+#: ../finch/gntconv.c:915 ../pidgin/gtkconv.c:385
+msgid "No such command (in this context)."
+msgstr "Det finns inget s奪dant kommando (i denna kontext)."
+
+#: ../finch/gntconv.c:918 ../pidgin/gtkconv.c:388
+msgid ""
+"Use \"/help &lt;command&gt;\" for help on a specific command.\n"
+"The following commands are available in this context:\n"
+msgstr ""
+"Anv辰nde \"/help &lt;kommando&gt;\" f旦r hj辰lp om ett specifikt kommando.\n"
+"F旦ljande kommandon 辰r tillg辰ngliga i sammanhanget:\n"
+
+#: ../finch/gntconv.c:976 ../pidgin/gtkconv.c:7225
+msgid ""
+"say &lt;message&gt;:  Send a message normally as if you weren't using a "
+"command."
+msgstr ""
+"say &lt;meddelande&gt;:  Skickar ett meddelande normalt som om du inte "
+"anv辰nde ett kommando."
+
+#: ../finch/gntconv.c:979 ../pidgin/gtkconv.c:7228
+msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
+msgstr ""
+"me &lt;奪tg辰rd&gt;:  Skickar en 奪tg辰rd i IRC-stil till en kompis eller chatt."
+
+#: ../finch/gntconv.c:982 ../pidgin/gtkconv.c:7231
+msgid ""
+"debug &lt;option&gt;:  Send various debug information to the current "
+"conversation."
+msgstr ""
+"debug &lt;alternativ&gt;:  Skickar all m旦jlig fels旦kningsinformation till "
+"den nuvarande konversationen."
+
+#: ../finch/gntconv.c:985 ../pidgin/gtkconv.c:7234
+msgid "clear: Clears the conversation scrollback."
+msgstr "clear: Rensar konversationens tillbakablick."
+
+#: ../finch/gntconv.c:988 ../pidgin/gtkconv.c:7240
+msgid "help &lt;command&gt;:  Help on a specific command."
+msgstr "help &lt;kommando&gt;:  Hj辰lp f旦r ett specifikt kommando."
+
+#: ../finch/gntconv.c:991
+msgid "users:  Show the list of users in the chat."
+msgstr "users: Visa listan av anv辰ndare i chatten."
+
+#: ../finch/gntconv.c:996
+msgid "plugins: Show the plugins window."
+msgstr "plugins: Visa f旦nstret med insticksmoduler."
+
+#: ../finch/gntconv.c:999
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: Visa kompislistan."
+
+#: ../finch/gntconv.c:1002
+msgid "accounts: Show the accounts window."
+msgstr "accounts: Visa kontohanteraren."
+
+#: ../finch/gntconv.c:1005
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: Visa fels旦kningsf旦nstret."
+
+#: ../finch/gntconv.c:1008
+msgid "prefs: Show the preference window."
+msgstr "prefs: Visa inst辰llningsf旦nstret."
+
+#: ../finch/gntconv.c:1011
+msgid "statuses: Show the savedstatuses window."
+msgstr "statuses: Visar statushanteraren."
+
+#: ../finch/gntdebug.c:234 ../finch/gntui.c:80 ../pidgin/gtkdebug.c:694
+msgid "Debug Window"
+msgstr "Fels旦kningsf旦nster"
+
+#. 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:255 ../pidgin/gtkdebug.c:753
+msgid "Clear"
+msgstr "Rensa"
+
+#: ../finch/gntdebug.c:261
+msgid "Filter: "
+msgstr "Filter:"
+
+#: ../finch/gntdebug.c:265 ../pidgin/gtkdebug.c:762
+msgid "Pause"
+msgstr "Pausa"
+
+#: ../finch/gntft.c:117 ../pidgin/gtkft.c:228
+#, c-format
+msgid "File Transfers - %d%% of %d files"
+msgstr "Fil旦verf旦ringar - %d%% av %d filer"
+
+#. Create the window.
+#: ../finch/gntft.c:122 ../finch/gntft.c:195 ../finch/gntui.c:81
+#: ../pidgin/gtkft.c:233 ../pidgin/gtkft.c:761
+msgid "File Transfers"
+msgstr "Fil旦verf旦ringar"
+
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:644
+msgid "Progress"
+msgstr "�verf旦rt"
+
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:651
+msgid "Filename"
+msgstr "Filnamn"
+
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:658
+msgid "Size"
+msgstr "Storlek"
+
+#: ../finch/gntft.c:198
+msgid "Speed"
+msgstr "Hastighet"
+
+#: ../finch/gntft.c:198 ../pidgin/gtkft.c:665
+msgid "Remaining"
+msgstr "�terst奪r"
+
+#. XXX: Use of ggp_str_to_uin() is an ugly hack!
+#: ../finch/gntft.c:198 ../finch/gntstatus.c:543 ../finch/gntstatus.c:572
+#: ../libpurple/protocols/bonjour/bonjour.c:318
+#: ../libpurple/protocols/gg/gg.c:1034 ../libpurple/protocols/gg/gg.c:1571
+#: ../libpurple/protocols/gg/gg.c:1579
+#: ../libpurple/protocols/jabber/buddy.c:638
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:677
+#: ../libpurple/protocols/jabber/jabber.c:1212
+#: ../libpurple/protocols/msn/msn.c:515
+#: ../libpurple/protocols/novell/novell.c:2835
+#: ../libpurple/protocols/oscar/oscar.c:821
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:2672
+#: ../libpurple/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/sametime/sametime.c:3264
+#: ../libpurple/protocols/sametime/sametime.c:4151
+#: ../libpurple/protocols/yahoo/yahoo.c:3066 ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3083 ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtksavedstatuses.c:998 ../pidgin/gtksavedstatuses.c:1143
+msgid "Status"
+msgstr "Status"
+
+#: ../finch/gntft.c:208
+msgid "Close this window when all transfers finish"
+msgstr "St辰ng detta f旦nster d奪 alla 旦verf旦ringar 辰r klara"
+
+#: ../finch/gntft.c:215
+msgid "Clear finished transfers"
+msgstr "Rensa bort f辰rdiga 旦verf旦ringar"
+
+# Os辰ker
+#: ../finch/gntft.c:229
+msgid "Stop"
+msgstr "Stopp"
+
+#. Close button
+#: ../finch/gntft.c:234 ../finch/gntnotify.c:181 ../finch/gntplugin.c:209
+#: ../finch/gntplugin.c:309 ../finch/gntpounce.c:727 ../finch/gntstatus.c:215
+#: ../libpurple/protocols/msn/msn.c:375 ../libpurple/protocols/silc/util.c:382
+#: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2479
+#: ../pidgin/gtkrequest.c:272
+msgid "Close"
+msgstr "St辰ng"
+
+#: ../finch/gntft.c:302 ../pidgin/gtkft.c:168 ../pidgin/gtkft.c:972
+msgid "Waiting for transfer to begin"
+msgstr "V辰ntar p奪 att 旦verf旦ringen ska inledas"
+
+#: ../finch/gntft.c:369 ../pidgin/gtkft.c:165 ../pidgin/gtkft.c:1053
+msgid "Canceled"
+msgstr "Avbruten"
+
+#: ../finch/gntft.c:371 ../pidgin/gtkft.c:1055
+msgid "Failed"
+msgstr "Misslyckades"
+
+#: ../finch/gntft.c:417 ../pidgin/gtkft.c:133
+#, c-format
+msgid "%.2f KiB/s"
+msgstr "%.2f KiB/s"
+
+#: ../finch/gntft.c:428 ../finch/gntft.c:429 ../pidgin/gtkft.c:162
+#: ../pidgin/gtkft.c:1115
+msgid "Finished"
+msgstr "F辰rdig"
+
+#: ../finch/gntft.c:431 ../libpurple/protocols/msn/session.c:347
+msgid "Transferring"
+msgstr "�verf旦r"
+
+#: ../finch/gntnotify.c:164
 msgid "Emails"
 msgstr "Epost"
 
-#: ../console/gntnotify.c:152
-#: ../console/gntnotify.c:206
+#: ../finch/gntnotify.c:170 ../finch/gntnotify.c:224
 msgid "You have mail!"
 msgstr "Du har ett e-post!"
 
-#: ../console/gntnotify.c:155
-#: ../gtk/gtknotify.c:432
-#: ../libgaim/protocols/jabber/jabber.c:1156
-msgid "From"
-msgstr "Fr奪n"
-
-#: ../console/gntnotify.c:155
-#: ../gtk/gtknotify.c:441
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:489
+msgid "Sender"
+msgstr "S辰ndare"
+
+#: ../finch/gntnotify.c:173 ../pidgin/gtknotify.c:496
 msgid "Subject"
 msgstr "�mne"
 
-#: ../console/gntnotify.c:163
-#: ../console/gntplugin.c:193
-#: ../console/gntplugin.c:274
-#: ../console/gntstatus.c:206
-#: ../gtk/gtkaccount.c:2386
-#: ../gtk/gtkrequest.c:272
-#: ../libgaim/protocols/msn/msn.c:355
-#: ../libgaim/protocols/silc/util.c:377
-msgid "Close"
-msgstr "St辰ng"
-
-#: ../console/gntnotify.c:182
+#: ../finch/gntnotify.c:200
 #, c-format
 msgid "%s (%s) has %d new message."
 msgid_plural "%s (%s) has %d new messages."
 msgstr[0] "%s (%s) har %d nytt meddelande."
 msgstr[1] "%s (%s) har %d nya meddelanden."
 
-#: ../console/gntnotify.c:206
-#: ../gtk/gtknotify.c:362
+#: ../finch/gntnotify.c:224 ../pidgin/gtknotify.c:335
 msgid "New Mail"
 msgstr "Ny epost"
 
-#: ../console/gntnotify.c:230
-#: ../gtk/gtknotify.c:877
+#: ../finch/gntnotify.c:289 ../pidgin/gtknotify.c:915
 #, c-format
 msgid "Info for %s"
 msgstr "Information om %s"
 
-#: ../console/gntnotify.c:232
-#: ../gtk/gtknotify.c:879
-#: ../libgaim/protocols/toc/toc.c:476
+#: ../finch/gntnotify.c:290 ../libpurple/protocols/toc/toc.c:476
+#: ../pidgin/gtknotify.c:916
 msgid "Buddy Information"
 msgstr "Information om kompis"
 
-#: ../console/gntnotify.c:306
+#: ../finch/gntnotify.c:376
 msgid "Continue"
 msgstr "Forts辰tt"
 
-#: ../console/gntnotify.c:312
-#: ../gtk/gtkconv.c:1610
-#: ../gtk/gtkdebug.c:862
+#: ../finch/gntnotify.c:382 ../pidgin/gtkconv.c:1628 ../pidgin/gtkdebug.c:834
 msgid "Info"
 msgstr "Information"
 
-#: ../console/gntnotify.c:315
-#: ../gtk/gtkconv.c:1571
+#: ../finch/gntnotify.c:385 ../pidgin/gtkconv.c:1589
 msgid "IM"
 msgstr "Meddelande"
 
-#: ../console/gntnotify.c:318
+#: ../finch/gntnotify.c:388
 msgid "Join"
 msgstr "Anslut"
 
-#: ../console/gntnotify.c:321
-#: ../libgaim/protocols/sametime/sametime.c:3483
+#: ../finch/gntnotify.c:391 ../libpurple/protocols/sametime/sametime.c:3474
 msgid "Invite"
 msgstr "Bjud in"
 
-#: ../console/gntnotify.c:324
+#: ../finch/gntnotify.c:394
 msgid "(none)"
 msgstr "(inget)"
 
-#: ../console/gntplugin.c:117
+#: ../finch/gntplugin.c:74 ../finch/gntplugin.c:83
+msgid "ERROR"
+msgstr "FEL"
+
+#: ../finch/gntplugin.c:74
+msgid "loading plugin failed"
+msgstr "inl辰sning av modul misslyckades."
+
+#: ../finch/gntplugin.c:83
+msgid "unloading plugin failed"
+msgstr "borttagning av modul misslyckades"
+
+#: ../finch/gntplugin.c:128
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -996,4701 +1056,533 @@
 "Hemsida: %s\n"
 "Filnamn: %s\n"
 
-#: ../console/gntplugin.c:170
+#: ../finch/gntplugin.c:186
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Modulen beh旦ver laddas f旦re du kan konfigurera den."
 
-#: ../console/gntplugin.c:208
-msgid "..."
-msgstr "..."
-
-#: ../console/gntplugin.c:209
-msgid "Still need to do something about this."
-msgstr "Beh旦ver fortfarande g旦ra n奪got 奪t detta."
-
-#: ../console/gntplugin.c:215
+#: ../finch/gntplugin.c:234
 msgid "No configuration options for this plugin."
 msgstr "Ingen konfiguration tillg辰ngliga f旦r denna modul."
 
-#: ../console/gntplugin.c:236
+#: ../finch/gntplugin.c:259
 msgid "You can (un)load plugins from the following list."
 msgstr "Du kan (av)l辰sa moduler fr奪n f旦ljande lista."
 
-#: ../console/gntplugin.c:279
+#: ../finch/gntplugin.c:314
 msgid "Configure Plugin"
 msgstr "Konfigurera modul"
 
-#: ../console/gntprefs.c:122
+#. copy the preferences to tmp values...
+#. * I liked "take affect immediately" Oh well :-(
+#. (that should have been "effect," right?)
+#. Back to instant-apply! I win!  BU-HAHAHA!
+#. Create the window
+#: ../finch/gntplugin.c:370 ../finch/gntplugin.c:377 ../finch/gntprefs.c:263
+#: ../finch/gntui.c:83 ../pidgin/gtkdocklet.c:524 ../pidgin/gtkprefs.c:2060
+msgid "Preferences"
+msgstr "Inst辰llningar"
+
+#: ../finch/gntpounce.c:182 ../pidgin/gtkpounce.c:255
+msgid "Please enter a buddy to pounce."
+msgstr "Ange en kompis som ska attackeras."
+
+#. Create the window.
+#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
+msgid "New Buddy Pounce"
+msgstr "Ny kompisattack"
+
+#: ../finch/gntpounce.c:327 ../pidgin/gtkpounce.c:516
+msgid "Edit Buddy Pounce"
+msgstr "�ndra kompisattack"
+
+#: ../finch/gntpounce.c:332
+msgid "Pounce Who"
+msgstr "Attackera vem"
+
+#. Account:
+#: ../finch/gntpounce.c:335 ../finch/gntstatus.c:452
+msgid "Account:"
+msgstr "Konto:"
+
+#: ../finch/gntpounce.c:357
+msgid "Buddy name:"
+msgstr "Kompisnamn:"
+
+#. Create the "Pounce When Buddy..." frame.
+#: ../finch/gntpounce.c:373 ../pidgin/gtkpounce.c:586
+msgid "Pounce When Buddy..."
+msgstr "Attackera n辰r kompisen..."
+
+#: ../finch/gntpounce.c:375
+msgid "Signs on"
+msgstr "Ansluter"
+
+#: ../finch/gntpounce.c:376
+msgid "Signs off"
+msgstr "Kopplar ifr奪n"
+
+#: ../finch/gntpounce.c:377
+msgid "Goes away"
+msgstr "Blir fr奪nvarande"
+
+#: ../finch/gntpounce.c:378
+msgid "Returns from away"
+msgstr "�terv辰nder fr奪n fr奪nvaro"
+
+#: ../finch/gntpounce.c:379
+msgid "Becomes idle"
+msgstr "Blir inaktiv"
+
+#: ../finch/gntpounce.c:380
+msgid "Is no longer idle"
+msgstr "�r inte l辰ngre inaktiv"
+
+#: ../finch/gntpounce.c:381
+msgid "Starts typing"
+msgstr "B旦rjar skriva"
+
+#: ../finch/gntpounce.c:382
+msgid "Pauses while typing"
+msgstr "Pausar skrivandet"
+
+#: ../finch/gntpounce.c:383
+msgid "Stops typing"
+msgstr "Slutar skriva"
+
+#: ../finch/gntpounce.c:384
+msgid "Sends a message"
+msgstr "Skickar ett meddelande"
+
+#. Create the "Action" frame.
+#: ../finch/gntpounce.c:413 ../pidgin/gtkpounce.c:647
+msgid "Action"
+msgstr "Handling"
+
+#: ../finch/gntpounce.c:415
+msgid "Open an IM window"
+msgstr "�ppna ett snabbmeddelandef旦nster"
+
+#: ../finch/gntpounce.c:416
+msgid "Pop up a notification"
+msgstr "Visa en notifiering"
+
+#: ../finch/gntpounce.c:417
+msgid "Send a message"
+msgstr "Skicka ett meddelande"
+
+#: ../finch/gntpounce.c:418
+msgid "Execute a command"
+msgstr "K旦r ett kommando"
+
+#: ../finch/gntpounce.c:419
+msgid "Play a sound"
+msgstr "Spela upp ett ljud"
+
+#: ../finch/gntpounce.c:447
+msgid "Pounce only when my status is not available"
+msgstr "Attackera enbart d奪 min status 辰r fr奪nvarande"
+
+#: ../finch/gntpounce.c:449 ../pidgin/gtkpounce.c:1295
+msgid "Recurring"
+msgstr "�terkommande"
+
+#: ../finch/gntpounce.c:651 ../pidgin/gtkpounce.c:1110
+#, c-format
+msgid "Are you sure you want to delete the pounce on %s for %s?"
+msgstr "�r du s辰ker p奪 att du vill ta bort attacken f旦r %s d奪 %s"
+
+#: ../finch/gntpounce.c:685 ../finch/gntui.c:79 ../pidgin/gtkpounce.c:1339
+msgid "Buddy Pounces"
+msgstr "Kompisattacker"
+
+#: ../finch/gntpounce.c:799 ../pidgin/gtkpounce.c:1466
+#, c-format
+msgid "%s has started typing to you (%s)"
+msgstr "%s har b旦rjat skriva till dig (%s)"
+
+#: ../finch/gntpounce.c:801 ../pidgin/gtkpounce.c:1468
+#, c-format
+msgid "%s has paused while typing to you (%s)"
+msgstr "%s har pausat i meddelandet till dig (%s)"
+
+#: ../finch/gntpounce.c:803 ../pidgin/gtkpounce.c:1470
+#, c-format
+msgid "%s has signed on (%s)"
+msgstr "%s har loggat in (%s)"
+
+#: ../finch/gntpounce.c:805 ../pidgin/gtkpounce.c:1472
+#, c-format
+msgid "%s has returned from being idle (%s)"
+msgstr "%s har blivit aktiv igen (%s)"
+
+#: ../finch/gntpounce.c:807 ../pidgin/gtkpounce.c:1474
+#, c-format
+msgid "%s has returned from being away (%s)"
+msgstr "%s har kommit tillbaka (%s)"
+
+#: ../finch/gntpounce.c:809 ../pidgin/gtkpounce.c:1476
+#, c-format
+msgid "%s has stopped typing to you (%s)"
+msgstr "%s har slutat skriva till dig (%s)"
+
+#: ../finch/gntpounce.c:811 ../pidgin/gtkpounce.c:1478
+#, c-format
+msgid "%s has signed off (%s)"
+msgstr "%s har kopplat ifr奪n (%s)"
+
+#: ../finch/gntpounce.c:813 ../pidgin/gtkpounce.c:1480
+#, c-format
+msgid "%s has become idle (%s)"
+msgstr "%s har blivit inaktiv (%s)"
+
+#: ../finch/gntpounce.c:815 ../pidgin/gtkpounce.c:1482
+#, c-format
+msgid "%s has gone away. (%s)"
+msgstr "%s har g奪tt iv辰g. (%s)"
+
+#: ../finch/gntpounce.c:817 ../pidgin/gtkpounce.c:1484
+#, c-format
+msgid "%s has sent you a message. (%s)"
+msgstr "%s har s辰nt dig ett meddelande. (%s)"
+
+#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1485
+msgid "Unknown pounce event. Please report this!"
+msgstr "Ok辰nd atackh辰ndelse. Var sn辰ll och rapportera detta!"
+
+#: ../finch/gntprefs.c:91
+msgid "Based on keyboard use"
+msgstr "Baserat p奪 tangetbordsanv辰ndning"
+
+#: ../finch/gntprefs.c:93 ../pidgin/gtkprefs.c:1923
+msgid "From last sent message"
+msgstr "Fr奪n senast s辰nda meddelande"
+
+#: ../finch/gntprefs.c:95 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:906
+#: ../pidgin/gtkprefs.c:1922 ../pidgin/gtkprefs.c:1936
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:337
+msgid "Never"
+msgstr "Aldrig"
+
+#: ../finch/gntprefs.c:183
 msgid "Show Idle Time"
 msgstr "Visa vilotid"
 
-#: ../console/gntprefs.c:123
+#: ../finch/gntprefs.c:184
 msgid "Show Offline Buddies"
 msgstr "Visa fr奪nkopplade kompisar"
 
-#: ../console/gntprefs.c:129
-msgid "Show Timestamps"
-msgstr "Visa tidsst辰mplar"
-
-#: ../console/gntprefs.c:130
+#: ../finch/gntprefs.c:191
 msgid "Notify buddies when you are typing"
 msgstr "Meddela kompisar att du skriver till dem"
 
-#: ../console/gntprefs.c:136
+#: ../finch/gntprefs.c:197
 msgid "Log format"
 msgstr "Logg format"
 
-#: ../console/gntprefs.c:137
+#: ../finch/gntprefs.c:198
 msgid "Log IMs"
 msgstr "Logga snabbmeddelanden"
 
-#: ../console/gntprefs.c:138
+#: ../finch/gntprefs.c:199
 msgid "Log chats"
 msgstr "Logga alla chattar"
 
-#: ../console/gntprefs.c:139
+#: ../finch/gntprefs.c:200
 msgid "Log status change events"
 msgstr "Logga alla statusf旦r辰ndringar"
 
+#: ../finch/gntprefs.c:206
+msgid "Report Idle time"
+msgstr "Rapportera inaktivitetstid"
+
+#: ../finch/gntprefs.c:207
+msgid "Change status when idle"
+msgstr "�ndra status vid inaktivitet"
+
+#: ../finch/gntprefs.c:208
+msgid "Minutes before changing status"
+msgstr "Minuter innan status ska 辰ndras"
+
+#: ../finch/gntprefs.c:209
+msgid "Change status to"
+msgstr "�ndra status till"
+
 #. Conversations
-#: ../console/gntprefs.c:220
-#: ../gtk/gtkprefs.c:898
-#: ../gtk/gtkprefs.c:1914
-#: ../gtk/plugins/win32/winprefs/winprefs.c:341
+#: ../finch/gntprefs.c:258 ../pidgin/gtkprefs.c:992 ../pidgin/gtkprefs.c:2026
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:344
 msgid "Conversations"
 msgstr "Konversationer"
 
-#: ../console/gntprefs.c:221
-#: ../gtk/gtkprefs.c:1354
-#: ../gtk/gtkprefs.c:1925
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:1462 ../pidgin/gtkprefs.c:2037
 msgid "Logging"
 msgstr "Loggning"
 
-#: ../console/gntprefs.c:223
-#: ../console/gntui.c:74
-#: ../gtk/gtkdocklet.c:545
-#: ../gtk/gtkprefs.c:1950
-msgid "Preferences"
-msgstr "Inst辰llningar"
-
-#: ../console/gntrequest.c:495
+#: ../finch/gntrequest.c:563
 msgid "Not implemented yet."
 msgstr "Funktionen 辰r inte implementerad 辰nnu."
 
-#: ../console/gntstatus.c:135
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1531
+#: ../pidgin/gtkrequest.c:1577
+msgid "Save File..."
+msgstr "Spara fil..."
+
+#: ../finch/gntrequest.c:635 ../pidgin/gtkrequest.c:1532
+#: ../pidgin/gtkrequest.c:1578
+msgid "Open File..."
+msgstr "�ppna fil..."
+
+#: ../finch/gntstatus.c:137
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "�r du s辰ker p奪 att du vill ta bort \"%s\""
 
-#: ../console/gntstatus.c:138
+#: ../finch/gntstatus.c:140
 msgid "Delete Status"
 msgstr "Borttagningsstatus"
 
-#: ../console/gntstatus.c:167
-#: ../gtk/gtksavedstatuses.c:526
+#: ../finch/gntstatus.c:175 ../pidgin/gtksavedstatuses.c:596
 msgid "Saved Statuses"
 msgstr "Sparade statusar"
 
-#: ../console/gntstatus.c:174
-#: ../console/gntstatus.c:526
-#: ../gtk/gtksavedstatuses.c:433
-#: ../libgaim/protocols/jabber/buddy.c:286
-#: ../libgaim/protocols/jabber/buddy.c:923
-#: ../libgaim/protocols/novell/novell.c:1484
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:535
+#: ../libpurple/protocols/jabber/buddy.c:286
+#: ../libpurple/protocols/jabber/buddy.c:973
+#: ../libpurple/protocols/novell/novell.c:1484
+#: ../pidgin/gtksavedstatuses.c:499
 msgid "Title"
 msgstr "Titel"
 
-#: ../console/gntstatus.c:174
-#: ../gtk/gtksavedstatuses.c:448
+#: ../finch/gntstatus.c:182 ../pidgin/gtksavedstatuses.c:514
 msgid "Type"
 msgstr "Typ"
 
 # src/sidebar.c:103
-#: ../console/gntstatus.c:174
-#: ../console/gntstatus.c:551
-#: ../console/gntstatus.c:563
-#: ../gtk/gtksavedstatuses.c:459
-#: ../gtk/gtksavedstatuses.c:923
-#: ../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:1587
-#: ../libgaim/protocols/gg/gg.c:1605
-#: ../libgaim/protocols/gg/gg.c:1615
-#: ../libgaim/protocols/gg/gg.c:1621
-#: ../libgaim/protocols/gg/gg.c:1630
-#: ../libgaim/protocols/gg/gg.c:1635
-#: ../libgaim/protocols/irc/irc.c:244
-#: ../libgaim/protocols/jabber/jabber.c:1228
-#: ../libgaim/protocols/jabber/jabber.c:1238
-#: ../libgaim/protocols/jabber/jabber.c:1248
-#: ../libgaim/protocols/jabber/jabber.c:1258
-#: ../libgaim/protocols/jabber/jabber.c:1268
-#: ../libgaim/protocols/jabber/jabber.c:1280
-#: ../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:3297
-#: ../libgaim/protocols/sametime/sametime.c:3303
-#: ../libgaim/protocols/sametime/sametime.c:3309
-#: ../libgaim/protocols/sametime/sametime.c:3388
-#: ../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:2342
+#: ../finch/gntstatus.c:182 ../finch/gntstatus.c:560 ../finch/gntstatus.c:572
+#: ../libpurple/protocols/bonjour/bonjour.c:247
+#: ../libpurple/protocols/bonjour/bonjour.c:254
+#: ../libpurple/protocols/bonjour/bonjour.c:320
+#: ../libpurple/protocols/gg/gg.c:1072 ../libpurple/protocols/gg/gg.c:1574
+#: ../libpurple/protocols/gg/gg.c:1592 ../libpurple/protocols/gg/gg.c:1602
+#: ../libpurple/protocols/gg/gg.c:1608 ../libpurple/protocols/gg/gg.c:1617
+#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/irc/irc.c:234
+#: ../libpurple/protocols/jabber/jabber.c:1244
+#: ../libpurple/protocols/jabber/jabber.c:1254
+#: ../libpurple/protocols/jabber/jabber.c:1264
+#: ../libpurple/protocols/jabber/jabber.c:1274
+#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/novell/novell.c:2838
+#: ../libpurple/protocols/novell/novell.c:2941
+#: ../libpurple/protocols/novell/novell.c:2947
+#: ../libpurple/protocols/novell/novell.c:2953
+#: ../libpurple/protocols/oscar/oscar.c:5533
+#: ../libpurple/protocols/oscar/oscar.c:5751
+#: ../libpurple/protocols/oscar/oscar.c:5765
+#: ../libpurple/protocols/oscar/oscar.c:5781
+#: ../libpurple/protocols/oscar/oscar.c:5788
+#: ../libpurple/protocols/oscar/oscar.c:5795
+#: ../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:1551
+#: ../libpurple/protocols/silc10/buddy.c:1551
+#: ../libpurple/protocols/simple/simple.c:246
+#: ../libpurple/protocols/yahoo/yahoo.c:3494
+#: ../libpurple/protocols/yahoo/yahoo.c:3500
+#: ../libpurple/protocols/zephyr/zephyr.c:2337
+#: ../pidgin/gtksavedstatuses.c:525 ../pidgin/gtksavedstatuses.c:1009
 msgid "Message"
 msgstr "Meddelande"
 
 #. Use
-#: ../console/gntstatus.c:186
-#: ../console/gntstatus.c:580
+#: ../finch/gntstatus.c:193 ../finch/gntstatus.c:589
 msgid "Use"
 msgstr "Anv辰nd"
 
-#: ../console/gntstatus.c:291
+#: ../finch/gntstatus.c:300
 msgid "Invalid title"
 msgstr "Ogiltigt titel"
 
-#: ../console/gntstatus.c:292
+#: ../finch/gntstatus.c:301
 msgid "Please enter a non-empty title for the status."
 msgstr "Var god ange inte en tom titel f旦r statusen."
 
-#: ../console/gntstatus.c:299
+#: ../finch/gntstatus.c:308
 msgid "Duplicate title"
 msgstr "Duplicerad titel"
 
-#: ../console/gntstatus.c:300
+#: ../finch/gntstatus.c:309
 msgid "Please enter a different title for the status."
 msgstr "Anv辰nd en annan titel f旦r statusen."
 
-#: ../console/gntstatus.c:440
+#: ../finch/gntstatus.c:449
 msgid "Substatus"
 msgstr "Understatus"
 
-#. Set up stuff for the account box
-#: ../console/gntstatus.c:443
-#: ../gtk/gtkblist.c:5177
-#: ../gtk/gtkblist.c:5492
-msgid "Account:"
-msgstr "Konto:"
-
-#: ../console/gntstatus.c:451
-#: ../gtk/gtkft.c:698
+#: ../finch/gntstatus.c:460 ../pidgin/gtkft.c:698
 msgid "Status:"
 msgstr "Status:"
 
-#: ../console/gntstatus.c:466
+#: ../finch/gntstatus.c:475
 msgid "Message:"
 msgstr "Meddelande:"
 
-#: ../console/gntstatus.c:515
+#: ../finch/gntstatus.c:524
 msgid "Edit Status"
 msgstr "�ndra status"
 
-#. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../console/gntstatus.c:534
-#: ../console/gntstatus.c:563
-#: ../gtk/gtkblist.c:2734
-#: ../gtk/gtkblist.c:2747
-#: ../gtk/gtkblist.c:2749
-#: ../gtk/gtksavedstatuses.c:912
-#: ../gtk/gtksavedstatuses.c:1059
-#: ../libgaim/protocols/bonjour/bonjour.c:337
-#: ../libgaim/protocols/gg/gg.c:1024
-#: ../libgaim/protocols/gg/gg.c:1584
-#: ../libgaim/protocols/gg/gg.c:1592
-#: ../libgaim/protocols/jabber/buddy.c:625
-#: ../libgaim/protocols/jabber/buddy.c:629
-#: ../libgaim/protocols/jabber/buddy.c:662
-#: ../libgaim/protocols/jabber/jabber.c:1196
-#: ../libgaim/protocols/msn/msn.c:545
-#: ../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:3274
-#: ../libgaim/protocols/sametime/sametime.c:4159
-#: ../libgaim/protocols/yahoo/yahoo.c:3027
-msgid "Status"
-msgstr "Status"
-
-#: ../console/gntstatus.c:557
+#: ../finch/gntstatus.c:566
 msgid "Use different status for following accounts"
 msgstr "Anv辰nd en annan status f旦r vissa konton"
 
 #. Save & Use
-#: ../console/gntstatus.c:591
+#: ../finch/gntstatus.c:600
 msgid "Save & Use"
 msgstr "Spara & Anv辰nd"
 
-#: ../console/gntui.c:75
+#: ../finch/gntui.c:84
 msgid "Statuses"
 msgstr "Status"
 
-#: ../console/plugins/gntgf.c:209
+#: ../finch/plugins/gntclipboard.c:149
+msgid "GntClipboard"
+msgstr "GntKlippbok"
+
+#: ../finch/plugins/gntclipboard.c:151
+msgid "Clipboard plugin"
+msgstr "Klippbordsmodul"
+
+#: ../finch/plugins/gntclipboard.c:152
+msgid ""
+"When the gnt clipboard contents change, the contents are made available to "
+"X, if possible."
+msgstr ""
+"N辰r inneh奪llet i gnt klippboken 辰ndras g旦rs inneh奪llet tillg辰nligt f旦r X, "
+"n辰r det 辰r m旦jligt."
+
+#: ../finch/plugins/gntgf.c:231
 #, c-format
 msgid "%s just signed on"
 msgstr "%s har precis anslutit"
 
-#: ../console/plugins/gntgf.c:216
+#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s har precis kopplat ifr奪n"
 
-#: ../console/plugins/gntgf.c:224
+#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s har s辰nt dig ett meddelande"
 
-#: ../console/plugins/gntgf.c:243
+#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s sa ditt alias i %s"
 
-#: ../console/plugins/gntgf.c:245
+#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s har s辰nt dig ett meddelande i (%s)"
 
-#: ../console/plugins/gntgf.c:283
+#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "En kompis ansluter till/kopplar fr奪n"
 
-#: ../console/plugins/gntgf.c:284
+#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Du fick ett IM"
 
-#: ../console/plugins/gntgf.c:285
+#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "N奪gon talar i en chatt"
 
-#: ../console/plugins/gntgf.c:286
+#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "N奪gon n辰mner ditt namn i en chatt"
 
-#: ../console/plugins/gntgf.c:314
+#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Notifiera med en toaster d奪"
 
-#: ../console/plugins/gntgf.c:329
+#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "Pip ocks奪!"
 
-#: ../console/plugins/gntgf.c:335
+#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "Markera terminalf旦nstret som BR�DSKANDE."
 
-#: ../console/plugins/gntgf.c:355
+#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../console/plugins/gntgf.c:357
-#: ../console/plugins/gntgf.c:358
-msgid "Toaster plugin for Gaim-Text."
-msgstr "Toastermodul f旦r Gaim-Text."
-
-#: ../console/plugins/gnthistory.c:116
-#: ../gtk/plugins/history.c:120
+#: ../finch/plugins/gntgf.c:379 ../finch/plugins/gntgf.c:380
+msgid "Toaster plugin"
+msgstr "Toastermodul"
+
+#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:120
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Konversation med %s p奪 %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 "Historikinstiksmodulen kr辰ver loggning"
 
-#: ../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"
-"Enabling logs for instant messages and/or chats will activate history for the same conversation type(s)."
+"Enabling logs for instant messages and/or chats will activate history for "
+"the same conversation type(s)."
 msgstr ""
 "Loggning kan aktiveras fr奪n Verktyg -> Inst辰llningar -> Loggning.\n"
 "\n"
-"Om loggning aktiveras f旦r snabbmeddelanden och/eller chattar s奪 aktiveras 辰ven historik f旦r samma konversationstyper."
-
-#: ../console/plugins/gnthistory.c:179
+"Om loggning aktiveras f旦r snabbmeddelanden och/eller chattar s奪 aktiveras "
+"辰ven historik f旦r samma konversationstyper."
+
+#: ../finch/plugins/gnthistory.c:179
 msgid "GntHistory"
 msgstr "GntHistorik"
 
 # Kan tyckas vara en konstig mening, men l辰s n辰sta 旦vers辰ttning s奪
 # f旦rst奪r du.
-#: ../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 "Visar nyligen loggade konversationer i nya konversationsf旦nster."
 
-#: ../console/plugins/gnthistory.c:182
-#: ../gtk/plugins/history.c:191
-msgid "When a new conversation is opened this plugin will insert the last conversation into the current conversation."
-msgstr "N辰r en ny konversation 旦ppnas kommer denna insticksmodul att l辰gga till den f旦reg奪ende konversationen i den nuvarande."
-
-#: ../console/plugins/lastlog.c:69
+#: ../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."
+msgstr ""
+"N辰r en ny konversation 旦ppnas kommer denna insticksmodul att l辰gga till den "
+"f旦reg奪ende konversationen i den nuvarande."
+
+#: ../finch/plugins/lastlog.c:69
 msgid "Lastlog"
 msgstr "Lastlog"
 
-#: ../console/plugins/lastlog.c:99
+#: ../finch/plugins/lastlog.c:99
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: S旦ker efter en understr辰ng i loggen."
 
-#: ../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 "Lastlogmodul f旦r Gaim-Text."
-
-#: ../gtk/eggtrayicon.c:129
-msgid "Orientation"
-msgstr "Orientering"
-
-#: ../gtk/eggtrayicon.c:130
-msgid "The orientation of the tray."
-msgstr "Uppsamlarens orientering."
-
-#: ../gtk/gaimstock.c:137
-msgid "_Alias"
-msgstr "_Alias"
-
-#. join button
-#: ../gtk/gaimstock.c:138
-#: ../gtk/gtkblist.c:1122
-#: ../gtk/gtkroomlist.c:299
-#: ../gtk/gtkroomlist.c:456
-msgid "_Join"
-msgstr "_Anslut"
-
-#: ../gtk/gaimstock.c:139
-msgid "Close _tabs"
-msgstr "St辰ng _flik"
-
-#: ../gtk/gaimstock.c:140
-#: ../gtk/gtkblist.c:1006
-msgid "I_M"
-msgstr "_Meddelande"
-
-#: ../gtk/gaimstock.c:141
-msgid "_Get Info"
-msgstr "H辰mta _info"
-
-#: ../gtk/gaimstock.c:142
-msgid "_Invite"
-msgstr "Bjud _in"
-
-#: ../gtk/gaimstock.c:143
-msgid "_Modify"
-msgstr "_�ndra"
-
-#: ../gtk/gaimstock.c:144
-msgid "_Open Mail"
-msgstr "_�ppna brev"
-
-#. Pause button
-#: ../gtk/gaimstock.c:145
-#: ../gtk/gtkft.c:835
-msgid "_Pause"
-msgstr "_Pausa"
-
-#. Build the login options frame.
-#: ../gtk/gtkaccount.c:390
-msgid "Login Options"
-msgstr "Inloggningsalternativ"
-
-#: ../gtk/gtkaccount.c:491
-msgid "Local alias:"
-msgstr "Lokalt alias:"
-
-#. Build the user options frame.
-#: ../gtk/gtkaccount.c:553
-msgid "User Options"
-msgstr "Anv辰ndaralternativ"
-
-#. Buddy icon
-#: ../gtk/gtkaccount.c:571
-msgid "Use this buddy icon for this account:"
-msgstr "Anv辰nd denna kompisikon f旦r detta konto:"
-
-# src/menus.c:311
-#. Build the protocol options frame.
-#: ../gtk/gtkaccount.c:683
-#, c-format
-msgid "%s Options"
-msgstr "%s-alternativ"
-
-#: ../gtk/gtkaccount.c:879
-msgid "Use GNOME Proxy Settings"
-msgstr "Anv辰nd GNOME proxyinst辰llningar"
-
-#: ../gtk/gtkaccount.c:880
-msgid "Use Global Proxy Settings"
-msgstr "Anv辰nd globala proxyinst辰llningar"
-
-#: ../gtk/gtkaccount.c:886
-msgid "No Proxy"
-msgstr "Ingen proxy"
-
-#: ../gtk/gtkaccount.c:892
-msgid "HTTP"
-msgstr "HTTP"
-
-#: ../gtk/gtkaccount.c:898
-msgid "SOCKS 4"
-msgstr "SOCKS 4"
-
-#: ../gtk/gtkaccount.c:904
-msgid "SOCKS 5"
-msgstr "SOCKS 5"
-
-#: ../gtk/gtkaccount.c:910
-#: ../gtk/gtkprefs.c:1100
-msgid "Use Environmental Settings"
-msgstr "Anv辰nd milj旦inst辰llningar"
-
-#. 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:949
-msgid "If you look real closely"
-msgstr "Om du tittar riktigt n辰ra"
-
-#. This is an easter egg. See the comment on the previous line in the source.
-#: ../gtk/gtkaccount.c:952
-msgid "you can see the butterflies mating"
-msgstr "kan du se fj辰rilarna para sig"
-
-#: ../gtk/gtkaccount.c:973
-msgid "Proxy Options"
-msgstr "Proxyalternativ"
-
-#: ../gtk/gtkaccount.c:987
-#: ../gtk/gtkprefs.c:1094
-msgid "Proxy _type:"
-msgstr "Proxy_typ:"
-
-#: ../gtk/gtkaccount.c:996
-#: ../gtk/gtkprefs.c:1115
-msgid "_Host:"
-msgstr "_V辰rd:"
-
-#: ../gtk/gtkaccount.c:1000
-#: ../gtk/gtkprefs.c:1133
-msgid "_Port:"
-msgstr "_Port:"
-
-#: ../gtk/gtkaccount.c:1008
-msgid "_Username:"
-msgstr "_Anv辰ndarnamn:"
-
-#: ../gtk/gtkaccount.c:1014
-#: ../gtk/gtkprefs.c:1170
-msgid "Pa_ssword:"
-msgstr "_L旦senord:"
-
-#: ../gtk/gtkaccount.c:1425
-msgid "Add Account"
-msgstr "L辰gg till konto"
-
-# src/menus.c:327
-#: ../gtk/gtkaccount.c:1449
-msgid "_Basic"
-msgstr "_Basic"
-
-#: ../gtk/gtkaccount.c:1460
-msgid "_Advanced"
-msgstr "_Avancerat"
-
-#. Register button
-#: ../gtk/gtkaccount.c:1475
-#: ../libgaim/protocols/jabber/jabber.c:858
-msgid "Register"
-msgstr "Registrera"
-
-#: ../gtk/gtkaccount.c:1930
-#: ../gtk/gtkplugin.c:576
-msgid "Enabled"
-msgstr "Aktiverad"
-
-#: ../gtk/gtkaccount.c:1958
-msgid "Protocol"
-msgstr "Protokoll"
-
-#: ../gtk/gtkaccount.c:2127
-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 ""
-"<span size='larger' weight='bold'>V辰lkommen till Gaim!</span>\n"
-"\n"
-"Du har inga IM-konton konfigurerade. F旦r att p奪b旦rja en anslutning med Gaim s奪 trycker du p奪 knappen <b>L辰gg till</b> nedanf旦r och konfigurerar ditt f旦rsta konto. Om du vill att Gaim ska ansluta till fler konton trycker du p奪 <b>L辰gg till</b> igen f旦r att konfigurera dem alla.\n"
-"\n"
-"Du kan komma tillbaka till detta f旦nster f旦r att l辰gga till, 辰ndra eller ta bort konton fr奪n <b>Konton->L辰gg till/�ndra</b> i kompislistans f旦nster"
-
-#: ../gtk/gtkaccount.c:2463
-#, c-format
-msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "%s%s%s%s vill l辰gga till %s i sin kompislista%s%s"
-
-#: ../gtk/gtkaccount.c:2486
-#: ../gtk/gtkaccount.c:2492
-msgid "Authorize buddy?"
-msgstr "Auktorisera kompis?"
-
-#: ../gtk/gtkaccount.c:2487
-#: ../gtk/gtkaccount.c:2493
-msgid "Authorize"
-msgstr "Auktorisera"
-
-#: ../gtk/gtkaccount.c:2488
-#: ../gtk/gtkaccount.c:2494
-msgid "Deny"
-msgstr "Neka"
-
-#: ../gtk/gtkblist.c:707
-msgid "Join a Chat"
-msgstr "Anslut till chatt"
-
-#: ../gtk/gtkblist.c:728
-msgid "Please enter the appropriate information about the chat you would like to join.\n"
-msgstr "Var god ange information om chatten du vill ansluta till.\n"
-
-#: ../gtk/gtkblist.c:739
-#: ../gtk/gtkpounce.c:529
-#: ../gtk/gtkroomlist.c:392
-msgid "_Account:"
-msgstr "_Konto:"
-
-#: ../gtk/gtkblist.c:1003
-msgid "Get _Info"
-msgstr "H辰mta _info"
-
-#: ../gtk/gtkblist.c:1012
-msgid "_Send File"
-msgstr "_Skicka fil"
-
-#: ../gtk/gtkblist.c:1019
-msgid "Add Buddy _Pounce"
-msgstr "L辰gg till kom_pis旦vervakning"
-
-#: ../gtk/gtkblist.c:1023
-#: ../gtk/gtkblist.c:1027
-#: ../gtk/gtkblist.c:1126
-#: ../gtk/gtkblist.c:1149
-msgid "View _Log"
-msgstr "Visa _logg"
-
-#: ../gtk/gtkblist.c:1038
-msgid "Alias..."
-msgstr "Alias..."
-
-#: ../gtk/gtkblist.c:1047
-#: ../gtk/gtkblist.c:1134
-#: ../gtk/gtkblist.c:1155
-msgid "_Alias..."
-msgstr "_Alias..."
-
-#: ../gtk/gtkblist.c:1049
-#: ../gtk/gtkblist.c:1136
-#: ../gtk/gtkblist.c:1157
-msgid "_Remove"
-msgstr "_Ta bort"
-
-#: ../gtk/gtkblist.c:1097
-msgid "Add a _Buddy"
-msgstr "_L辰gg till kompis"
-
-#: ../gtk/gtkblist.c:1099
-msgid "Add a C_hat"
-msgstr "L辰gg till c_hatt"
-
-#: ../gtk/gtkblist.c:1102
-msgid "_Delete Group"
-msgstr "_Ta bort grupp"
-
-#: ../gtk/gtkblist.c:1104
-msgid "_Rename"
-msgstr "Byt _namn"
-
-#: ../gtk/gtkblist.c:1124
-msgid "Auto-Join"
-msgstr "Anslut automatiskt"
-
-#: ../gtk/gtkblist.c:1162
-#: ../gtk/gtkblist.c:1185
-msgid "_Collapse"
-msgstr "_F辰ll ihop"
-
-#: ../gtk/gtkblist.c:1190
-msgid "_Expand"
-msgstr "_Expandera"
-
-#: ../gtk/gtkblist.c:1436
-#: ../gtk/gtkblist.c:1448
-#: ../gtk/gtkblist.c:4286
-#: ../gtk/gtkblist.c:4296
-msgid "/Tools/Mute Sounds"
-msgstr "/Verktyg/St辰ng av ljud"
-
-#: ../gtk/gtkblist.c:1908
-#: ../gtk/gtkconv.c:4394
-#: ../gtk/gtkpounce.c:421
-msgid "You are not currently signed on with an account that can add that buddy."
-msgstr "Du 辰r f旦r tillf辰llet inte inloggad med n奪got konto som kan l辰gga till den kompisen."
-
-#. Buddies menu
-#: ../gtk/gtkblist.c:2503
-msgid "/_Buddies"
-msgstr "/_Kompisar"
-
-#: ../gtk/gtkblist.c:2504
-msgid "/Buddies/New Instant _Message..."
-msgstr "/Kompisar/Nytt _snabbmeddelande..."
-
-#: ../gtk/gtkblist.c:2505
-msgid "/Buddies/Join a _Chat..."
-msgstr "/Kompisar/Anslut till _chatt..."
-
-#: ../gtk/gtkblist.c:2506
-msgid "/Buddies/Get User _Info..."
-msgstr "/Kompisar/H辰mta anv辰ndar_info..."
-
-#: ../gtk/gtkblist.c:2507
-msgid "/Buddies/View User _Log..."
-msgstr "/Kompisar/Visa anv辰ndar_logg..."
-
-#: ../gtk/gtkblist.c:2509
-msgid "/Buddies/Show _Offline Buddies"
-msgstr "/Kompisar/Visa _fr奪nkopplade kompisar"
-
-#: ../gtk/gtkblist.c:2510
-msgid "/Buddies/Show _Empty Groups"
-msgstr "/Kompisar/Visa _tomma grupper"
-
-#: ../gtk/gtkblist.c:2511
-msgid "/Buddies/Show Buddy _Details"
-msgstr "/Kompisar/Visa _kompisdetaljer"
-
-#: ../gtk/gtkblist.c:2512
-msgid "/Buddies/Show Idle _Times"
-msgstr "/Kompisar/Visa fr奪nvaro_tid"
-
-#: ../gtk/gtkblist.c:2513
-msgid "/Buddies/_Sort Buddies"
-msgstr "/Kompisar/_Sortera kompisar"
-
-#: ../gtk/gtkblist.c:2515
-msgid "/Buddies/_Add Buddy..."
-msgstr "/Kompisar/L辰gg till _kompis..."
-
-#: ../gtk/gtkblist.c:2516
-msgid "/Buddies/Add C_hat..."
-msgstr "/Kompisar/L辰gg till c_hatt..."
-
-#: ../gtk/gtkblist.c:2517
-msgid "/Buddies/Add _Group..."
-msgstr "/Kompisar/L辰gg till _grupp..."
-
-#: ../gtk/gtkblist.c:2519
-msgid "/Buddies/_Quit"
-msgstr "/Kompisar/_Avsluta"
-
-#. Accounts menu
-#: ../gtk/gtkblist.c:2522
-msgid "/_Accounts"
-msgstr "/_Konton"
-
-#: ../gtk/gtkblist.c:2523
-#: ../gtk/gtkblist.c:6168
-msgid "/Accounts/Add\\/Edit"
-msgstr "/Verktyg/L辰gg till\\/Redigera"
-
-#. Tools
-#: ../gtk/gtkblist.c:2526
-msgid "/_Tools"
-msgstr "/_Verktyg"
-
-#: ../gtk/gtkblist.c:2527
-msgid "/Tools/Buddy _Pounces"
-msgstr "/Verktyg/_�vervaka kompis"
-
-#: ../gtk/gtkblist.c:2528
-msgid "/Tools/Plu_gins"
-msgstr "/Verktyg/Insticksmodu_ler"
-
-#: ../gtk/gtkblist.c:2529
-msgid "/Tools/Pr_eferences"
-msgstr "/Verktyg/_Inst辰llningar"
-
-#: ../gtk/gtkblist.c:2530
-msgid "/Tools/Pr_ivacy"
-msgstr "/Verktyg/_Sp辰rrlista"
-
-#: ../gtk/gtkblist.c:2532
-msgid "/Tools/_File Transfers"
-msgstr "/Verktyg/_Fil旦verf旦ringar"
-
-#: ../gtk/gtkblist.c:2533
-msgid "/Tools/R_oom List"
-msgstr "/Verktyg/R_umslista"
-
-#: ../gtk/gtkblist.c:2534
-msgid "/Tools/System _Log"
-msgstr "/Verktyg/Visa _systemlogg"
-
-#: ../gtk/gtkblist.c:2536
-msgid "/Tools/Mute _Sounds"
-msgstr "/Verktyg/St辰ng av _ljud"
-
-#. Help
-#: ../gtk/gtkblist.c:2539
-msgid "/_Help"
-msgstr "/_Hj辰lp"
-
-#: ../gtk/gtkblist.c:2540
-msgid "/Help/Online _Help"
-msgstr "/Hj辰lp/Online_hj辰lp"
-
-#: ../gtk/gtkblist.c:2541
-msgid "/Help/_Debug Window"
-msgstr "/Hj辰lp/_Fels旦kningsf旦nster"
-
-#: ../gtk/gtkblist.c:2542
-msgid "/Help/_About"
-msgstr "/Hj辰lp/_Om"
-
-#: ../gtk/gtkblist.c:2574
-#, c-format
-msgid ""
-"\n"
-"<b>Account:</b> %s"
-msgstr ""
-"\n"
-"<b>Konto:</b> %s"
-
-#: ../gtk/gtkblist.c:2658
-msgid "Buddy Alias"
-msgstr "Kompisalias"
-
-#: ../gtk/gtkblist.c:2679
-msgid "Logged In"
-msgstr "Ansluten"
-
-#: ../gtk/gtkblist.c:2725
-msgid "Last Seen"
-msgstr "Senast sedd"
-
-#: ../gtk/gtkblist.c:2734
-#: ../gtk/gtkblist.c:3222
-#: ../gtk/gtkdocklet.c:471
-#: ../gtk/gtkstatusbox.c:990
-#: ../libgaim/protocols/gg/gg.c:993
-#: ../libgaim/protocols/jabber/buddy.c:1371
-#: ../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 "Fr奪nkopplad"
-
-#: ../gtk/gtkblist.c:2745
-#: ../gtk/gtkprefs.c:680
-#: ../libgaim/protocols/jabber/buddy.c:289
-#: ../libgaim/protocols/jabber/buddy.c:929
-#: ../libgaim/protocols/jabber/chat.c:777
-msgid "Description"
-msgstr "Beskrivning"
-
-#: ../gtk/gtkblist.c:2745
-msgid "Spooky"
-msgstr "Skr辰mmande"
-
-#: ../gtk/gtkblist.c:2747
-msgid "Awesome"
-msgstr "Fantastisk"
-
-#: ../gtk/gtkblist.c:2749
-msgid "Rockin'"
-msgstr "Rockar"
-
-#: ../gtk/gtkblist.c:3238
-#, c-format
-msgid "Idle %dh %02dm"
-msgstr "Inaktiv %dh %02dm"
-
-#: ../gtk/gtkblist.c:3240
-#, c-format
-msgid "Idle %dm"
-msgstr "Inaktiv %dm"
-
-#: ../gtk/gtkblist.c:3371
-msgid "/Buddies/New Instant Message..."
-msgstr "/Kompisar/Nytt snabbmeddelande..."
-
-#: ../gtk/gtkblist.c:3372
-#: ../gtk/gtkblist.c:3405
-msgid "/Buddies/Join a Chat..."
-msgstr "/Kompisar/Anslut till _chatt..."
-
-#: ../gtk/gtkblist.c:3373
-msgid "/Buddies/Get User Info..."
-msgstr "/Kompisar/H辰mta anv辰ndarinfo..."
-
-#: ../gtk/gtkblist.c:3374
-msgid "/Buddies/Add Buddy..."
-msgstr "/Kompisar/L辰gg till kompis..."
-
-#: ../gtk/gtkblist.c:3375
-#: ../gtk/gtkblist.c:3408
-msgid "/Buddies/Add Chat..."
-msgstr "/Kompisar/L辰gg till chatt..."
-
-#: ../gtk/gtkblist.c:3376
-msgid "/Buddies/Add Group..."
-msgstr "/Kompisar/L辰gg till grupp..."
-
-#: ../gtk/gtkblist.c:3411
-msgid "/Tools/Buddy Pounces"
-msgstr "/Verktyg/�vervaka kompis"
-
-#: ../gtk/gtkblist.c:3414
-msgid "/Tools/Privacy"
-msgstr "/Verktyg/_Sp辰rrlista"
-
-# S辰ger man inte "rumslista"?
-#: ../gtk/gtkblist.c:3417
-msgid "/Tools/Room List"
-msgstr "/Verktyg/Rumlista"
-
-#: ../gtk/gtkblist.c:3514
-#: ../gtk/gtkdocklet.c:152
-#, c-format
-msgid "%d unread message from %s\n"
-msgid_plural "%d unread messages from %s\n"
-msgstr[0] "%d ol辰st meddelande fr奪n %s\n"
-msgstr[1] "%d ol辰sta meddelande fr奪n %s\n"
-
-#: ../gtk/gtkblist.c:3590
-msgid "Manually"
-msgstr "Manuellt"
-
-#: ../gtk/gtkblist.c:3592
-msgid "Alphabetically"
-msgstr "Alfabetiskt"
-
-#: ../gtk/gtkblist.c:3593
-msgid "By status"
-msgstr "Efter status"
-
-#: ../gtk/gtkblist.c:3594
-msgid "By log size"
-msgstr "Efter loggstorlek"
-
-#: ../gtk/gtkblist.c:3781
-#: ../gtk/gtkconn.c:178
-#, c-format
-msgid "%s disconnected"
-msgstr "%s kopplades ifr奪n."
-
-#: ../gtk/gtkblist.c:3790
-#: ../libgaim/protocols/sametime/sametime.c:3653
-msgid "Connect"
-msgstr "Anslut"
-
-#: ../gtk/gtkblist.c:3790
-msgid "Re-enable Account"
-msgstr "�teraktivera konto"
-
-#: ../gtk/gtkblist.c:3811
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s fr奪nkopplad: %s</span>"
-
-#: ../gtk/gtkblist.c:3941
-msgid "<b>Username:</b>"
-msgstr "<b>Anv辰ndarnamn:</b>"
-
-#: ../gtk/gtkblist.c:3948
-msgid "<b>Password:</b>"
-msgstr "<b>L旦senord:</b>"
-
-#: ../gtk/gtkblist.c:3959
-msgid "_Login"
-msgstr "_Login"
-
-#: ../gtk/gtkblist.c:4039
-msgid "/Accounts"
-msgstr "/Konton"
-
-#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../gtk/gtkblist.c:4053
-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 ""
-"<span weight='bold' size='larger'>V辰lkommen till Gaim!</span>\n"
-"\n"
-"Du har inga konton aktiverade. Aktivera dina IM-konton fr奪n f旦nstret <b>Konton</b> vid <b>Konton->L辰gg till/�ndra</b>. S奪 snart dy har aktiverat dina konton kommer du kunna v辰lja en status och prata med dina v辰nner."
-
-#. set the Show Offline Buddies option. must be done
-#. * after the treeview or faceprint gets mad. -Robot101
-#.
-#: ../gtk/gtkblist.c:4280
-msgid "/Buddies/Show Offline Buddies"
-msgstr "/Kompisar/Visa fr奪nkopplade kompisar"
-
-#: ../gtk/gtkblist.c:4283
-msgid "/Buddies/Show Empty Groups"
-msgstr "/Kompisar/Visa tomma grupper"
-
-#: ../gtk/gtkblist.c:4289
-msgid "/Buddies/Show Buddy Details"
-msgstr "/Kompisar/Visa kompisdetaljer"
-
-#: ../gtk/gtkblist.c:4292
-msgid "/Buddies/Show Idle Times"
-msgstr "/Kompisar/Visa fr奪nvarotid"
-
-#: ../gtk/gtkblist.c:4973
-#: ../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 "Kompisar"
-
-#: ../gtk/gtkblist.c:5107
-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 "Ange anv辰ndar-ID f旦r den kompis du vill l辰gga till i din kompislista. Du kan ocks奪 ange ett alias eller ett smeknamn p奪 kompisen. Detta alias kommer att visas i st辰llet f旦r anv辰ndar-ID n辰r det 辰r m旦jligt.\n"
-
-#: ../gtk/gtkblist.c:5167
-#: ../gtk/gtkblist.c:5527
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:554
-#: ../gtk/plugins/gevolution/new_person_dialog.c:307
-msgid "Group:"
-msgstr "Grupp:"
-
-#: ../gtk/gtkblist.c:5425
-msgid "This protocol does not support chat rooms."
-msgstr "Protokollet st旦djer inte chattrum."
-
-#: ../gtk/gtkblist.c:5441
-msgid "You are not currently signed on with any protocols that have the ability to chat."
-msgstr "Du 辰r f旦r tillf辰llet inte inloggad med n奪got protokoll som erbjuder chatt."
-
-#: ../gtk/gtkblist.c:5482
-msgid "Please enter an alias, and the appropriate information about the chat you would like to add to your buddy list.\n"
-msgstr "Ange information och alias f旦r den chatt som du vill l辰gga till i din kompislista.\n"
-
-#: ../gtk/gtkblist.c:5565
-msgid "Please enter the name of the group to be added."
-msgstr "Ange namnet p奪 den grupp som du vill l辰gga till."
-
-#: ../gtk/gtkblist.c:6188
-msgid "<GaimMain>/Accounts/"
-msgstr "<GaimMain>/Konton/"
-
-#: ../gtk/gtkblist.c:6213
-msgid "_Edit Account"
-msgstr "_�ndra konto"
-
-#: ../gtk/gtkblist.c:6246
-#: ../gtk/gtkblist.c:6252
-#: ../gtk/gtkconv.c:2838
-msgid "No actions available"
-msgstr "Inga 奪tg辰rder tillg辰ngliga"
-
-# M旦jligen passar "Aktivt" b辰ttre h辰r.
-# �r inte s奪 s辰ker p奪 det, tror det 辰r mer en fr奪ga om smak d奪 det 辰r viss skillnad mellan n奪got som 辰r aktivt och n奪got som 辰r aktiverat. Tyv辰rr kan jag inte bygga Gaim fr奪n CVS just nu (eller r辰ttare sagt: jag kan bygga det, men jag f奪r det inte att starta p奪 denna datorn) s奪 d辰rf旦r kan jag inte kolla upp riktigt i vilken kontext det 辰r.
-#: ../gtk/gtkblist.c:6260
-msgid "_Disable"
-msgstr "A_vaktivera"
-
-#: ../gtk/gtkblist.c:6272
-msgid "Enable Account"
-msgstr "Aktivera konto"
-
-#: ../gtk/gtkblist.c:6278
-msgid "<GaimMain>/Accounts/Enable Account"
-msgstr "<GaimMain>/Konton/Aktivera Konto"
-
-#: ../gtk/gtkblist.c:6327
-msgid "/Tools"
-msgstr "/Verktyg"
-
-#: ../gtk/gtkblist.c:6397
-msgid "/Buddies/Sort Buddies"
-msgstr "/Kompisar/Sortera kompisar"
-
-#: ../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 ""
-"%s\n"
-"\n"
-"Gaim kommer inte f旦rs旦ka ansluta f旦rr辰n du har korrekterat felt och 奪teraktiverat kontot."
-
-#: ../gtk/gtkconv.c:746
-#: ../gtk/gtkconv.c:772
-msgid "That buddy is not on the same protocol as this chat."
-msgstr "Den kompisen anv辰nder inte samma protokoll som denna chatt."
-
-#: ../gtk/gtkconv.c:766
-msgid "You are not currently signed on with an account that can invite that buddy."
-msgstr "Du 辰r f旦r tillf辰llet inte inloggad med n奪got konto som kan bjuda in den kompisen."
-
-#: ../gtk/gtkconv.c:819
-msgid "Invite Buddy Into Chat Room"
-msgstr "Bjud in kompis till chattrum"
-
-#. Put our happy label in it.
-#: ../gtk/gtkconv.c:849
-msgid "Please enter the name of the user you wish to invite, along with an optional invite message."
-msgstr "Ange namnet p奪 den anv辰ndare du vill bjuda in, samt ett inbjudningsmeddelande om du vill"
-
-#: ../gtk/gtkconv.c:870
-msgid "_Buddy:"
-msgstr "_Kompis:"
-
-# src/sidebar.c:103
-#: ../gtk/gtkconv.c:890
-#: ../gtk/gtksavedstatuses.c:1111
-#: ../gtk/gtksavedstatuses.c:1447
-msgid "_Message:"
-msgstr "_Meddelande:"
-
-#: ../gtk/gtkconv.c:947
-#: ../gtk/gtkconv.c:2400
-#: ../gtk/gtkdebug.c:218
-#: ../gtk/gtkft.c:542
-msgid "Unable to open file."
-msgstr "Kan inte 旦ppna filen."
-
-#: ../gtk/gtkconv.c:953
-#, c-format
-msgid "<h1>Conversation with %s</h1>\n"
-msgstr "<h1>Konversation med %s</h1>\n"
-
-#: ../gtk/gtkconv.c:977
-msgid "Save Conversation"
-msgstr "Spara konversationen"
-
-#: ../gtk/gtkconv.c:1124
-#: ../gtk/gtkdebug.c:166
-#: ../gtk/gtkdebug.c:756
-msgid "Find"
-msgstr "S旦k"
-
-#: ../gtk/gtkconv.c:1150
-#: ../gtk/gtkdebug.c:194
-msgid "_Search for:"
-msgstr "_S旦k efter:"
-
-#: ../gtk/gtkconv.c:1321
-msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "Loggning startades. Framtida meddelanden i denna konversation kommer att loggas."
-
-#: ../gtk/gtkconv.c:1329
-msgid "Logging stopped. Future messages in this conversation will not be logged."
-msgstr "Loggning stoppades. Framtida meddelanden i denna konversation kommer inte att loggas."
-
-#: ../gtk/gtkconv.c:1597
-msgid "Un-Ignore"
-msgstr "Avignorera"
-
-#: ../gtk/gtkconv.c:1600
-msgid "Ignore"
-msgstr "Ignorera"
-
-#: ../gtk/gtkconv.c:1620
-msgid "Get Away Message"
-msgstr "H辰mta fr奪nvaromeddelande"
-
-#: ../gtk/gtkconv.c:1643
-msgid "Last said"
-msgstr "Senast sagt"
-
-#: ../gtk/gtkconv.c:2408
-msgid "Unable to save icon file to disk."
-msgstr "Kan inte spara ikonfil p奪 disken."
-
-#: ../gtk/gtkconv.c:2478
-msgid "Save Icon"
-msgstr "Spara ikon"
-
-#: ../gtk/gtkconv.c:2527
-msgid "Animate"
-msgstr "Animera"
-
-#: ../gtk/gtkconv.c:2532
-msgid "Hide Icon"
-msgstr "D旦lj ikon"
-
-#: ../gtk/gtkconv.c:2535
-msgid "Save Icon As..."
-msgstr "Spara ikon som..."
-
-#: ../gtk/gtkconv.c:2539
-msgid "Set Custom Icon..."
-msgstr "V辰lj egen ikon..."
-
-#: ../gtk/gtkconv.c:2546
-msgid "Remove Custom Icon"
-msgstr "Ta bort egen ikon"
-
-#. Conversation menu
-#: ../gtk/gtkconv.c:2687
-msgid "/_Conversation"
-msgstr "/_Konversation"
-
-#: ../gtk/gtkconv.c:2689
-msgid "/Conversation/New Instant _Message..."
-msgstr "/Konversation/Nytt snabb_meddelande..."
-
-#: ../gtk/gtkconv.c:2694
-msgid "/Conversation/_Find..."
-msgstr "/Konversation/_S旦k..."
-
-#: ../gtk/gtkconv.c:2696
-msgid "/Conversation/View _Log"
-msgstr "/Konversation/Visa _Logg"
-
-#: ../gtk/gtkconv.c:2697
-msgid "/Conversation/_Save As..."
-msgstr "/Konversation/_Spara som..."
-
-#: ../gtk/gtkconv.c:2699
-msgid "/Conversation/Clea_r Scrollback"
-msgstr "/Konversation/_Rensa"
-
-#: ../gtk/gtkconv.c:2703
-msgid "/Conversation/Se_nd File..."
-msgstr "/Konversation/S_kicka fil..."
-
-#: ../gtk/gtkconv.c:2704
-msgid "/Conversation/Add Buddy _Pounce..."
-msgstr "/Konversation/L辰gg till _旦vervakning..."
-
-#: ../gtk/gtkconv.c:2706
-msgid "/Conversation/_Get Info"
-msgstr "/Konversation/_H辰mta information"
-
-#: ../gtk/gtkconv.c:2708
-msgid "/Conversation/In_vite..."
-msgstr "/Konversation/_Bjud in..."
-
-#: ../gtk/gtkconv.c:2710
-msgid "/Conversation/M_ore"
-msgstr "/Konversation/_Mer"
-
-#: ../gtk/gtkconv.c:2714
-msgid "/Conversation/Al_ias..."
-msgstr "/Konversation/Al_ias..."
-
-#: ../gtk/gtkconv.c:2716
-msgid "/Conversation/_Block..."
-msgstr "/Konversatione/_Blockera"
-
-#: ../gtk/gtkconv.c:2718
-msgid "/Conversation/_Add..."
-msgstr "/Konversation/_L辰gg till..."
-
-#: ../gtk/gtkconv.c:2720
-msgid "/Conversation/_Remove..."
-msgstr "/Konversation/_Ta bort..."
-
-#: ../gtk/gtkconv.c:2725
-msgid "/Conversation/Insert Lin_k..."
-msgstr "/Konversation/Infoga l辰n_k..."
-
-#: ../gtk/gtkconv.c:2727
-msgid "/Conversation/Insert Imag_e..."
-msgstr "/Konversation/Infoga _bild..."
-
-#: ../gtk/gtkconv.c:2732
-msgid "/Conversation/_Close"
-msgstr "/Konversatione/_St辰ng"
-
-# src/menus.c:311
-#. Options
-#: ../gtk/gtkconv.c:2736
-msgid "/_Options"
-msgstr "_Alternativ"
-
-#: ../gtk/gtkconv.c:2737
-msgid "/Options/Enable _Logging"
-msgstr "/Alternativ/Aktivera _loggning"
-
-#: ../gtk/gtkconv.c:2738
-msgid "/Options/Enable _Sounds"
-msgstr "/Alternativ/_Aktivera ljud"
-
-#: ../gtk/gtkconv.c:2739
-msgid "/Options/Show Buddy _Icon"
-msgstr "/Alternativ/Visa kompis_ikoner"
-
-# Lite konstigt med plural p奪 verktygsrader, men det st奪r
-# ju faktiskt s奪:-)
-#: ../gtk/gtkconv.c:2741
-msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Alternativ/Visa forma_teringsverktygsrader"
-
-#: ../gtk/gtkconv.c:2742
-msgid "/Options/Show Ti_mestamps"
-msgstr "/Alternativ/Visa tidsst辰_mplar"
-
-#: ../gtk/gtkconv.c:2817
-msgid "/Conversation/More"
-msgstr "/Konversation/Mer"
-
-#. 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:2862
-#: ../gtk/gtkconv.c:2894
-msgid "/Conversation"
-msgstr "/Konversation"
-
-#: ../gtk/gtkconv.c:2902
-msgid "/Conversation/View Log"
-msgstr "/Konversation/Visa logg"
-
-#: ../gtk/gtkconv.c:2908
-msgid "/Conversation/Send File..."
-msgstr "/Konversation/Skicka fil..."
-
-#: ../gtk/gtkconv.c:2912
-msgid "/Conversation/Add Buddy Pounce..."
-msgstr "/Konversation/L辰gg till 旦vervakning..."
-
-#: ../gtk/gtkconv.c:2918
-msgid "/Conversation/Get Info"
-msgstr "/Konversation/H辰mta information"
-
-#: ../gtk/gtkconv.c:2922
-msgid "/Conversation/Invite..."
-msgstr "/Konversation/Bjud in..."
-
-#: ../gtk/gtkconv.c:2928
-msgid "/Conversation/Alias..."
-msgstr "/Konversation/Alias..."
-
-#: ../gtk/gtkconv.c:2932
-msgid "/Conversation/Block..."
-msgstr "/Konversation/Blockera..."
-
-#: ../gtk/gtkconv.c:2936
-msgid "/Conversation/Add..."
-msgstr "/Konversation/L辰gg till..."
-
-#: ../gtk/gtkconv.c:2940
-msgid "/Conversation/Remove..."
-msgstr "/Konversation/Ta bort..."
-
-#: ../gtk/gtkconv.c:2946
-msgid "/Conversation/Insert Link..."
-msgstr "/Konversation/Infoga l辰nk..."
-
-#: ../gtk/gtkconv.c:2950
-msgid "/Conversation/Insert Image..."
-msgstr "/Konversation/Infoga bild..."
-
-#: ../gtk/gtkconv.c:2956
-msgid "/Options/Enable Logging"
-msgstr "/Alternativ/Aktivera loggning"
-
-#: ../gtk/gtkconv.c:2959
-msgid "/Options/Enable Sounds"
-msgstr "/Alternativ/Aktivera ljud"
-
-#: ../gtk/gtkconv.c:2972
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/Alternativ/Visa formateringsverktyg"
-
-#: ../gtk/gtkconv.c:2975
-msgid "/Options/Show Timestamps"
-msgstr "/Alternativ/Visa tidsst辰mplar"
-
-#: ../gtk/gtkconv.c:2978
-msgid "/Options/Show Buddy Icon"
-msgstr "/Alternativ/Visa kompisikoner"
-
-#: ../gtk/gtkconv.c:3054
-msgid "User is typing..."
-msgstr "Anv辰ndaren skriver..."
-
-#: ../gtk/gtkconv.c:3057
-msgid "User has typed something and stopped"
-msgstr "Anv辰ndaren har skrivit n奪got och sedan slutat"
-
-#. Build the Send To menu
-#: ../gtk/gtkconv.c:3240
-msgid "_Send To"
-msgstr "_Skicka till"
-
-#: ../gtk/gtkconv.c:3947
-msgid "_Send"
-msgstr "_Skicka"
-
-#: ../gtk/gtkconv.c:4042
-#: ../libgaim/protocols/sametime/sametime.c:3595
-msgid "Topic:"
-msgstr "�mne:"
-
-#. Setup the label telling how many people are in the room.
-#: ../gtk/gtkconv.c:4094
-msgid "0 people in room"
-msgstr "0 personer i rummet"
-
-#: ../gtk/gtkconv.c:5145
-#: ../gtk/gtkconv.c:5266
-#, c-format
-msgid "%d person in room"
-msgid_plural "%d people in room"
-msgstr[0] "%d person 辰r i rummet"
-msgstr[1] "%d personer 辰r i rummet"
-
-#: ../gtk/gtkconv.c:5819
-#: ../gtk/gtkstatusbox.c:567
-msgid "Typing"
-msgstr "Skriver"
-
-#: ../gtk/gtkconv.c:5825
-msgid "Stopped Typing"
-msgstr "Slutade skriva"
-
-#: ../gtk/gtkconv.c:5830
-msgid "Nick Said"
-msgstr "Smeknamn n辰mnt"
-
-#: ../gtk/gtkconv.c:5835
-#: ../gtk/gtkdocklet.c:513
-msgid "Unread Messages"
-msgstr "Ol辰sta meddeladen"
-
-#: ../gtk/gtkconv.c:5840
-msgid "New Event"
-msgstr "Ny h辰ndelse"
-
-#: ../gtk/gtkconv.c:6961
-msgid "Confirm close"
-msgstr "Bekr辰fta st辰ngning"
-
-#: ../gtk/gtkconv.c:6993
-msgid "You have unread messages. Are you sure you want to close the window?"
-msgstr "Du har ol辰sta meddelanden. �r du s辰ker p奪 att du vill st辰nga f旦nstret?"
-
-#: ../gtk/gtkconv.c:7528
-msgid "Close other tabs"
-msgstr "St辰ng andra flikar"
-
-#: ../gtk/gtkconv.c:7534
-msgid "Close all tabs"
-msgstr "St辰ng alla flikar"
-
-#: ../gtk/gtkconv.c:7542
-msgid "Detach this tab"
-msgstr "Lossa denna flik"
-
-#: ../gtk/gtkconv.c:7548
-msgid "Close this tab"
-msgstr "St辰ng denna flik"
-
-#: ../gtk/gtkconv.c:7819
-msgid "Close conversation"
-msgstr "St辰ng konversationen"
-
-#: ../gtk/gtkconv.c:8283
-msgid "Last created window"
-msgstr "Senast skapade f旦nster"
-
-#: ../gtk/gtkconv.c:8285
-msgid "Separate IM and Chat windows"
-msgstr "Separera IM- och chattf旦nster"
-
-#: ../gtk/gtkconv.c:8287
-#: ../gtk/gtkprefs.c:1302
-msgid "New window"
-msgstr "Nytt f旦nster"
-
-#: ../gtk/gtkconv.c:8289
-msgid "By group"
-msgstr "Efter grupp"
-
-#: ../gtk/gtkconv.c:8291
-msgid "By account"
-msgstr "Efter konto"
-
-#: ../gtk/gtkdebug.c:233
-msgid "Save Debug Log"
-msgstr "Spara fels旦kningslogg"
-
-#: ../gtk/gtkdebug.c:594
-msgid "Invert"
-msgstr "Invertera"
-
-#: ../gtk/gtkdebug.c:597
-msgid "Highlight matches"
-msgstr "Markera tr辰ffar"
-
-#: ../gtk/gtkdebug.c:664
-msgid "_Icon Only"
-msgstr "Endast _ikon"
-
-#: ../gtk/gtkdebug.c:665
-msgid "_Text Only"
-msgstr "Endast _text"
-
-#: ../gtk/gtkdebug.c:666
-msgid "_Both Icon & Text"
-msgstr "_B奪da ikon och text"
-
-#: ../gtk/gtkdebug.c:802
-msgid "Filter"
-msgstr "Filter"
-
-#: ../gtk/gtkdebug.c:821
-msgid "Right click for more options."
-msgstr "H旦gerklicka f旦r fler alternativ."
-
-#: ../gtk/gtkdebug.c:851
-msgid "Level "
-msgstr "Niv奪"
-
-#: ../gtk/gtkdebug.c:852
-#: ../gtk/gtkdebug.c:858
-msgid "Select the debug filter level."
-msgstr "V辰lj debugfiltrets niv奪."
-
-#: ../gtk/gtkdebug.c:860
-msgid "All"
-msgstr "Alla"
-
-#: ../gtk/gtkdebug.c:861
-msgid "Misc"
-msgstr "�vrigt"
-
-#: ../gtk/gtkdebug.c:863
-msgid "Warning"
-msgstr "Varning"
-
-#: ../gtk/gtkdebug.c:864
-msgid "Error "
-msgstr "Fel"
-
-#: ../gtk/gtkdebug.c:865
-msgid "Fatal Error"
-msgstr "Allvarligt fel"
-
-#: ../gtk/gtkdialogs.c:66
-#: ../gtk/gtkdialogs.c:110
-msgid "lead developer"
-msgstr "utvecklingsledare"
-
-#: ../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 "utvecklare"
-
-#: ../gtk/gtkdialogs.c:72
-msgid "developer & webmaster"
-msgstr "utvecklare & webbansvarig"
-
-#: ../gtk/gtkdialogs.c:79
-msgid "support"
-msgstr "support"
-
-#: ../gtk/gtkdialogs.c:80
-msgid "support/QA"
-msgstr "support/QA"
-
-#: ../gtk/gtkdialogs.c:102
-msgid "win32 port"
-msgstr "win32-portering"
-
-# Vi borde f旦rs旦ka hitta en bra 旦vers辰ttning f旦r detta ord.
-# Kanske "underh奪llsansvarig"?
-#: ../gtk/gtkdialogs.c:103
-#: ../gtk/gtkdialogs.c:104
-msgid "maintainer"
-msgstr "maintainer"
-
-#: ../gtk/gtkdialogs.c:105
-msgid "libfaim maintainer"
-msgstr "libfaim-maintainer "
-
-#. 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 "hacker och fyllechaffis [lat typ]"
-
-#: ../gtk/gtkdialogs.c:108
-msgid "Jabber developer"
-msgstr "Jabber-utvecklare"
-
-#: ../gtk/gtkdialogs.c:109
-msgid "original author"
-msgstr "ursprunglig upphovsman"
-
-#: ../gtk/gtkdialogs.c:116
-msgid "Arabic"
-msgstr "Arabiska"
-
-#: ../gtk/gtkdialogs.c:117
-#: ../gtk/gtkdialogs.c:118
-#: ../gtk/gtkdialogs.c:187
-msgid "Bulgarian"
-msgstr "Bulgariska"
-
-#: ../gtk/gtkdialogs.c:119
-#: ../gtk/gtkdialogs.c:120
-msgid "Bengali"
-msgstr "Bengali"
-
-#: ../gtk/gtkdialogs.c:121
-msgid "Bosnian"
-msgstr "Bostniska"
-
-#: ../gtk/gtkdialogs.c:122
-#: ../gtk/gtkdialogs.c:188
-#: ../gtk/gtkdialogs.c:189
-msgid "Catalan"
-msgstr "Katalanska"
-
-#: ../gtk/gtkdialogs.c:123
-#: ../gtk/gtkdialogs.c:124
-msgid "Valencian-Catalan"
-msgstr "Valencianska"
-
-#: ../gtk/gtkdialogs.c:125
-#: ../gtk/gtkdialogs.c:190
-msgid "Czech"
-msgstr "Tjeckiska"
-
-#: ../gtk/gtkdialogs.c:126
-msgid "Danish"
-msgstr "Danska"
-
-#: ../gtk/gtkdialogs.c:127
-#: ../gtk/gtkdialogs.c:128
-#: ../gtk/gtkdialogs.c:191
-msgid "German"
-msgstr "Tyska"
-
-#: ../gtk/gtkdialogs.c:129
-#: ../gtk/gtkdialogs.c:130
-msgid "Greek"
-msgstr "Grekiska"
-
-#: ../gtk/gtkdialogs.c:131
-msgid "Australian English"
-msgstr "Australiensisk engelska"
-
-#: ../gtk/gtkdialogs.c:132
-msgid "Canadian English"
-msgstr "Kanadensiskt engelska"
-
-#: ../gtk/gtkdialogs.c:133
-msgid "British English"
-msgstr "Brittisk engelska"
-
-#: ../gtk/gtkdialogs.c:134
-msgid "Esperanto"
-msgstr "Esperanto"
-
-#: ../gtk/gtkdialogs.c:135
-#: ../gtk/gtkdialogs.c:192
-#: ../gtk/gtkdialogs.c:193
-#: ../gtk/gtkdialogs.c:194
-#: ../gtk/gtkdialogs.c:195
-msgid "Spanish"
-msgstr "Spanska"
-
-#: ../gtk/gtkdialogs.c:136
-#: ../gtk/gtkdialogs.c:137
-msgid "Euskera(Basque)"
-msgstr "Baskiska"
-
-#: ../gtk/gtkdialogs.c:138
-#: ../gtk/gtkdialogs.c:139
-#: ../gtk/gtkdialogs.c:140
-msgid "Persian"
-msgstr "Persiska"
-
-#: ../gtk/gtkdialogs.c:141
-#: ../gtk/gtkdialogs.c:196
-#: ../gtk/gtkdialogs.c:197
-msgid "Finnish"
-msgstr "Finska"
-
-#: ../gtk/gtkdialogs.c:142
-#: ../gtk/gtkdialogs.c:198
-#: ../gtk/gtkdialogs.c:199
-#: ../gtk/gtkdialogs.c:200
-#: ../gtk/gtkdialogs.c:201
-msgid "French"
-msgstr "Franska"
-
-#: ../gtk/gtkdialogs.c:143
-msgid "Galician"
-msgstr "Galiciska"
-
-#: ../gtk/gtkdialogs.c:144
-#: ../gtk/gtkdialogs.c:145
-msgid "Gujarati"
-msgstr "Gujarati"
-
-#: ../gtk/gtkdialogs.c:146
-#: ../gtk/gtkdialogs.c:202
-msgid "Hebrew"
-msgstr "Hebreiska"
-
-#: ../gtk/gtkdialogs.c:147
-msgid "Hindi"
-msgstr "Hindi"
-
-#: ../gtk/gtkdialogs.c:148
-msgid "Hungarian"
-msgstr "Ungerska"
-
-#: ../gtk/gtkdialogs.c:149
-#: ../gtk/gtkdialogs.c:203
-msgid "Italian"
-msgstr "Italienska"
-
-#: ../gtk/gtkdialogs.c:150
-#: ../gtk/gtkdialogs.c:204
-#: ../gtk/gtkdialogs.c:205
-#: ../gtk/gtkdialogs.c:206
-msgid "Japanese"
-msgstr "Japanska"
-
-#: ../gtk/gtkdialogs.c:151
-#: ../gtk/gtkdialogs.c:207
-msgid "Georgian"
-msgstr "Georgiska"
-
-#: ../gtk/gtkdialogs.c:152
-#: ../gtk/gtkdialogs.c:208
-msgid "Korean"
-msgstr "Koreanska"
-
-#: ../gtk/gtkdialogs.c:153
-#: ../gtk/gtkdialogs.c:154
-#: ../gtk/gtkdialogs.c:155
-msgid "Kurdish"
-msgstr "Kurdiska"
-
-#: ../gtk/gtkdialogs.c:156
-#: ../gtk/gtkdialogs.c:209
-#: ../gtk/gtkdialogs.c:210
-msgid "Lithuanian"
-msgstr "Lettl辰ndska"
-
-#: ../gtk/gtkdialogs.c:157
-msgid "Macedonian"
-msgstr "Makedonska"
-
-#: ../gtk/gtkdialogs.c:158
-msgid "Nepali"
-msgstr "Nepalska"
-
-#: ../gtk/gtkdialogs.c:159
-msgid "Dutch, Flemish"
-msgstr "Holl辰ndska, Flaml辰ndska"
-
-#: ../gtk/gtkdialogs.c:160
-msgid "Norwegian"
-msgstr "Norska"
-
-#: ../gtk/gtkdialogs.c:161
-#: ../gtk/gtkdialogs.c:162
-#: ../gtk/gtkdialogs.c:211
-msgid "Polish"
-msgstr "Polska"
-
-#: ../gtk/gtkdialogs.c:163
-msgid "Portuguese"
-msgstr "Portugisiska"
-
-#: ../gtk/gtkdialogs.c:164
-msgid "Portuguese-Brazil"
-msgstr "Portugisiska (brasiliansk)"
-
-#: ../gtk/gtkdialogs.c:165
-msgid "Romanian"
-msgstr "Rum辰nska"
-
-#: ../gtk/gtkdialogs.c:166
-#: ../gtk/gtkdialogs.c:212
-#: ../gtk/gtkdialogs.c:213
-msgid "Russian"
-msgstr "Ryska"
-
-#: ../gtk/gtkdialogs.c:167
-#: ../gtk/gtkdialogs.c:168
-msgid "Serbian"
-msgstr "Serbiska"
-
-#: ../gtk/gtkdialogs.c:169
-#: ../gtk/gtkdialogs.c:214
-msgid "Slovak"
-msgstr "Slovakiska"
-
-#: ../gtk/gtkdialogs.c:170
-#: ../gtk/gtkdialogs.c:215
-msgid "Slovenian"
-msgstr "Slovenska"
-
-#: ../gtk/gtkdialogs.c:171
-msgid "Albanian"
-msgstr "Albanska"
-
-#: ../gtk/gtkdialogs.c:172
-#: ../gtk/gtkdialogs.c:216
-msgid "Swedish"
-msgstr "Svenska"
-
-#: ../gtk/gtkdialogs.c:173
-msgid "Tamil"
-msgstr "Tamilska"
-
-#: ../gtk/gtkdialogs.c:174
-msgid "Telugu"
-msgstr "Telugu"
-
-#: ../gtk/gtkdialogs.c:175
-msgid "Thai"
-msgstr "Thail辰ndska"
-
-#: ../gtk/gtkdialogs.c:176
-msgid "Turkish"
-msgstr "Turkiska"
-
-#: ../gtk/gtkdialogs.c:177
-msgid "Vietnamese"
-msgstr "Vietnamesiska"
-
-#: ../gtk/gtkdialogs.c:177
-msgid "T.M.Thanh and the Gnome-Vi Team"
-msgstr "T.M.Thanh och Gnome-Vi Teamet"
-
-#: ../gtk/gtkdialogs.c:178
-#: ../gtk/gtkdialogs.c:217
-msgid "Simplified Chinese"
-msgstr "F旦renklad kinesiska"
-
-#: ../gtk/gtkdialogs.c:179
-#: ../gtk/gtkdialogs.c:180
-#: ../gtk/gtkdialogs.c:218
-msgid "Traditional Chinese"
-msgstr "Traditionell kinesiska"
-
-#: ../gtk/gtkdialogs.c:186
-msgid "Amharic"
-msgstr "Amhariska"
-
-#: ../gtk/gtkdialogs.c:298
-msgid "About Gaim"
-msgstr "Om Gaim"
-
-#: ../gtk/gtkdialogs.c:332
-msgid "Gaim is a modular messaging client capable of using AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at once.  It is written using GTK+.<BR><BR>You may modify and redistribute the program under the terms of the GPL (version 2 or later).  A copy of the GPL is contained in the 'COPYING' file distributed with Gaim.  Gaim is copyrighted by its contributors.  See the 'COPYRIGHT' file for the complete list of contributors.  We provide no warranty for this program.<BR><BR>"
-msgstr "Gaim 辰r en modul辰r meddelandeklient kapabel att anv辰nda AIM, MSN, Yahoo!, Jabber, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu och QQ samtidigt.  Det 辰r skrivet med GTK+.<BR><BR>Du kan 辰ndra och distribuera programmet enligt GPL (version 2 eller senare).  En kopia av GPL finns i filen 'COPYING' som kommer med Gaim.  Gaim 辰r kopieringsskyddad av dess bidragsgivare.  Se filen 'COPYRIGHT' f旦r en komplett lista av bidragsgivare.  Vi ger inga garantier f旦r detta program.<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:347
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #wingaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #wingaim p奪 irc.freenode.net<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:350
-msgid "<FONT SIZE=\"4\">IRC:</FONT> #gaim on irc.freenode.net<BR><BR>"
-msgstr "<FONT SIZE=\"4\">IRC:</FONT> #gaim p奪 irc.freenode.net<BR><BR>"
-
-#: ../gtk/gtkdialogs.c:356
-msgid "Current Developers"
-msgstr "Nuvarande utvecklare"
-
-#: ../gtk/gtkdialogs.c:371
-msgid "Crazy Patch Writers"
-msgstr "Programmerare av galna patchar"
-
-#: ../gtk/gtkdialogs.c:386
-msgid "Retired Developers"
-msgstr "F旦re detta utvecklare"
-
-#: ../gtk/gtkdialogs.c:401
-msgid "Current Translators"
-msgstr "Nuvarande 旦vers辰ttare"
-
-#: ../gtk/gtkdialogs.c:421
-msgid "Past Translators"
-msgstr "F旦re detta 旦vers辰ttare"
-
-#: ../gtk/gtkdialogs.c:439
-msgid "Debugging Information"
-msgstr "Fels旦kningsinformation"
-
-#: ../gtk/gtkdialogs.c:813
-msgid "Get User Info"
-msgstr "H辰mta anv辰ndarinformation"
-
-#: ../gtk/gtkdialogs.c:815
-msgid "Please enter the screen name or alias of the person whose info you would like to view."
-msgstr "Ange anv辰ndar-ID eller alias f旦r den person vars information du vill visa."
-
-#: ../gtk/gtkdialogs.c:904
-msgid "View User Log"
-msgstr "Visa anv辰ndarlogg"
-
-#: ../gtk/gtkdialogs.c:906
-msgid "Please enter the screen name or alias of the person whose log you would like to view."
-msgstr "Ange anv辰ndar-ID eller alias f旦r den person vars logg du vill visa."
-
-#: ../gtk/gtkdialogs.c:925
-msgid "Alias Contact"
-msgstr "Kontaktalias"
-
-#: ../gtk/gtkdialogs.c:926
-msgid "Enter an alias for this contact."
-msgstr "Ange ett alias f旦r denna kontakt."
-
-#: ../gtk/gtkdialogs.c:946
-#, c-format
-msgid "Enter an alias for %s."
-msgstr "Ange ett alias f旦r %s."
-
-#: ../gtk/gtkdialogs.c:948
-msgid "Alias Buddy"
-msgstr "Kompisalias"
-
-#: ../gtk/gtkdialogs.c:967
-msgid "Alias Chat"
-msgstr "Chattalias"
-
-#: ../gtk/gtkdialogs.c:968
-msgid "Enter an alias for this chat."
-msgstr "Ange ett alias f旦r denna chatt."
-
-#: ../gtk/gtkdialogs.c:1005
-#, 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] "Du h奪ller p奪 att ta bort kontakten som inneh奪ller %s och %d annan kompis fr奪n din kompislista. Vill du forts辰tta?"
-msgstr[1] "Du h奪ller p奪 att ta bort kontakten som inneh奪ller %s och %d andra kompisar fr奪n din kompislista. Vill du forts辰tta?"
-
-#: ../gtk/gtkdialogs.c:1013
-msgid "Remove Contact"
-msgstr "Ta bort kontakt"
-
-#: ../gtk/gtkdialogs.c:1014
-msgid "_Remove Contact"
-msgstr "Ta bo_rt kontakt"
-
-#: ../gtk/gtkdialogs.c:1044
-#, c-format
-msgid "You are about to merge the group called %s into the group called %s. Do you want to continue?"
-msgstr "Du h奪ller p奪 att sl奪 ihop gruppen %s med gruppen %s. Vill du forts辰tta?"
-
-#: ../gtk/gtkdialogs.c:1051
-msgid "Merge Groups"
-msgstr "Sl奪 ihop grupper"
-
-#: ../gtk/gtkdialogs.c:1052
-msgid "_Merge Groups"
-msgstr "_Sl奪 ihop grupper"
-
-#: ../gtk/gtkdialogs.c:1102
-#, 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 "Du h奪ller p奪 att ta bort gruppen %s och alla dess medlemmar fr奪n din kompislista. Vill du forts辰tta?"
-
-#: ../gtk/gtkdialogs.c:1105
-msgid "Remove Group"
-msgstr "Ta bort grupp"
-
-#: ../gtk/gtkdialogs.c:1106
-msgid "_Remove Group"
-msgstr "Ta bo_rt grupp"
-
-#: ../gtk/gtkdialogs.c:1139
-#, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "Du h奪ller p奪 att ta bort %s fr奪n din kompislista. Vill du forts辰tta?"
-
-#: ../gtk/gtkdialogs.c:1142
-msgid "Remove Buddy"
-msgstr "Ta bort kompis"
-
-#: ../gtk/gtkdialogs.c:1143
-msgid "_Remove Buddy"
-msgstr "Ta bo_rt kompis"
-
-#: ../gtk/gtkdialogs.c:1164
-#, c-format
-msgid "You are about to remove the chat %s from your buddy list.  Do you want to continue?"
-msgstr "Du h奪ller p奪 att ta bort chatten %s fr奪n din kompislista. Vill du forts辰tta?"
-
-#: ../gtk/gtkdialogs.c:1167
-msgid "Remove Chat"
-msgstr "Ta bort chatt"
-
-#: ../gtk/gtkdialogs.c:1168
-msgid "_Remove Chat"
-msgstr "Ta bo_rt chatt"
-
-#: ../gtk/gtkdocklet.c:149
-msgid "Right-click for more unread messages...\n"
-msgstr "H旦gerklicka f旦r fler ol辰sta meddelanden...\n"
-
-#: ../gtk/gtkdocklet.c:456
-msgid "Change Status"
-msgstr "�ndra status"
-
-#: ../gtk/gtkdocklet.c:459
-#: ../gtk/gtkstatusbox.c:987
-#: ../libgaim/protocols/gg/gg.c:996
-#: ../libgaim/protocols/jabber/buddy.c:1373
-#: ../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 "Tillg辰nglig"
-
-#. 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:1820
-#: ../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:1377
-#: ../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 "Fr奪nvarande"
-
-#: ../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 "Osynlig"
-
-#: ../gtk/gtkdocklet.c:508
-msgid "Show Buddy List"
-msgstr "Visa kompislistan"
-
-#: ../gtk/gtkdocklet.c:534
-msgid "New Message..."
-msgstr "Nytt meddelande..."
-
-#: ../gtk/gtkdocklet.c:549
-msgid "Mute Sounds"
-msgstr "St辰ng av ljud"
-
-#: ../gtk/gtkdocklet.c:556
-msgid "Blink on new message"
-msgstr "Blinka vid nya meddelande"
-
-#. 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 "Avsluta"
-
-#: ../gtk/gtkft.c:133
-#, c-format
-msgid "%.2f KB/s"
-msgstr "%.2f KB/s"
-
-#: ../gtk/gtkft.c:153
-msgid "Not started"
-msgstr "Ej startad"
-
-#: ../gtk/gtkft.c:159
-#: ../libgaim/account.c:1714
-#: ../libgaim/protocols/gg/gg.c:1002
-#: ../libgaim/protocols/jabber/buddy.c:629
-#: ../libgaim/protocols/jabber/buddy.c:1367
-#: ../libgaim/protocols/jabber/buddy.c:1384
-#: ../libgaim/protocols/novell/novell.c:2866
-#: ../libgaim/protocols/qq/qq.c:230
-msgid "Unknown"
-msgstr "Ok辰nd"
-
-#: ../gtk/gtkft.c:162
-#: ../gtk/gtkft.c:1119
-msgid "Finished"
-msgstr "F辰rdig"
-
-#: ../gtk/gtkft.c:165
-#: ../gtk/gtkft.c:1059
-msgid "Canceled"
-msgstr "Avbruten"
-
-#: ../gtk/gtkft.c:168
-#: ../gtk/gtkft.c:975
-msgid "Waiting for transfer to begin"
-msgstr "V辰ntar p奪 att 旦verf旦ringen ska inledas"
-
-#: ../gtk/gtkft.c:228
-#, c-format
-msgid "File Transfers - %d%% of %d files"
-msgstr "Fil旦verf旦ringar - %d%% av %d filer"
-
-#: ../gtk/gtkft.c:233
-#: ../gtk/gtkft.c:763
-msgid "File Transfers"
-msgstr "Fil旦verf旦ringar"
-
-#: ../gtk/gtkft.c:273
-msgid "<b>Receiving As:</b>"
-msgstr "<b>Tar emot som:</b>"
-
-#: ../gtk/gtkft.c:275
-msgid "<b>Receiving From:</b>"
-msgstr "<b>Tar emot fr奪n:</b>"
-
-#: ../gtk/gtkft.c:279
-msgid "<b>Sending To:</b>"
-msgstr "<b>Skickar till:</b>"
-
-#: ../gtk/gtkft.c:281
-msgid "<b>Sending As:</b>"
-msgstr "<b>Skickar som:</b>"
-
-#: ../gtk/gtkft.c:497
-msgid "There is no application configured to open this type of file."
-msgstr "Det finns ingen applikation konfigurarad att 旦ppna den h辰r typen av fil."
-
-#: ../gtk/gtkft.c:502
-msgid "An error occurred while opening the file."
-msgstr "Ett fel uppstod n辰r filen 旦ppnades."
-
-#: ../gtk/gtkft.c:539
-#, c-format
-msgid "Error launching %s: %s"
-msgstr "Fel vid k旦rning av %s: %s"
-
-#: ../gtk/gtkft.c:548
-#, c-format
-msgid "Error running %s"
-msgstr "Fel vid k旦rning av %s"
-
-#: ../gtk/gtkft.c:549
-#, c-format
-msgid "Process returned error code %d"
-msgstr "Processen gav felkod %d"
-
-#: ../gtk/gtkft.c:644
-msgid "Progress"
-msgstr "�verf旦rt"
-
-#: ../gtk/gtkft.c:651
-msgid "Filename"
-msgstr "Filnamn"
-
-#: ../gtk/gtkft.c:658
-msgid "Size"
-msgstr "Storlek"
-
-#: ../gtk/gtkft.c:665
-msgid "Remaining"
-msgstr "�terst奪r"
-
-#: ../gtk/gtkft.c:696
-msgid "Filename:"
-msgstr "Filnamn:"
-
-#: ../gtk/gtkft.c:697
-msgid "Local File:"
-msgstr "Lokal fil:"
-
-#: ../gtk/gtkft.c:699
-msgid "Speed:"
-msgstr "Hastighet:"
-
-#: ../gtk/gtkft.c:700
-msgid "Time Elapsed:"
-msgstr "Tid som g奪tt:"
-
-#: ../gtk/gtkft.c:701
-msgid "Time Remaining:"
-msgstr "Tid som 奪terst奪r:"
-
-#: ../gtk/gtkft.c:786
-msgid "Close this window when all transfers _finish"
-msgstr "St辰ng detta _f旦nster d奪 alla 旦verf旦ringar 辰r klara"
-
-#: ../gtk/gtkft.c:796
-msgid "C_lear finished transfers"
-msgstr "_Rensa bort f辰rdiga 旦verf旦ringar"
-
-#. "Download Details" arrow
-#: ../gtk/gtkft.c:805
-msgid "File transfer _details"
-msgstr "_Detaljerad fil旦verf旦ringsinformation"
-
-#. Resume button
-#: ../gtk/gtkft.c:845
-msgid "_Resume"
-msgstr "_�teruppta"
-
-#: ../gtk/gtkft.c:1061
-msgid "Failed"
-msgstr "Misslyckades"
-
-#: ../gtk/gtkimhtml.c:793
-msgid "Paste as Plain _Text"
-msgstr "Klistra in som ren _text"
-
-#: ../gtk/gtkimhtml.c:810
-msgid "_Reset formatting"
-msgstr "_Rensa formatering"
-
-#: ../gtk/gtkimhtml.c:1295
-msgid "Hyperlink color"
-msgstr "F辰rg p奪 l辰nkar"
-
-#: ../gtk/gtkimhtml.c:1296
-msgid "Color to draw hyperlinks."
-msgstr "F辰rg som l辰nkar ska ha."
-
-# "utpekade" var det b辰sta ord jag kunde komma p奪.
-#: ../gtk/gtkimhtml.c:1299
-msgid "Hyperlink prelight color"
-msgstr "F辰rg p奪 utpekade l辰nkar"
-
-#: ../gtk/gtkimhtml.c:1300
-msgid "Color to draw hyperlinks when mouse is over them."
-msgstr "F辰rg som l辰nkar ska ha n辰r musmark旦ren 辰r ovanf旦r dem."
-
-#: ../gtk/gtkimhtml.c:1516
-msgid "_Copy E-Mail Address"
-msgstr "_Kopiera e-postadress"
-
-#: ../gtk/gtkimhtml.c:1528
-msgid "_Open Link in Browser"
-msgstr "_�ppna l辰nk i webbl辰sare"
-
-#: ../gtk/gtkimhtml.c:1538
-msgid "_Copy Link Location"
-msgstr "_Kopiera l辰nk"
-
-#: ../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'>Ok辰nd filtyp</span>\n"
-"\n"
-"Tillbakafaller till PNG."
-
-#: ../gtk/gtkimhtml.c:3274
-msgid ""
-"Unrecognized file type\n"
-"\n"
-"Defaulting to PNG."
-msgstr ""
-"Ok辰nd filtyp\n"
-"\n"
-"Tillbakafaller till 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'>Fel n辰r bild sparades</span>\n"
-"\n"
-"%s"
-
-#: ../gtk/gtkimhtml.c:3290
-#, c-format
-msgid ""
-"Error saving image\n"
-"\n"
-"%s"
-msgstr ""
-"Fel n辰r bild sparades\n"
-"\n"
-"%s"
-
-#: ../gtk/gtkimhtml.c:3370
-#: ../gtk/gtkimhtml.c:3382
-msgid "Save Image"
-msgstr "Spara bild"
-
-#: ../gtk/gtkimhtml.c:3410
-msgid "_Save Image..."
-msgstr "_Spara bild..."
-
-#: ../gtk/gtkimhtmltoolbar.c:147
-msgid "Select Font"
-msgstr "V辰lj typsnitt"
-
-#: ../gtk/gtkimhtmltoolbar.c:226
-msgid "Select Text Color"
-msgstr "V辰lj textf辰rg"
-
-#: ../gtk/gtkimhtmltoolbar.c:305
-msgid "Select Background Color"
-msgstr "V辰lj bakgrundsf辰rg"
-
-#: ../gtk/gtkimhtmltoolbar.c:394
-msgid "_URL"
-msgstr "_URL"
-
-#: ../gtk/gtkimhtmltoolbar.c:402
-msgid "_Description"
-msgstr "_Beskrivning"
-
-#: ../gtk/gtkimhtmltoolbar.c:405
-msgid "Please enter the URL and description of the link that you want to insert. The description is optional."
-msgstr "Ange URL och beskrivning av l辰nken du vill infoga. Beskrivningen 辰r inte obligatorisk."
-
-#: ../gtk/gtkimhtmltoolbar.c:409
-msgid "Please enter the URL of the link that you want to insert."
-msgstr "Ange URL f旦r l辰nken du vill infoga."
-
-#: ../gtk/gtkimhtmltoolbar.c:414
-msgid "Insert Link"
-msgstr "Infoga l辰nk"
-
-#: ../gtk/gtkimhtmltoolbar.c:418
-msgid "_Insert"
-msgstr "_Infoga"
-
-#: ../gtk/gtkimhtmltoolbar.c:487
-#, c-format
-msgid "Failed to store image: %s\n"
-msgstr "Kunde inte spara bilden: %s\n"
-
-#: ../gtk/gtkimhtmltoolbar.c:513
-#: ../gtk/gtkimhtmltoolbar.c:523
-msgid "Insert Image"
-msgstr "Infoga bild"
-
-#: ../gtk/gtkimhtmltoolbar.c:721
-msgid "This theme has no available smileys."
-msgstr "Detta tema har inga tillg辰ngliga smileys."
-
-#. show everything
-#: ../gtk/gtkimhtmltoolbar.c:735
-msgid "Smile!"
-msgstr "Smile!"
-
-#: ../gtk/gtkimhtmltoolbar.c:922
-msgid "Bold"
-msgstr "Fet"
-
-#: ../gtk/gtkimhtmltoolbar.c:933
-msgid "Italic"
-msgstr "Kursiv"
-
-#: ../gtk/gtkimhtmltoolbar.c:944
-msgid "Underline"
-msgstr "Understruken"
-
-#: ../gtk/gtkimhtmltoolbar.c:960
-msgid "Larger font size"
-msgstr "St旦rre typsnittsstorlek"
-
-#: ../gtk/gtkimhtmltoolbar.c:972
-msgid "Smaller font size"
-msgstr "Mindre typsnittsstorlek"
-
-#: ../gtk/gtkimhtmltoolbar.c:989
-msgid "Font face"
-msgstr "Typsnitt"
-
-#: ../gtk/gtkimhtmltoolbar.c:1001
-msgid "Foreground font color"
-msgstr "Textf辰rg"
-
-#: ../gtk/gtkimhtmltoolbar.c:1013
-msgid "Background color"
-msgstr "Bakgrundsf辰rg"
-
-#: ../gtk/gtkimhtmltoolbar.c:1029
-msgid "Reset formatting"
-msgstr "Rensa formatering"
-
-#: ../gtk/gtkimhtmltoolbar.c:1044
-msgid "Insert link"
-msgstr "Infoga l辰nk"
-
-#: ../gtk/gtkimhtmltoolbar.c:1054
-msgid "Insert image"
-msgstr "Infoga bild"
-
-#: ../gtk/gtkimhtmltoolbar.c:1065
-msgid "Insert smiley"
-msgstr "Infoga smiley"
-
-#: ../gtk/gtklog.c:234
-#, c-format
-msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
-msgstr "<span size='larger' weight='bold'>Konversation i %s p奪 %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'>Konversation med %s p奪 %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 "Systemh辰ndelser kommer endast att loggas om alternativet \"Logga alla statusf旦r辰ndringar till systemloggen\" 辰r aktiverat i inst辰llningarna."
-
-#: ../gtk/gtklog.c:335
-msgid "Instant messages will only be logged if the \"Log all instant messages\" preference is enabled."
-msgstr "Snabbmeddelanden kommer endast att loggas om alternativet \"Logga alla snabbmeddelanden\" 辰r aktiverat i inst辰llningarna."
-
-#: ../gtk/gtklog.c:338
-msgid "Chats will only be logged if the \"Log all chats\" preference is enabled."
-msgstr "Chattar kommer endast att loggas om alternativet \"Logga alla chattar\" 辰r aktiverat i inst辰llningarna."
-
-#: ../gtk/gtklog.c:342
-msgid "No logs were found"
-msgstr "Inga loggar hittades"
-
-#. Steal the "HELP" response and use it to trigger browsing to the logs folder
-#: ../gtk/gtklog.c:357
-msgid "_Browse logs folder"
-msgstr "_Bl辰ddra bland logg-kataloger"
-
-#: ../gtk/gtklog.c:425
-msgid "Total log size:"
-msgstr "Total loggstorlek"
-
-#: ../gtk/gtklog.c:494
-#, c-format
-msgid "Conversations in %s"
-msgstr "Konversationer i %s"
-
-#: ../gtk/gtklog.c:502
-#: ../gtk/gtklog.c:553
-#, c-format
-msgid "Conversations with %s"
-msgstr "Konversationer med %s"
-
-#: ../gtk/gtklog.c:578
-msgid "System Log"
-msgstr "Systemlogg"
-
-#: ../gtk/gtkmain.c:344
-#, c-format
-msgid "Gaim %s. Try `%s -h' for more information.\n"
-msgstr "Gaim %s. F旦rs旦k med \"%s -h\" f旦r mer information.\n"
-
-# FIXME: Ska "FLAGGA" anv辰ndas ist辰llet f旦r "ALTERNATIV" h辰r?
-#: ../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"
-"Anv辰ndning: %s [ALTERNATIV]...\n"
-"\n"
-"  -c, --config=MAPP   anv辰nd MAPP f旦r konfigurationsfiler\n"
-"  -d, --debug         skriv fels旦kningsinformation till standardut\n"
-"  -h, --help          visa denna hj辰lp och avsluta\n"
-"  -n, --nologin       logga inte in automatiskt\n"
-"  -l, --login[=NAMN]  logga in automatiskt (frivilliga argumentet NAMN\n"
-"                      anger kontot/kontona som ska anv辰ndas, separerade\n"
-"                      med kommatecken)\n"
-"  -v, --version       visa den nuvarande versionen och avsluta\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 ""
-"Gaim harr奪kat ut f旦r ett segmenteringsfel och f旦rs旦kte att dumpa k辰rnan till fil.\n"
-"Detta 辰r ett fel i mjukvaran och beror inte p奪 n奪got fel du gjort.\n"
-"\n"
-"Om du kan 奪terskapa krashen, var v辰nlig att meddela utvecklarna f旦r Gaim\n"
-"genom att rapportera felet vid\n"
-"%sbug.php\n"
-"\n"
-"Var god och meddela vad du gjorde vid tillf辰llet\n"
-"och posta backtraceen fr奪n k辰rn-filen. Om du inte vet hur du skapar en backtrace,\n"
-"var god l辰s instruktionerna p奪\n"
-"%sgdb.php\n"
-"\n"
-"Om du beh旦ver ytterligare hj辰lp s奪 kan du skicka ett meddelande till antingen\n"
-"SeanEgn eller LSchiere (via AIM). Hur du f奪r tag p奪 dem finner du p奪\n"
-"%scontactinfo.php\n"
-
-#: ../gtk/gtknotify.c:344
-#: ../gtk/gtknotify.c:539
-#, c-format
-msgid "<b>You have %d new e-mail.</b>"
-msgid_plural "<b>You have %d new e-mails.</b>"
-msgstr[0] "<b> Du har %d nytt epost.</b>"
-msgstr[1] "<b> Du har %d nya epost.</b>"
-
-#: ../gtk/gtknotify.c:378
-msgid "Open All Messages"
-msgstr "�ppna alla meddelanden"
-
-#: ../gtk/gtknotify.c:450
-msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
-msgstr "<span weight=\"bold\" size=\"larger\">Du har f奪tt e-post!!</span>"
-
-#: ../gtk/gtknotify.c:517
-#, c-format
-msgid "%s has %d new message."
-msgid_plural "%s has %d new messages."
-msgstr[0] "%s har %d nytt meddelande."
-msgstr[1] "%s har %d nya meddelanden."
-
-#: ../gtk/gtknotify.c:522
-#, c-format
-msgid ""
-"<span weight=\"bold\" size=\"larger\">You have mail!</span>\n"
-"\n"
-"%s"
-msgstr ""
-"<span weight=\"bold\" size=\"larger\">Du har f奪tt e-post!</span>\n"
-"\n"
-"%s"
-
-#: ../gtk/gtknotify.c:720
-#: ../libgaim/protocols/sametime/sametime.c:5534
-msgid "Search Results"
-msgstr "S旦kresultat"
-
-#: ../gtk/gtknotify.c:920
-#, c-format
-msgid "The browser command \"%s\" is invalid."
-msgstr "Kommandot f旦r webbl辰saren \"%s\" 辰r ogiltigt."
-
-#: ../gtk/gtknotify.c:922
-#: ../gtk/gtknotify.c:934
-#: ../gtk/gtknotify.c:947
-#: ../gtk/gtknotify.c:1075
-msgid "Unable to open URL"
-msgstr "Kan inte 旦ppna URL"
-
-#: ../gtk/gtknotify.c:932
-#: ../gtk/gtknotify.c:945
-#, c-format
-msgid "Error launching \"%s\": %s"
-msgstr "Fel vid k旦rning av \"%s\": %s"
-
-#: ../gtk/gtknotify.c:1076
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
-msgstr "Manuellt webbl辰sarkommando har valts, men inget kommando angivits."
-
-#: ../gtk/gtkplugin.c:274
-msgid "The following plugins will be unloaded."
-msgstr "De f旦ljande modulerna kommer avladdas."
-
-#: ../gtk/gtkplugin.c:293
-msgid "Multiple plugins will be unloaded."
-msgstr "Multibla moduler kommer bli avladdade."
-
-#: ../gtk/gtkplugin.c:295
-msgid "Unload Plugins"
-msgstr "Avladda insticksmoduler"
-
-#: ../gtk/gtkplugin.c:407
-#, 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\">Skriven av::</span>\t%s\n"
-"<span weight=\"bold\">Hemsida::</span>\t\t%s\n"
-"<span weight=\"bold\">Filnamn::</span>\t\t%s"
-
-#: ../gtk/gtkplugin.c:417
-#, 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\">Fel: %s\n"
-"S旦k efter en uppdatering f旦r modulen p奪 dess hemsida.</span>"
-
-#: ../gtk/gtkplugin.c:543
-msgid "Configure Pl_ugin"
-msgstr "Konfigurera Insticksmod_uler"
-
-#: ../gtk/gtkplugin.c:606
-msgid "<b>Plugin Details</b>"
-msgstr "<b>Detaljer f旦r modul</b>"
-
-#: ../gtk/gtkpounce.c:155
-msgid "Select a file"
-msgstr "V辰lj en fil"
-
-#: ../gtk/gtkpounce.c:251
-msgid "Please enter a buddy to pounce."
-msgstr "Ange en kompis som ska 旦vervakas."
-
-#: ../gtk/gtkpounce.c:505
-msgid "New Buddy Pounce"
-msgstr "Ny 旦vervakning"
-
-#: ../gtk/gtkpounce.c:505
-msgid "Edit Buddy Pounce"
-msgstr "�ndra 旦vervakning"
-
-#. Create the "Pounce on Whom" frame.
-#: ../gtk/gtkpounce.c:522
-msgid "Pounce on Whom"
-msgstr "�vervaka vem"
-
-#: ../gtk/gtkpounce.c:549
-msgid "_Buddy name:"
-msgstr "K_ompisnamn:"
-
-#. Create the "Pounce When Buddy..." frame.
-#: ../gtk/gtkpounce.c:575
-msgid "Pounce When Buddy..."
-msgstr "Rapportera n辰r kompisen..."
-
-#: ../gtk/gtkpounce.c:583
-msgid "Si_gns on"
-msgstr "_Ansluter"
-
-#: ../gtk/gtkpounce.c:585
-msgid "Signs o_ff"
-msgstr "_Kopplar ifr奪n"
-
-#: ../gtk/gtkpounce.c:587
-msgid "Goes a_way"
-msgstr "Blir _fr奪nvarande"
-
-#: ../gtk/gtkpounce.c:589
-msgid "Ret_urns from away"
-msgstr "_�terv辰nder fr奪n fr奪nvaro"
-
-#: ../gtk/gtkpounce.c:591
-msgid "Becomes _idle"
-msgstr "Blir _inaktiv"
-
-#: ../gtk/gtkpounce.c:593
-msgid "Is no longer i_dle"
-msgstr "_�r inte l辰ngre inaktiv"
-
-#: ../gtk/gtkpounce.c:595
-msgid "Starts _typing"
-msgstr "B旦rjar _skriva"
-
-#: ../gtk/gtkpounce.c:597
-msgid "P_auses while typing"
-msgstr "Pa_usar under skrivning"
-
-#: ../gtk/gtkpounce.c:599
-msgid "Stops t_yping"
-msgstr "Slutar s_kriva"
-
-#: ../gtk/gtkpounce.c:601
-msgid "Sends a _message"
-msgstr "Skickar ett _meddelande"
-
-#. Create the "Action" frame.
-#: ../gtk/gtkpounce.c:636
-msgid "Action"
-msgstr "Handling"
-
-#: ../gtk/gtkpounce.c:644
-msgid "Ope_n an IM window"
-msgstr "_�ppna ett snabbmeddelandef旦nster"
-
-#: ../gtk/gtkpounce.c:646
-msgid "_Pop up a notification"
-msgstr "Visa en _rapport"
-
-#: ../gtk/gtkpounce.c:648
-msgid "Send a _message"
-msgstr "Skicka ett _meddelande"
-
-#: ../gtk/gtkpounce.c:650
-msgid "E_xecute a command"
-msgstr "_K旦r ett kommando"
-
-#: ../gtk/gtkpounce.c:652
-msgid "P_lay a sound"
-msgstr "Spela upp ett _ljud"
-
-#: ../gtk/gtkpounce.c:657
-msgid "Brows_e..."
-msgstr "_Bl辰ddra..."
-
-#: ../gtk/gtkpounce.c:659
-msgid "Br_owse..."
-msgstr "B_l辰ddra..."
-
-#: ../gtk/gtkpounce.c:660
-msgid "Pre_view"
-msgstr "_F旦rhandsgranska"
-
-#: ../gtk/gtkpounce.c:784
-msgid "P_ounce only when my status is not available"
-msgstr "�_vervaka enbart d奪 min status 辰r fr奪nvarande"
-
-#: ../gtk/gtkpounce.c:789
-msgid "_Recurring"
-msgstr "�te_rkommande"
-
-#: ../gtk/gtkpounce.c:1095
-#, c-format
-msgid "Are you sure you want to delete the pounce on %s for %s?"
-msgstr "�r du s辰ker p奪 att du vill ta bort 旦vervakningen f旦r %s d奪 %s"
-
-#: ../gtk/gtkpounce.c:1243
-msgid "Pounce Target"
-msgstr "�vervaka m奪l"
-
-#: ../gtk/gtkpounce.c:1278
-msgid "Recurring"
-msgstr "�terkommande"
-
-#: ../gtk/gtkpounce.c:1325
-msgid "Buddy Pounces"
-msgstr "Kompis旦vervakningar"
-
-#: ../gtk/gtkpounce.c:1452
-#, c-format
-msgid "%s has started typing to you (%s)"
-msgstr "%s har b旦rjat skriva till dig (%s)"
-
-#: ../gtk/gtkpounce.c:1454
-#, c-format
-msgid "%s has paused while typing to you (%s)"
-msgstr "%s har pausat i meddelandet till dig (%s)"
-
-#: ../gtk/gtkpounce.c:1456
-#, c-format
-msgid "%s has signed on (%s)"
-msgstr "%s har loggat in (%s)"
-
-#: ../gtk/gtkpounce.c:1458
-#, c-format
-msgid "%s has returned from being idle (%s)"
-msgstr "%s har blivit aktiv igen (%s)"
-
-#: ../gtk/gtkpounce.c:1460
-#, c-format
-msgid "%s has returned from being away (%s)"
-msgstr "%s har kommit tillbaka (%s)"
-
-#: ../gtk/gtkpounce.c:1462
-#, c-format
-msgid "%s has stopped typing to you (%s)"
-msgstr "%s har slutat skriva till dig (%s)"
-
-#: ../gtk/gtkpounce.c:1464
-#, c-format
-msgid "%s has signed off (%s)"
-msgstr "%s har kopplat ifr奪n (%s)"
-
-#: ../gtk/gtkpounce.c:1466
-#, c-format
-msgid "%s has become idle (%s)"
-msgstr "%s har blivit inaktiv (%s)"
-
-#: ../gtk/gtkpounce.c:1468
-#, c-format
-msgid "%s has gone away. (%s)"
-msgstr "%s har g奪tt iv辰g. (%s)"
-
-#: ../gtk/gtkpounce.c:1470
-#, c-format
-msgid "%s has sent you a message. (%s)"
-msgstr "%s har s辰nt dig ett meddelande. (%s)"
-
-#: ../gtk/gtkpounce.c:1471
-msgid "Unknown pounce event. Please report this!"
-msgstr "Ok辰nd 旦vervakningsh辰ndelse (pounce event), var sn辰ll och rapportera detta!"
-
-#: ../gtk/gtkprefs.c:509
-msgid "Smiley theme failed to unpack."
-msgstr "Smiley temat kunde inte packas upp."
-
-#: ../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 "V辰lj det tema f旦r grafiska smileys som du vill anv辰nda fr奪n listan nedanf旦r. Nya teman kan installeras genom att dra och sl辰ppa dem p奪 temalistan."
-
-#: ../gtk/gtkprefs.c:673
-msgid "Icon"
-msgstr "Ikon"
-
-#: ../gtk/gtkprefs.c:816
-msgid "System Tray Icon"
-msgstr "Systempanelikon"
-
-#: ../gtk/gtkprefs.c:817
-msgid "_Show system tray icon:"
-msgstr "Vi_sa systempanelsikon:"
-
-#: ../gtk/gtkprefs.c:819
-#: ../gtk/gtkprefs.c:831
-#: ../gtk/gtkprefs.c:1645
-#: ../gtk/plugins/timestamp_format.c:39
-#: ../gtk/plugins/timestamp_format.c:48
-#: ../gtk/plugins/win32/winprefs/winprefs.c:335
-msgid "Always"
-msgstr "Alltid"
-
-#: ../gtk/gtkprefs.c:820
-#: ../gtk/gtkprefs.c:829
-#: ../gtk/gtkprefs.c:1810
-#: ../gtk/gtkprefs.c:1824
-#: ../gtk/plugins/win32/winprefs/winprefs.c:334
-msgid "Never"
-msgstr "Aldrig"
-
-#: ../gtk/gtkprefs.c:821
-msgid "On unread messages"
-msgstr "Vid ol辰sta meddeladen"
-
-#: ../gtk/gtkprefs.c:826
-msgid "Conversation Window Hiding"
-msgstr "D旦lj konversationsf旦nster"
-
-#: ../gtk/gtkprefs.c:827
-msgid "_Hide new IM conversations:"
-msgstr "_D旦lj nya IM konversationer:"
-
-#: ../gtk/gtkprefs.c:830
-#: ../gtk/gtkprefs.c:1825
-msgid "When away"
-msgstr "Vid fr奪nvaro"
-
-#. All the tab options!
-#: ../gtk/gtkprefs.c:838
-msgid "Tabs"
-msgstr "Flikar"
-
-#: ../gtk/gtkprefs.c:840
-msgid "Show IMs and chats in _tabbed windows"
-msgstr "Visa snabbmeddelanden och chattar i _flikf旦nster."
-
-#: ../gtk/gtkprefs.c:854
-msgid "Show close b_utton on tabs"
-msgstr "_Visa st辰ngningsknapp p奪 flikar"
-
-#: ../gtk/gtkprefs.c:857
-msgid "_Placement:"
-msgstr "_Placering:"
-
-#: ../gtk/gtkprefs.c:859
-msgid "Top"
-msgstr "�verst"
-
-#: ../gtk/gtkprefs.c:860
-msgid "Bottom"
-msgstr "Nederst"
-
-#: ../gtk/gtkprefs.c:861
-msgid "Left"
-msgstr "V辰nster"
-
-#: ../gtk/gtkprefs.c:862
-msgid "Right"
-msgstr "H旦ger"
-
-#: ../gtk/gtkprefs.c:864
-msgid "Left Vertical"
-msgstr "Vertikalt till v辰nster"
-
-#: ../gtk/gtkprefs.c:865
-msgid "Right Vertical"
-msgstr "Vertikalt till h旦ger"
-
-#: ../gtk/gtkprefs.c:872
-msgid "N_ew conversations:"
-msgstr "_Nya konversationer:"
-
-#: ../gtk/gtkprefs.c:900
-msgid "Show _formatting on incoming messages"
-msgstr "Visa _formaterade inkommande meddelanden"
-
-#: ../gtk/gtkprefs.c:903
-msgid "Show buddy _icons"
-msgstr "Visa kompis_ikoner"
-
-#: ../gtk/gtkprefs.c:905
-msgid "Enable buddy ic_on animation"
-msgstr "Aktivera _animering av kompisikoner"
-
-#: ../gtk/gtkprefs.c:912
-msgid "_Notify buddies that you are typing to them"
-msgstr "_Meddela kompisar att du skriver till dem"
-
-#: ../gtk/gtkprefs.c:915
-msgid "Highlight _misspelled words"
-msgstr "_Markera felstavade ord"
-
-#: ../gtk/gtkprefs.c:919
-msgid "Use smooth-scrolling"
-msgstr "Anv辰nd mjuk rullning"
-
-#: ../gtk/gtkprefs.c:922
-msgid "F_lash window when IMs are received"
-msgstr "B_linka med f旦nstret n辰r meddelanden tagits emot"
-
-#: ../gtk/gtkprefs.c:925
-msgid "Default Formatting"
-msgstr "F旦rvald Formatering"
-
-#: ../gtk/gtkprefs.c:941
-msgid "This is how your outgoing message text will appear when you use protocols that support formatting. :)"
-msgstr "S奪 h辰r kommer ditt utg奪ende meddelande att se ut n辰r du anv辰nder ett protokoll som st旦djer formatering. :)"
-
-#: ../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-adress"
-
-#: ../gtk/gtkprefs.c:1017
-msgid "ST_UN server:"
-msgstr "ST_UN-server:"
-
-#: ../gtk/gtkprefs.c:1029
-msgid "<span style=\"italic\">Example: stunserver.org</span>"
-msgstr "<span style=\"italic\">Exempel: stunserver.org</span>"
-
-#: ../gtk/gtkprefs.c:1033
-msgid "_Autodetect IP address"
-msgstr "K辰nn av IP-adress _automatiskt"
-
-#: ../gtk/gtkprefs.c:1042
-msgid "Public _IP:"
-msgstr "Publik _IP-adress:"
-
-#: ../gtk/gtkprefs.c:1071
-msgid "Ports"
-msgstr "Portar"
-
-#: ../gtk/gtkprefs.c:1074
-msgid "_Manually specify range of ports to listen on"
-msgstr "Ange _manuellt vilken portserie som ska anv辰ndas"
-
-#: ../gtk/gtkprefs.c:1077
-msgid "_Start port:"
-msgstr "_Startport:"
-
-#: ../gtk/gtkprefs.c:1084
-msgid "_End port:"
-msgstr "_Slutport:"
-
-#: ../gtk/gtkprefs.c:1092
-msgid "Proxy Server"
-msgstr "Proxyserver"
-
-#: ../gtk/gtkprefs.c:1096
-msgid "No proxy"
-msgstr "Ingen proxy"
-
-#: ../gtk/gtkprefs.c:1152
-msgid "_User:"
-msgstr "_Anv辰ndare:"
-
-#: ../gtk/gtkprefs.c:1215
-msgid "Seamonkey"
-msgstr "Seamonkey"
-
-#: ../gtk/gtkprefs.c:1216
-msgid "Opera"
-msgstr "Opera"
-
-#: ../gtk/gtkprefs.c:1217
-msgid "Netscape"
-msgstr "Netscape"
-
-#: ../gtk/gtkprefs.c:1218
-msgid "Mozilla"
-msgstr "Mozilla"
-
-#: ../gtk/gtkprefs.c:1219
-msgid "Konqueror"
-msgstr "Konqueror"
-
-#: ../gtk/gtkprefs.c:1220
-msgid "GNOME Default"
-msgstr "GNOMEs standardval"
-
-#: ../gtk/gtkprefs.c:1221
-msgid "Galeon"
-msgstr "Galeon"
-
-#: ../gtk/gtkprefs.c:1222
-msgid "Firefox"
-msgstr "Firefox"
-
-#: ../gtk/gtkprefs.c:1223
-msgid "Firebird"
-msgstr "Firebird"
-
-#: ../gtk/gtkprefs.c:1224
-msgid "Epiphany"
-msgstr "Epiphany"
-
-#: ../gtk/gtkprefs.c:1233
-msgid "Manual"
-msgstr "Manuell"
-
-#: ../gtk/gtkprefs.c:1286
-msgid "Browser Selection"
-msgstr "Val av webbl辰sare"
-
-#: ../gtk/gtkprefs.c:1290
-msgid "_Browser:"
-msgstr "Webb_l辰sare:"
-
-#: ../gtk/gtkprefs.c:1298
-msgid "_Open link in:"
-msgstr "_�ppna l辰nk i:"
-
-#: ../gtk/gtkprefs.c:1300
-msgid "Browser default"
-msgstr "F旦rvald webbl辰sare"
-
-#: ../gtk/gtkprefs.c:1301
-msgid "Existing window"
-msgstr "Befintligt f旦nster"
-
-#: ../gtk/gtkprefs.c:1303
-msgid "New tab"
-msgstr "Ny flik"
-
-#: ../gtk/gtkprefs.c:1317
-#, c-format
-msgid ""
-"_Manual:\n"
-"(%s for URL)"
-msgstr ""
-"_Manuell:\n"
-"(%s f旦r URL)"
-
-#: ../gtk/gtkprefs.c:1357
-msgid "Log _format:"
-msgstr "Logg _format:"
-
-#: ../gtk/gtkprefs.c:1362
-msgid "Log all _instant messages"
-msgstr "_Logga alla snabbmeddelanden"
-
-#: ../gtk/gtkprefs.c:1364
-msgid "Log all c_hats"
-msgstr "Logga alla _chattar"
-
-#: ../gtk/gtkprefs.c:1366
-msgid "Log all _status changes to system log"
-msgstr "Logga alla _statusf旦r辰ndringar till systemloggen"
-
-#: ../gtk/gtkprefs.c:1512
-msgid "Sound Selection"
-msgstr "Ljudval"
-
-#: ../gtk/gtkprefs.c:1520
-msgid "Quietest"
-msgstr "Tystast"
-
-#: ../gtk/gtkprefs.c:1522
-msgid "Quieter"
-msgstr "Tystare"
-
-#: ../gtk/gtkprefs.c:1524
-msgid "Quiet"
-msgstr "Tyst"
-
-#: ../gtk/gtkprefs.c:1526
-#: ../libgaim/protocols/silc/silc.c:666
-msgid "Normal"
-msgstr "Normal"
-
-#: ../gtk/gtkprefs.c:1528
-msgid "Loud"
-msgstr "H旦gt"
-
-#: ../gtk/gtkprefs.c:1530
-msgid "Louder"
-msgstr "H旦gre"
-
-#: ../gtk/gtkprefs.c:1532
-msgid "Loudest"
-msgstr "H旦gst"
-
-#: ../gtk/gtkprefs.c:1595
-msgid "Sound Method"
-msgstr "Ljudmetod"
-
-#: ../gtk/gtkprefs.c:1596
-msgid "_Method:"
-msgstr "_Metod:"
-
-#: ../gtk/gtkprefs.c:1598
-msgid "Console beep"
-msgstr "Konsolpip"
-
-#: ../gtk/gtkprefs.c:1600
-msgid "Automatic"
-msgstr "Automatisk"
-
-#: ../gtk/gtkprefs.c:1603
-msgid "Command"
-msgstr "Kommando"
-
-#: ../gtk/gtkprefs.c:1604
-msgid "No sounds"
-msgstr "Inga ljud"
-
-#: ../gtk/gtkprefs.c:1612
-#, c-format
-msgid ""
-"Sound c_ommand:\n"
-"(%s for filename)"
-msgstr ""
-"Ljud_kommando:\n"
-"(%s f旦r filnamn)"
-
-#: ../gtk/gtkprefs.c:1638
-msgid "Sound Options"
-msgstr "Ljudalternativ"
-
-#: ../gtk/gtkprefs.c:1639
-msgid "Sounds when conversation has _focus"
-msgstr "Ljud n辰r konversationsf旦nstret har _fokus"
-
-#: ../gtk/gtkprefs.c:1641
-msgid "Enable sounds:"
-msgstr "Aktivera ljud:"
-
-#: ../gtk/gtkprefs.c:1643
-msgid "Only when available"
-msgstr "Endast vid tillg辰nglig"
-
-#: ../gtk/gtkprefs.c:1644
-msgid "Only when not available"
-msgstr "Edast vid Ej tillg辰nglig"
-
-#: ../gtk/gtkprefs.c:1652
-msgid "Volume:"
-msgstr "Volum:"
-
-#: ../gtk/gtkprefs.c:1680
-msgid "Sound Events"
-msgstr "Ljudh辰ndelser"
-
-#: ../gtk/gtkprefs.c:1731
-msgid "Play"
-msgstr "Spela upp"
-
-#: ../gtk/gtkprefs.c:1738
-msgid "Event"
-msgstr "H辰ndelse"
-
-#: ../gtk/gtkprefs.c:1757
-msgid "Test"
-msgstr "Test"
-
-#: ../gtk/gtkprefs.c:1761
-msgid "Reset"
-msgstr "�terst辰ll"
-
-#: ../gtk/gtkprefs.c:1765
-msgid "Choose..."
-msgstr "V辰lj..."
-
-#: ../gtk/gtkprefs.c:1808
-msgid "_Report idle time:"
-msgstr "_Rapportera inaktivitetstid:"
-
-#: ../gtk/gtkprefs.c:1811
-msgid "From last sent message"
-msgstr "Fr奪n senast s辰nda meddelande"
-
-#: ../gtk/gtkprefs.c:1813
-msgid "Based on keyboard or mouse use"
-msgstr "Baserat p奪 tangetbord eller musanv辰ndning"
-
-#: ../gtk/gtkprefs.c:1822
-msgid "_Auto-reply:"
-msgstr "_Automatiskt svar:"
-
-#: ../gtk/gtkprefs.c:1826
-msgid "When both away and idle"
-msgstr "Vid b奪de fr奪nvaro och inaktivitet"
-
-#. Auto-away stuff
-#: ../gtk/gtkprefs.c:1832
-msgid "Auto-away"
-msgstr "Automatisk fr奪nvaro"
-
-#: ../gtk/gtkprefs.c:1834
-msgid "Change status when _idle"
-msgstr "�ndra status vid _inaktivitet"
-
-#: ../gtk/gtkprefs.c:1838
-msgid "_Minutes before changing status:"
-msgstr "_Minuter innan status ska 辰ndras:"
-
-#: ../gtk/gtkprefs.c:1846
-msgid "Change _status to:"
-msgstr "�ndra _status till:"
-
-#. Signon status stuff
-#: ../gtk/gtkprefs.c:1867
-msgid "Status at Startup"
-msgstr "Status vid uppstart"
-
-#: ../gtk/gtkprefs.c:1869
-msgid "Use status from last _exit at startup"
-msgstr "A_nv辰nd samma status som vid senaste avslutet"
-
-#: ../gtk/gtkprefs.c:1875
-msgid "Status to a_pply at startup:"
-msgstr "Status att anv辰nda vid u_ppstart:"
-
-#: ../gtk/gtkprefs.c:1913
-msgid "Interface"
-msgstr "Gr辰nssnitt"
-
-#: ../gtk/gtkprefs.c:1915
-msgid "Smiley Themes"
-msgstr "Smileyteman"
-
-#: ../gtk/gtkprefs.c:1916
-msgid "Sounds"
-msgstr "Ljud"
-
-#: ../gtk/gtkprefs.c:1917
-#: ../libgaim/protocols/silc/silc.c:1848
-msgid "Network"
-msgstr "N辰tverk"
-
-#: ../gtk/gtkprefs.c:1922
-msgid "Browser"
-msgstr "Webbl辰sare"
-
-#: ../gtk/gtkprefs.c:1926
-msgid "Status / Idle"
-msgstr "Status / Inaktiv"
-
-#: ../gtk/gtkprivacy.c:79
-msgid "Allow all users to contact me"
-msgstr "Till奪t alla anv辰ndare att kontakta mig"
-
-#: ../gtk/gtkprivacy.c:80
-msgid "Allow only the users on my buddy list"
-msgstr "Till奪t endast anv辰ndarna i min kompislista"
-
-#: ../gtk/gtkprivacy.c:81
-msgid "Allow only the users below"
-msgstr "Till奪t endast anv辰ndarna nedan"
-
-#: ../gtk/gtkprivacy.c:82
-msgid "Block all users"
-msgstr "Blockera alla anv辰ndare"
-
-#: ../gtk/gtkprivacy.c:83
-msgid "Block only the users below"
-msgstr "Blockera endast anv辰ndarna nedan"
-
-#: ../gtk/gtkprivacy.c:372
-msgid "Privacy"
-msgstr "Sp辰rrlista"
-
-#: ../gtk/gtkprivacy.c:385
-msgid "Changes to privacy settings take effect immediately."
-msgstr "�ndringar i sp辰rrlistans inst辰llningar b旦rjar g辰lla direkt."
-
-#. "Set privacy for:" label
-#: ../gtk/gtkprivacy.c:397
-msgid "Set privacy for:"
-msgstr "St辰ll in sp辰rrlista f旦r:"
-
-#: ../gtk/gtkprivacy.c:560
-#: ../gtk/gtkprivacy.c:576
-msgid "Permit User"
-msgstr "Till奪t anv辰ndare"
-
-#: ../gtk/gtkprivacy.c:561
-msgid "Type a user you permit to contact you."
-msgstr "Ange en anv辰ndare du till奪ter att kontakta dig."
-
-#: ../gtk/gtkprivacy.c:562
-msgid "Please enter the name of the user you wish to be able to contact you."
-msgstr "Ange namnet p奪 den anv辰ndare du vill ska kunna kontakta dig."
-
-#: ../gtk/gtkprivacy.c:565
-#: ../gtk/gtkprivacy.c:578
-msgid "_Permit"
-msgstr "_Till奪t"
-
-#: ../gtk/gtkprivacy.c:570
-#, c-format
-msgid "Allow %s to contact you?"
-msgstr "Till奪t %s att kontakta dig?"
-
-#: ../gtk/gtkprivacy.c:572
-#, c-format
-msgid "Are you sure you wish to allow %s to contact you?"
-msgstr "�r du s辰ker p奪 att du vill till奪ta %s att kontakta dig?"
-
-#: ../gtk/gtkprivacy.c:599
-#: ../gtk/gtkprivacy.c:612
-msgid "Block User"
-msgstr "Blockera anv辰ndare"
-
-#: ../gtk/gtkprivacy.c:600
-msgid "Type a user to block."
-msgstr "Ange en anv辰ndare som ska blockeras."
-
-#: ../gtk/gtkprivacy.c:601
-msgid "Please enter the name of the user you wish to block."
-msgstr "Ange namnet p奪 den anv辰ndare du vill blockera."
-
-#: ../gtk/gtkprivacy.c:603
-#: ../gtk/gtkprivacy.c:614
-msgid "_Block"
-msgstr "_Blockera"
-
-#: ../gtk/gtkprivacy.c:608
-#, c-format
-msgid "Block %s?"
-msgstr "Blockera %s?"
-
-#: ../gtk/gtkprivacy.c:610
-#, c-format
-msgid "Are you sure you want to block %s?"
-msgstr "�r du s辰ker p奪 att du vill blockera %s?"
-
-#. *
-#. * A wrapper for gaim_request_action() that uses @c Yes and @c No buttons.
-#.
-#: ../gtk/gtkrequest.c:267
-#: ../libgaim/protocols/msn/dialog.c:132
-#: ../libgaim/protocols/msn/msn.c:552
-#: ../libgaim/protocols/msn/msn.c:562
-#: ../libgaim/protocols/novell/novell.c:1918
-#: ../libgaim/protocols/silc/buddy.c:313
-#: ../libgaim/protocols/silc/pk.c:117
-#: ../libgaim/protocols/silc/wb.c:303
-#: ../libgaim/request.h:1335
-msgid "Yes"
-msgstr "Ja"
-
-#: ../gtk/gtkrequest.c:268
-#: ../libgaim/protocols/msn/dialog.c:133
-#: ../libgaim/protocols/msn/msn.c:552
-#: ../libgaim/protocols/msn/msn.c:562
-#: ../libgaim/protocols/novell/novell.c:1919
-#: ../libgaim/protocols/silc/buddy.c:314
-#: ../libgaim/protocols/silc/pk.c:118
-#: ../libgaim/protocols/silc/wb.c:304
-#: ../libgaim/request.h:1335
-msgid "No"
-msgstr "Nej"
-
-#: ../gtk/gtkrequest.c:271
-msgid "Apply"
-msgstr "Verkst辰ll"
-
-#: ../gtk/gtkrequest.c:1468
-msgid "That file already exists"
-msgstr "Filen finns redan."
-
-#: ../gtk/gtkrequest.c:1469
-msgid "Would you like to overwrite it?"
-msgstr "Vill du skriva 旦ver den?"
-
-#: ../gtk/gtkrequest.c:1470
-msgid "Overwrite"
-msgstr "Skriv 旦ver"
-
-#: ../gtk/gtkrequest.c:1471
-msgid "Choose New Name"
-msgstr "V辰lj nytt namn"
-
-#: ../gtk/gtkrequest.c:1513
-#: ../gtk/gtkrequest.c:1558
-msgid "Save File..."
-msgstr "Spara fil..."
-
-#: ../gtk/gtkrequest.c:1514
-#: ../gtk/gtkrequest.c:1559
-msgid "Open File..."
-msgstr "�ppna fil..."
-
-#: ../gtk/gtkrequest.c:1606
-#: ../gtk/gtkrequest.c:1620
-msgid "Select Folder..."
-msgstr "V辰lj katalog..."
-
-#: ../gtk/gtkroomlist.c:301
-msgid "_Add"
-msgstr "_L辰gg till"
-
-# "Rumslista" ist辰llet?
-#: ../gtk/gtkroomlist.c:369
-msgid "Room List"
-msgstr "Rumlista"
-
-#. list button
-#: ../gtk/gtkroomlist.c:439
-msgid "_Get List"
-msgstr "_H辰mta lista"
-
-#. add button
-#: ../gtk/gtkroomlist.c:447
-msgid "_Add Chat"
-msgstr "_L辰gg till chatt"
-
-#. Use button
-#: ../gtk/gtksavedstatuses.c:549
-#: ../gtk/gtksavedstatuses.c:1183
-msgid "_Use"
-msgstr "_Anv辰nd"
-
-#: ../gtk/gtksavedstatuses.c:695
-msgid "Title already in use.  You must choose a unique title."
-msgstr "Titeln anv辰nds redan. Du m奪ste v辰lja en unik titel."
-
-#: ../gtk/gtksavedstatuses.c:883
-msgid "Different"
-msgstr "Skillnad"
-
-#: ../gtk/gtksavedstatuses.c:1076
-msgid "_Title:"
-msgstr "_Titel"
-
-#: ../gtk/gtksavedstatuses.c:1095
-#: ../gtk/gtksavedstatuses.c:1416
-msgid "_Status:"
-msgstr "_Status:"
-
-#. Different status message expander
-#: ../gtk/gtksavedstatuses.c:1127
-msgid "Use a _different status for some accounts"
-msgstr "Anv辰nd en _annan status f旦r vissa konton"
-
-#. Save & Use button
-#: ../gtk/gtksavedstatuses.c:1191
-msgid "Sa_ve & Use"
-msgstr "Spara & An_v辰nd"
-
-#: ../gtk/gtksavedstatuses.c:1397
-#, c-format
-msgid "Status for %s"
-msgstr "Status f旦r %s"
-
-#: ../gtk/gtksound.c:63
-msgid "Buddy logs in"
-msgstr "Kompis loggar in"
-
-#: ../gtk/gtksound.c:64
-msgid "Buddy logs out"
-msgstr "Kompis loggar ut"
-
-# F旦rs旦ker h奪lla samma tempus som ovan.
-#: ../gtk/gtksound.c:65
-msgid "Message received"
-msgstr "Meddelande tas emot"
-
-#: ../gtk/gtksound.c:66
-msgid "Message received begins conversation"
-msgstr "Mottaget meddelande inleder konversation"
-
-#: ../gtk/gtksound.c:67
-msgid "Message sent"
-msgstr "Meddelande skickas"
-
-#: ../gtk/gtksound.c:68
-msgid "Person enters chat"
-msgstr "Person g奪r in i chatt"
-
-#: ../gtk/gtksound.c:69
-msgid "Person leaves chat"
-msgstr "Person l辰mnar chatt"
-
-#: ../gtk/gtksound.c:70
-msgid "You talk in chat"
-msgstr "Du pratar i chatt"
-
-#: ../gtk/gtksound.c:71
-msgid "Others talk in chat"
-msgstr "Andra pratar i chatt"
-
-#: ../gtk/gtksound.c:74
-msgid "Someone says your screen name in chat"
-msgstr "N奪gon n辰mner ditt sk辰rmnamn i en chatt"
-
-#: ../gtk/gtksound.c:310
-msgid "GStreamer Failure"
-msgstr "GStreamer fel"
-
-#: ../gtk/gtksound.c:311
-msgid "GStreamer failed to initialize."
-msgstr "GStreamer misslyckades med att initialisera."
-
-#. connect to the server
-#: ../gtk/gtkstatusbox.c:569
-#: ../libgaim/protocols/irc/irc.c:329
-#: ../libgaim/protocols/jabber/jabber.c:1019
-#: ../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:3731
-#: ../libgaim/protocols/simple/simple.c:1669
-#: ../libgaim/protocols/yahoo/yahoo.c:2710
-#: ../libgaim/protocols/zephyr/zephyr.c:1626
-msgid "Connecting"
-msgstr "Ansluter"
-
-#: ../gtk/gtkstatusbox.c:571
-msgid "Waiting for network connection"
-msgstr "V辰ntar p奪 n辰tverksanslutning."
-
-#: ../gtk/gtkutils.c:1310
-#: ../gtk/gtkutils.c:1333
-#, c-format
-msgid "The following error has occurred loading %s: %s"
-msgstr "F旦ljande fel skedde vis inl辰sning av %s: %s"
-
-#: ../gtk/gtkutils.c:1313
-#: ../gtk/gtkutils.c:1335
-msgid "Failed to load image"
-msgstr "Kunde inte l辰sa in bilden"
-
-#: ../gtk/gtkutils.c:1410
-#, c-format
-msgid "Cannot send folder %s."
-msgstr "Kan inte skicka mappen %s."
-
-#: ../gtk/gtkutils.c:1412
-msgid "Gaim cannot transfer a folder. You will need to send the files within individually"
-msgstr "Gaim kan inte 旦verf旦ra en mapp. Du m奪ste skicka filerna inuti den en och en"
-
-#: ../gtk/gtkutils.c:1440
-#: ../gtk/gtkutils.c:1449
-#: ../gtk/gtkutils.c:1454
-msgid "You have dragged an image"
-msgstr "Du har dragit och sl辰ppt en bild"
-
-#: ../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 "Du kan skicka bilden via fil旦verf旦ring, infoga den i detta meddelande, eller anv辰nda den som kompisikon f旦r denna anv辰ndare."
-
-#: ../gtk/gtkutils.c:1445
-#: ../gtk/gtkutils.c:1460
-msgid "Set as buddy icon"
-msgstr "Anv辰nd som kompisikon"
-
-#: ../gtk/gtkutils.c:1446
-#: ../gtk/gtkutils.c:1461
-msgid "Send image file"
-msgstr "Skicka bildfil"
-
-#: ../gtk/gtkutils.c:1447
-#: ../gtk/gtkutils.c:1461
-msgid "Insert in message"
-msgstr "Infoga i meddelandet"
-
-#: ../gtk/gtkutils.c:1450
-msgid "Would you like to set it as the buddy icon for this user?"
-msgstr "Vill du anv辰nda den som kompisikon f旦r denna anv辰ndare?"
-
-#: ../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 "Du kan skicka bilden via fil旦verf旦ring, infoga den i detta meddelande, eller anv辰nda den som kompisikon f旦r denna anv辰ndare."
-
-#: ../gtk/gtkutils.c:1457
-msgid "You can insert this image into this message, or use it as the buddy icon for this user"
-msgstr "Du kan infoga bilden i detta meddelande eller anv辰nda den som kompisikon f旦r denna anv辰ndare"
-
-#. 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 "Kan inte skicka startare"
-
-#: ../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 "Du drog en skrivbordsstartare. Antagligen ville du skicka vad som startaren pekar p奪 ist辰llet f旦r startaren sj辰lv."
-
-#: ../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>Fil:</b> %s\n"
-"<b>Filstorlek:</b> %s\n"
-"<b>Bildstorlek:</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 "Kompisikon"
-
-#: ../gtk/gtkutils.c:2653
-#, c-format
-msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
-msgstr "Filen '%s' 辰r f旦r stor f旦r %s. F旦rs旦k med en mindre bild.\n"
-
-#: ../gtk/gtkutils.c:2655
-msgid "Icon Error"
-msgstr "Ikonfel"
-
-#: ../gtk/gtkutils.c:2656
-msgid "Could not set icon"
-msgstr "Kunde inte ange ikon"
-
-#: ../gtk/gtkutils.c:2757
-#, c-format
-msgid "Failed to open file '%s': %s"
-msgstr "Kunde inte 旦ppna filen '%s': %s"
-
-#: ../gtk/gtkutils.c:2806
-#, c-format
-msgid "Failed to load image '%s': reason not known, probably a corrupt image file"
-msgstr "Kunde inte 旦ppna bilden '%s' av ok辰nd anledning. Troligtvis 辰r filen trasig."
-
-#: ../gtk/gtkwhiteboard.c:756
-#: ../gtk/gtkwhiteboard.c:775
-msgid "Save File"
-msgstr "Spara fil"
-
-#: ../gtk/gtkwhiteboard.c:863
-msgid "Select color"
-msgstr "V辰lj f辰rg"
-
-#: ../gtk/plugins/cap/cap.c:446
-msgid "Display Statistics"
-msgstr "Visa statestik"
-
-#: ../gtk/plugins/cap/cap.c:458
-#: ../gtk/plugins/cap/cap.c:461
-msgid "Response Probability:"
-msgstr "Trolighet f旦r svar:"
-
-#: ../gtk/plugins/cap/cap.c:807
-msgid "Statistics Configuration"
-msgstr "Statestikkonfigurering"
-
-#. msg_difference spinner
-#: ../gtk/plugins/cap/cap.c:810
-msgid "Maximum response timeout:"
-msgstr "Maximal svarsv辰ntetid:"
-
-#: ../gtk/plugins/cap/cap.c:813
-#: ../gtk/plugins/cap/cap.c:820
-#: ../gtk/plugins/cap/cap.c:827
-msgid "minutes"
-msgstr "minuter"
-
-#. last_seen spinner
-#: ../gtk/plugins/cap/cap.c:817
-msgid "Maximum last-seen difference:"
-msgstr "Maximal senast sedd-skillnad:"
-
-#. threshold spinner
-#: ../gtk/plugins/cap/cap.c:824
-msgid "Threshold:"
-msgstr "Tr旦skel:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../gtk/plugins/cap/cap.c:933
-msgid "Contact Availability Prediction plugin."
-msgstr "Modul f旦r f旦rutsp奪 kontaktens tillg辰nglighet"
-
-#. *  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 "Modulen f旦r f旦rutsp奪 kontaktens tillg辰nglighet anv辰nds f旦r att visa statistisk information f旦r en kompis i anv辰ndarens kontaktlistan."
-
-#: ../gtk/plugins/contact_priority.c:61
-msgid "Buddy is idle"
-msgstr "Kompisen 辰r inaktiv"
-
-#: ../gtk/plugins/contact_priority.c:62
-msgid "Buddy is away"
-msgstr "Kompisen 辰r fr奪nvarande"
-
-#: ../gtk/plugins/contact_priority.c:63
-msgid "Buddy is \"extended\" away"
-msgstr "Kompisen 辰r \"ut旦kat\" fr奪nvarande"
-
-#. Not used yet.
-#: ../gtk/plugins/contact_priority.c:66
-msgid "Buddy is mobile"
-msgstr "Kompisen 辰r mobil"
-
-#: ../gtk/plugins/contact_priority.c:68
-msgid "Buddy is offline"
-msgstr "Kompisen 辰r fr奪nkopplad"
-
-#: ../gtk/plugins/contact_priority.c:90
-msgid "Point values to use when..."
-msgstr "Po辰ngv辰rden att anv辰nda n辰r..."
-
-#: ../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 "Kompisen med den <i>st旦rsta po辰ngen</i> 辰r den kompisen som kommer ha prioritet i kontakten.\n"
-
-#: ../gtk/plugins/contact_priority.c:125
-msgid "Use last buddy when scores are equal"
-msgstr "Anv辰nd senaste kompisen d奪 po辰ngen 辰r samma"
-
-#: ../gtk/plugins/contact_priority.c:130
-msgid "Point values to use for account..."
-msgstr "Po辰ngv辰rden att anv辰nda f旦r konto..."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/contact_priority.c:182
-msgid "Contact Priority"
-msgstr "Kontaktprioritet"
-
-#. *< name
-#. *< version
-#. *< summary
-#: ../gtk/plugins/contact_priority.c:185
-msgid "Allows for controlling the values associated with different buddy states."
-msgstr "Ger m旦jlighet att kontrollera v辰rdena associerade med olika kompisstatusar."
-
-#. *< 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 "Ger m旦jlighet att 辰ndra po辰ngv辰rdena p奪 inaktiv/fr奪nvarande/utloggad-status f旦r kompisar som konkurerar om kontaktprioritet."
-
-#: ../gtk/plugins/extplacement.c:80
-msgid "By conversation count"
-msgstr "Efter konversationsantal"
-
-#: ../gtk/plugins/extplacement.c:101
-msgid "Conversation Placement"
-msgstr "Konversationsplacering"
-
-#: ../gtk/plugins/extplacement.c:106
-msgid "Number of conversations per window"
-msgstr "Antal konversationer per f旦nster"
-
-#: ../gtk/plugins/extplacement.c:112
-msgid "Separate IM and Chat windows when placing by number"
-msgstr "Separera snabbmeddelande- och chattf旦nster n辰r placerade efter nummer"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/extplacement.c:135
-msgid "ExtPlacement"
-msgstr "ExtPlacement"
-
-#. *< name
-#. *< version
-#: ../gtk/plugins/extplacement.c:137
-msgid "Extra conversation placement options."
-msgstr "Extra konversationsplaceringsm旦jligheter."
-
-#. *< summary
-#. *  description
-#: ../gtk/plugins/extplacement.c:139
-msgid "Restrict the number of conversations per windows, optionally separating IMs and Chats"
-msgstr "Begr辰nsa antalet konversationer per f旦nster med m旦jlighet att separera snabbmeddelanden och chattar"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gaiminc.c:91
-msgid "Gaim Demonstration Plugin"
-msgstr "Gaim demonstrationsinsticksmodul"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/gaiminc.c:94
-msgid "An example plugin that does stuff - see the description."
-msgstr "Ett exempel p奪 insticksmodul som g旦r saker, se beskrivning."
-
-#. *  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 ""
-"Det h辰r 辰r en riktigt h辰ftig insticksmodul som g旦r en massa saker:\n"
-"- Den visar vem som skrivit programmet n辰r du loggar in\n"
-"- Den v辰nder p奪 all text som kommer in\n"
-"- Den s辰nder ett meddelande till personerna p奪 din kompislista direkt n辰r du loggar in"
-
-#: ../gtk/plugins/gaimrc.c:41
-msgid "Cursor Color"
-msgstr "F辰rg p奪 mark旦ren"
-
-#: ../gtk/plugins/gaimrc.c:42
-msgid "Secondary Cursor Color"
-msgstr "Sekund辰r f辰rg p奪 mark旦ren"
-
-#: ../gtk/plugins/gaimrc.c:43
-msgid "Hyperlink Color"
-msgstr "F辰rg p奪 l辰nkar"
-
-#: ../gtk/plugins/gaimrc.c:56
-msgid "GtkTreeView Expander Size"
-msgstr "Storlek p奪 \"GtkTreeView-expanderaren\""
-
-#: ../gtk/plugins/gaimrc.c:57
-msgid "GtkTreeView Horizontal Separation"
-msgstr "GtkTreeView horisontal separation"
-
-#: ../gtk/plugins/gaimrc.c:76
-msgid "Conversation Entry"
-msgstr "Konversationsinl辰gg"
-
-#: ../gtk/plugins/gaimrc.c:77
-msgid "Conversation History"
-msgstr "Konversationshistorik"
-
-#: ../gtk/plugins/gaimrc.c:78
-msgid "Log Viewer"
-msgstr "Loggvisare"
-
-#: ../gtk/plugins/gaimrc.c:79
-msgid "Request Dialog"
-msgstr "F旦rfr奪gningsdialog"
-
-#: ../gtk/plugins/gaimrc.c:80
-msgid "Notify Dialog"
-msgstr "Rapporteringsdialog"
-
-#: ../gtk/plugins/gaimrc.c:91
-msgid "GtkTreeView Indent Expanders"
-msgstr "GtkTreeVie Indragningsexpander"
-
-#: ../gtk/plugins/gaimrc.c:320
-#, c-format
-msgid "Select Color for %s"
-msgstr "V辰lj f辰rg f旦r %s"
-
-#: ../gtk/plugins/gaimrc.c:322
-msgid "Select Color"
-msgstr "V辰lj f辰rg"
-
-#: ../gtk/plugins/gaimrc.c:361
-#, c-format
-msgid "Select Font for %s"
-msgstr "V辰lj typsnitt f旦r %s"
-
-#: ../gtk/plugins/gaimrc.c:398
-msgid "Select Interface Font"
-msgstr "V辰lj typsnitt f旦r gr辰nssnittet"
-
-#: ../gtk/plugins/gaimrc.c:448
-#: ../libgaim/protocols/msn/msn.c:1530
-msgid "General"
-msgstr "Allm辰nt"
-
-#: ../gtk/plugins/gaimrc.c:453
-msgid "GTK+ Interface Font"
-msgstr "GTK+ Gr辰nssnittstypsnitt"
-
-#: ../gtk/plugins/gaimrc.c:473
-msgid "GTK+ Text Shortcut Theme"
-msgstr "GTK+ Textgenv辰gstema"
-
-#: ../gtk/plugins/gaimrc.c:508
-msgid "Interface colors"
-msgstr "Gr辰nssnittsf辰rger"
-
-# Os辰ker: Finns smidigare l旦sning?
-#: ../gtk/plugins/gaimrc.c:532
-msgid "Widget Sizes"
-msgstr "Storlek p奪 grafiska element"
-
-#: ../gtk/plugins/gaimrc.c:553
-msgid "Fonts"
-msgstr "Typsnitt"
-
-#: ../gtk/plugins/gaimrc.c:576
-msgid "Tools"
-msgstr "Verktyg"
-
-#: ../gtk/plugins/gaimrc.c:581
-#, c-format
-msgid "Write settings to %s%sgtkrc-2.0"
-msgstr "Skriv inst辰llningar till %s%sgtkrc-2.0"
-
-#: ../gtk/plugins/gaimrc.c:589
-msgid "Re-read gtkrc files"
-msgstr "L辰s om gtkrc-filer"
-
-#: ../gtk/plugins/gaimrc.c:616
-msgid "Gaim GTK+ Theme Control"
-msgstr "Gaim GTK+ temakontroll"
-
-#: ../gtk/plugins/gaimrc.c:618
-#: ../gtk/plugins/gaimrc.c:619
-msgid "Provides access to commonly used gtkrc settings."
-msgstr "Ger tillg奪ng till ofta anv辰nda gtkrc-inst辰llningar."
-
-#. Configuration frame
-#: ../gtk/plugins/gestures/gestures.c:235
-msgid "Mouse Gestures Configuration"
-msgstr "Konfiguration av musgester"
-
-#: ../gtk/plugins/gestures/gestures.c:242
-msgid "Middle mouse button"
-msgstr "Mittenmusknapp"
-
-#: ../gtk/plugins/gestures/gestures.c:247
-msgid "Right mouse button"
-msgstr "H旦ger musknapp"
-
-#. "Visual gesture display" checkbox
-#: ../gtk/plugins/gestures/gestures.c:259
-msgid "_Visual gesture display"
-msgstr "_Visuell gestvisning"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gestures/gestures.c:289
-msgid "Mouse Gestures"
-msgstr "Musgester"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/gestures/gestures.c:292
-msgid "Provides support for mouse gestures"
-msgstr "G旦r det m旦jligt att anv辰nda musgester"
-
-#. *  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 ""
-"G旦r det m旦jligt att anv辰nda musgester i konversationsf旦nster.\n"
-"Dra musen med mittersta knappen nedtryckt f旦r att ge olika kommandon:\n"
-"\n"
-"Dra ner och sedan till h旦ger f旦r att st辰nga konversationen.\n"
-"Dra upp och sedan till v辰nster f旦r att byta till f旦reg奪ende konversation.\n"
-"Dra upp och sedan till h旦ger f旦r att byta till n辰sta konversation."
-
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:143
-msgid "Instant Messaging"
-msgstr "Snabbmeddelanden"
-
-#. 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 "V辰lj en person fr奪n din adressbok nedan eller l辰gg till en ny person."
-
-#. "Search"
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:473
-#: ../gtk/plugins/gevolution/assoc-buddy.c:358
-#: ../libgaim/protocols/jabber/buddy.c:1730
-#: ../libgaim/protocols/oscar/oscar.c:6192
-#: ../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:5607
-msgid "Search"
-msgstr "S旦k"
-
-#. "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 "Ny person"
-
-#. "Select Buddy" button
-#: ../gtk/plugins/gevolution/add_buddy_dialog.c:597
-msgid "Select Buddy"
-msgstr "V辰lj kompis"
-
-#. 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 "V辰lj en person ur adressboken som du vill l辰gga till denna kompis till eller skapa en ny person."
-
-#. Add the expander
-#: ../gtk/plugins/gevolution/assoc-buddy.c:433
-msgid "User _details"
-msgstr "_Anv辰ndarinformation"
-
-#. "Associate Buddy" button
-#: ../gtk/plugins/gevolution/assoc-buddy.c:486
-msgid "_Associate Buddy"
-msgstr "_Associera kompis"
-
-#: ../gtk/plugins/gevolution/eds-utils.c:73
-#: ../gtk/plugins/gevolution/eds-utils.c:86
-#: ../libgaim/protocols/jabber/jabber.c:1163
-msgid "None"
-msgstr "Ingen"
-
-#: ../gtk/plugins/gevolution/gevolution.c:239
-#: ../gtk/plugins/gevolution/gevolution.c:245
-msgid "Unable to send e-mail"
-msgstr "Kunde inte skicka e-post"
-
-#: ../gtk/plugins/gevolution/gevolution.c:240
-msgid "The evolution executable was not found in the PATH."
-msgstr "Evolutions k旦rfil hittades inte i s旦kv辰garna."
-
-#: ../gtk/plugins/gevolution/gevolution.c:246
-msgid "An e-mail address was not found for this buddy."
-msgstr "Ingen epostadress hittades f旦r denna kompisen."
-
-#: ../gtk/plugins/gevolution/gevolution.c:272
-msgid "Add to Address Book"
-msgstr "L辰gg till i adressboken"
-
-#: ../gtk/plugins/gevolution/gevolution.c:284
-msgid "Send E-Mail"
-msgstr "Skicka e-post"
-
-#. Configuration frame
-#: ../gtk/plugins/gevolution/gevolution.c:411
-msgid "Evolution Integration Configuration"
-msgstr "Konfigurering av integrering med Evolution"
-
-#. Label
-#: ../gtk/plugins/gevolution/gevolution.c:414
-msgid "Select all accounts that buddies should be auto-added to."
-msgstr "V辰lj alla konton som kompisar automatiskt ska l辰ggas till i."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gevolution/gevolution.c:521
-msgid "Evolution Integration"
-msgstr "Integrering med Evolution"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/gevolution/gevolution.c:524
-#: ../gtk/plugins/gevolution/gevolution.c:526
-msgid "Provides integration with Evolution."
-msgstr "Erbjuder integration med Evolution."
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:267
-msgid "Please enter the person's information below."
-msgstr "Ange personens information nedan."
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:271
-msgid "Please enter the buddy's screen name and account type below."
-msgstr "Ange kompisens Anv辰ndar-ID och kontotyp nedan."
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:291
-msgid "Account type:"
-msgstr "Kontotyp:"
-
-#. Optional Information section
-#: ../gtk/plugins/gevolution/new_person_dialog.c:315
-msgid "Optional information:"
-msgstr "Frivillig information:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:350
-msgid "First name:"
-msgstr "F旦rnamn:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:362
-msgid "Last name:"
-msgstr "Efternamn:"
-
-#: ../gtk/plugins/gevolution/new_person_dialog.c:382
-msgid "E-mail:"
-msgstr "E-postadress:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/gtk-signals-test.c:160
-msgid "GTK Signals Test"
-msgstr "GTK Signaltest"
-
-#. *< 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 "Test f旦r att avg旦ra om alla ui signaler fungerar korrekt."
-
-#: ../gtk/plugins/history.c:188
-msgid "History"
-msgstr "Historik"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/iconaway.c:82
-msgid "Iconify on Away"
-msgstr "Ikonifiera vid fr奪nvarande"
-
-#. *< 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 "G旦r din kompislista och dina konversationer till en ikon n辰r du 辰r fr奪nvarande."
-
-#: ../gtk/plugins/mailchk.c:160
-msgid "Mail Checker"
-msgstr "E-post-kollare"
-
-#: ../gtk/plugins/mailchk.c:162
-msgid "Checks for new local mail."
-msgstr "Kollar efter ny lokal e-post."
-
-#: ../gtk/plugins/mailchk.c:163
-msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr "L辰gger till en liten ruta till kompislistan som visar om du f奪tt ny e-post."
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:44
-msgid "A music messaging session has been requested. Please click the MM icon to accept."
-msgstr "En music messaging session har efterfr奪gats. Var god tryck p奪 MM-ikonen f旦r att acceptera."
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:45
-msgid "Music messaging session confirmed."
-msgstr "Music messaging session bekr辰ftad."
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:416
-msgid "Music Messaging"
-msgstr "Music Messaging"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:417
-msgid "There was a conflict in running the command:"
-msgstr "Det var en konflikt i k旦rning av kommandot:"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:525
-msgid "Error Running Editor"
-msgstr "Fel vid k旦rning av editor"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:526
-msgid "The following error has occurred:"
-msgstr "F旦ljande fel har intr辰ffat:"
-
-#. Configuration frame
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:625
-msgid "Music Messaging Configuration"
-msgstr "Music Messaging konfiguration"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:629
-msgid "Score Editor Path"
-msgstr "S旦kv辰g f旦r redigerare av notblad"
-
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:630
-msgid "_Apply"
-msgstr "_Aktivera"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#. *< name
-#. *< version
-#: ../gtk/plugins/musicmessaging/musicmessaging.c:665
-msgid "Music Messaging Plugin for collaborative composition."
-msgstr "Music Messaging-modul f旦r gemensam komponering."
-
-#. *  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 "Music Messaging-modulen till奪ter ett antal anv辰ndare att samtidigt arbeta p奪 ett stycke musik genom att editera ett gemensamt notblad i realtid."
-
-#. ---------- "Notify For" ----------
-#: ../gtk/plugins/notify.c:687
-msgid "Notify For"
-msgstr "Rapportera i"
-
-#: ../gtk/plugins/notify.c:691
-msgid "_IM windows"
-msgstr "_Snabbmeddelandef旦nster"
-
-#: ../gtk/plugins/notify.c:698
-msgid "C_hat windows"
-msgstr "_Chattf旦nster"
-
-#: ../gtk/plugins/notify.c:706
-msgid "\t_Only when someone says your screen name"
-msgstr "\tBara d奪 n奪g_on n辰mner ditt sk辰rmnamn"
-
-#: ../gtk/plugins/notify.c:716
-msgid "_Focused windows"
-msgstr "_Fokuserade f旦nster"
-
-#. ---------- "Notification Methods" ----------
-#: ../gtk/plugins/notify.c:724
-msgid "Notification Methods"
-msgstr "Rapporteringsmetod"
-
-# L辰gg m辰rke till att det st奪r "prepend".
-#: ../gtk/plugins/notify.c:731
-msgid "Prepend _string into window title:"
-msgstr "L辰gg till _str辰ng i b旦rjan av f旦nstertiteln:"
-
-#. Count method button
-#: ../gtk/plugins/notify.c:750
-msgid "Insert c_ount of new messages into window title"
-msgstr "L辰gg till en _r辰knare f旦r nya meddelanden i f旦nstrens titel"
-
-#. Count xprop method button
-#: ../gtk/plugins/notify.c:759
-msgid "Insert count of new message into _X property"
-msgstr "L辰gg till meddelander辰knare i _X"
-
-#. Urgent method button
-#: ../gtk/plugins/notify.c:767
-msgid "Set window manager \"_URGENT\" hint"
-msgstr "S辰tt f旦nsterhanterarens \"_URGENT\"-ledtr奪d"
-
-#. Raise window method button
-#: ../gtk/plugins/notify.c:776
-msgid "R_aise conversation window"
-msgstr "_Fokusera konversationsf旦nstret"
-
-#. ---------- "Notification Removals" ----------
-#: ../gtk/plugins/notify.c:784
-msgid "Notification Removal"
-msgstr "Ta bort rapportering"
-
-#. Remove on focus button
-#: ../gtk/plugins/notify.c:789
-msgid "Remove when conversation window _gains focus"
-msgstr "Ta bort n辰r konversationsf旦nstret f奪r _fokus"
-
-#. Remove on click button
-#: ../gtk/plugins/notify.c:796
-msgid "Remove when conversation window _receives click"
-msgstr "Ta bort n辰r konversationsf旦nstret blir _klickat"
-
-#. Remove on type button
-#: ../gtk/plugins/notify.c:804
-msgid "Remove when _typing in conversation window"
-msgstr "Ta bort n辰r man _skriver i konversationsf旦nstret"
-
-#. Remove on message send button
-#: ../gtk/plugins/notify.c:812
-msgid "Remove when a _message gets sent"
-msgstr "Ta bort n辰r ett _meddelande skickas"
-
-#. Remove on conversation switch button
-#: ../gtk/plugins/notify.c:821
-msgid "Remove on switch to conversation ta_b"
-msgstr "Ta _bort vid byte till konversationsflik"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/notify.c:910
-msgid "Message Notification"
-msgstr "Meddelanderapportering"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/notify.c:913
-#: ../gtk/plugins/notify.c:915
-msgid "Provides a variety of ways of notifying you of unread messages."
-msgstr "Erbjuder ett antal olika s辰tt att f奪 rapporter om ol辰sta meddelanden."
-
-#: ../gtk/plugins/raw.c:175
-msgid "Raw"
-msgstr "R奪"
-
-#: ../gtk/plugins/raw.c:177
-msgid "Lets you send raw input to text-based protocols."
-msgstr "L奪ter dig skicka r奪 indata till textbaserade protokoll."
-
-#: ../gtk/plugins/raw.c:178
-msgid "Lets you send raw input to text-based protocols (Jabber, MSN, IRC, TOC). Hit 'Enter' in the entry box to send. Watch the debug window."
-msgstr "L奪ter dig skicka r奪 indata till textbaserade protokoll (Jabber, MSN, IRC, TOC). Tryck \"Enter\" i inmatningsrutan f旦r att skicka. Titta i fels旦kningsf旦nstret."
-
-#: ../gtk/plugins/relnot.c:69
-#, c-format
-msgid "You are using Gaim version %s.  The current version is %s.<hr>"
-msgstr "Du anv辰nder version %s av Gaim. Den aktuella versionen 辰r %s.<hr>"
-
-#: ../gtk/plugins/relnot.c:75
-#, c-format
-msgid ""
-"<b>ChangeLog:</b>\n"
-"%s<br><br>"
-msgstr ""
-"<b>F旦r辰ndringslogg:</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 "Du kan h辰mta version %s fr奪n:<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 "Ny version tillg辰nglig"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/relnot.c:143
-msgid "Release Notification"
-msgstr "Meddela om nya versioner"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/relnot.c:146
-msgid "Checks periodically for new releases."
-msgstr "Kontrollerar periodiskt om ny version har sl辰ppts."
-
-#. *  description
-#: ../gtk/plugins/relnot.c:148
-msgid "Checks periodically for new releases and notifies the user with the ChangeLog."
-msgstr "Kontrollerar periodiskt om ny version har sl辰ppts och rapporterar f旦r辰ndringsloggen till anv辰ndaren."
-
-#: ../gtk/plugins/spellchk.c:1965
-msgid "Duplicate Correction"
-msgstr "Dublettkorrigering"
-
-#: ../gtk/plugins/spellchk.c:1966
-msgid "The specified word already exists in the correction list."
-msgstr "Det angivna ordet finns redan i korrigeringslistan."
-
-#: ../gtk/plugins/spellchk.c:2174
-msgid "Text Replacements"
-msgstr "Texters辰ttningar"
-
-#: ../gtk/plugins/spellchk.c:2197
-msgid "You type"
-msgstr "Du skriver"
-
-#: ../gtk/plugins/spellchk.c:2211
-msgid "You send"
-msgstr "Du skickar"
-
-#: ../gtk/plugins/spellchk.c:2225
-msgid "Whole words only"
-msgstr "Endast hela ord"
-
-#: ../gtk/plugins/spellchk.c:2237
-msgid "Case sensitive"
-msgstr "Skriftl辰gesk辰nslig"
-
-#: ../gtk/plugins/spellchk.c:2263
-msgid "Add a new text replacement"
-msgstr "L辰gg till ny texters辰ttning"
-
-#: ../gtk/plugins/spellchk.c:2279
-msgid "You _type:"
-msgstr "Du _skriver:"
-
-#: ../gtk/plugins/spellchk.c:2296
-msgid "You _send:"
-msgstr "Du _skickar:"
-
-#. Created here so it can be passed to whole_words_button_toggled.
-#: ../gtk/plugins/spellchk.c:2308
-msgid "_Exact case match (uncheck for automatic case handling)"
-msgstr "_Exakt skriftl辰gesk辰bslighet (avmarkera f旦r automatisk skriftl辰gesavk辰nning)"
-
-#: ../gtk/plugins/spellchk.c:2310
-msgid "Only replace _whole words"
-msgstr "Ers辰tt endast _hela ord"
-
-#: ../gtk/plugins/spellchk.c:2335
-msgid "General Text Replacement Options"
-msgstr "Allm辰nna texters辰ttningsval"
-
-#: ../gtk/plugins/spellchk.c:2336
-msgid "Enable replacement of last word on send"
-msgstr "Till奪t ers辰ttning av det sista ordet vid s辰ndning."
-
-#: ../gtk/plugins/spellchk.c:2361
-msgid "Text replacement"
-msgstr "Texters辰ttning"
-
-#: ../gtk/plugins/spellchk.c:2363
-#: ../gtk/plugins/spellchk.c:2364
-msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Ers辰tter text i utg奪ende meddelanden enligt dina egna regler."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/ticker/ticker.c:77
-#: ../gtk/plugins/ticker/ticker.c:355
-msgid "Buddy Ticker"
-msgstr "Kompistickare"
-
-#. *< 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 "En horisontellt rullande version av kompislistan."
-
-#: ../gtk/plugins/timestamp.c:186
-msgid "iChat Timestamp"
-msgstr "iChat-tidsst辰mpel"
-
-#: ../gtk/plugins/timestamp.c:193
-msgid "Delay"
-msgstr "F旦rdr旦jning"
-
-#: ../gtk/plugins/timestamp.c:200
-msgid "minutes."
-msgstr "minuter."
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/timestamp.c:256
-msgid "Timestamp"
-msgstr "Tidsst辰mpel"
-
-#. *< name
-#. *< version
-#. *  summary
-#. *  description
-#: ../gtk/plugins/timestamp.c:259
-#: ../gtk/plugins/timestamp.c:261
-msgid "Adds iChat-style timestamps to conversations every N minutes."
-msgstr "L辰gger till tidsst辰mplar av iChat-typ i konversationer var N:te minut."
-
-#: ../gtk/plugins/timestamp_format.c:22
-msgid "Timestamp Format Options"
-msgstr "Val f旦r tidsst辰mpelformat"
-
-#: ../gtk/plugins/timestamp_format.c:27
-msgid "_Force (traditional Gaim) 24-hour time format"
-msgstr "Tvinga (traditionell Gaim) 24-timmars tids_format"
-
-#: ../gtk/plugins/timestamp_format.c:30
-msgid "Show dates in..."
-msgstr "Visa datum i..."
-
-#: ../gtk/plugins/timestamp_format.c:35
-msgid "Co_nversations:"
-msgstr "Ko_nversationer:"
-
-#: ../gtk/plugins/timestamp_format.c:37
-#: ../gtk/plugins/timestamp_format.c:46
-msgid "For delayed messages"
-msgstr "F旦r f旦rdr旦jd meddeladen"
-
-#: ../gtk/plugins/timestamp_format.c:38
-#: ../gtk/plugins/timestamp_format.c:47
-msgid "For delayed messages and in chats"
-msgstr "F旦r f旦rdr旦jda meddelanden och i chattar"
-
-#: ../gtk/plugins/timestamp_format.c:44
-msgid "_Message Logs:"
-msgstr "_Meddelandeloggar:"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/timestamp_format.c:149
-msgid "Message Timestamp Formats"
-msgstr "Tidsst辰mpelformat f旦r meddelande"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/timestamp_format.c:152
-msgid "Customizes the message timestamp formats."
-msgstr "Personifiera tidsformatsst辰mpeln f旦r meddelandet."
-
-#. *  description
-#: ../gtk/plugins/timestamp_format.c:154
-msgid "This plugin allows the user to customize conversation and logging message timestamp formats."
-msgstr "Denna modul till奪ter anv辰ndaren att personifiera konversationernas och loggarnas tidsst辰mpelformat."
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:183
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:569
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:616
-msgid "Opacity:"
-msgstr "Ogenomskinlighet:"
-
-#. IM Convo trans options
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:533
-msgid "IM Conversation Windows"
-msgstr "Snabbmeddelandef旦nster"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:534
-msgid "_IM window transparency"
-msgstr "_Genomskinlighet f旦r snabbmeddelandef旦nster"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:548
-msgid "_Show slider bar in IM window"
-msgstr "_Visa \"slider bar\" i snabbmeddelandef旦nster"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:555
-msgid "Remove IM window transparency on focus"
-msgstr "Ta bort genomskinlighet f旦r fokuserade snabbmeddelandef旦nster"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:558
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:606
-msgid "Always on top"
-msgstr "Alltid 旦verst"
-
-#. Buddy List trans options
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:590
-msgid "Buddy List Window"
-msgstr "Kompislistef旦nster"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:591
-msgid "_Buddy List window transparency"
-msgstr "Genomskinlighet f旦r _kompislistef旦nster"
-
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:604
-msgid "Remove Buddy List window transparency on focus"
-msgstr "Ta bort genomskinligheten p奪 kompislistef旦nstret n辰r det f奪r fokus"
-
-#. *< type
-#. *< ui_requirement
-#. *< flags
-#. *< dependencies
-#. *< priority
-#. *< id
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:658
-msgid "Transparency"
-msgstr "Genomskinlighet"
-
-#. *< name
-#. *< version
-#. *  summary
-#: ../gtk/plugins/win32/transparency/win2ktrans.c:661
-msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Variabel genomskinlighet p奪 kompislistan och konversationer."
-
-#. *  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 ""
-"Denna insticksmodul g旦r det m旦jligt att anv辰nda alfagenomskinlighet p奪 konversationsf旦nster och kompislistan.\n"
-"\n"
-"* Observera: Denna insticksmodul kr辰ver Win2000 eller senare."
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:306
-msgid "GTK+ Runtime Version"
-msgstr "GTK+ Runtime-version"
-
-#. Autostart
-#: ../gtk/plugins/win32/winprefs/winprefs.c:314
-msgid "Startup"
-msgstr "Uppstart"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:315
-msgid "_Start Gaim on Windows startup"
-msgstr "_Starta Gaim n辰r Windows startar"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:328
-msgid "_Dockable Buddy List"
-msgstr "_Dockningsbar kompislista"
-
-#. Blist On Top
-#: ../gtk/plugins/win32/winprefs/winprefs.c:332
-msgid "_Keep Buddy List window on top:"
-msgstr "_H奪ll kompislistef旦nstret 旦verst:"
-
-#. XXX: Did this ever work?
-#: ../gtk/plugins/win32/winprefs/winprefs.c:337
-msgid "Only when docked"
-msgstr "Endast om dockad"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:342
-msgid "_Flash window when chat messages are received"
-msgstr "Blinka med _f旦nstret n辰r chattmeddelanden tas emot"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:366
-msgid "WinGaim Options"
-msgstr "WinGaim-inst辰llningar"
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:368
-msgid "Options specific to Windows Gaim."
-msgstr "Inst辰llningar specifika f旦r Windows-Gaim."
-
-#: ../gtk/plugins/win32/winprefs/winprefs.c:369
-msgid "Provides options specific to Windows Gaim, such as buddy list docking."
-msgstr "Ins辰llningar specifika f旦r Windows-Gaim s奪som dockning av kompislistan."
-
-#: ../libgaim/account.c:769
+#: ../finch/plugins/lastlog.c:123 ../finch/plugins/lastlog.c:124
+msgid "Lastlog plugin."
+msgstr "Lastlogmodul"
+
+#: ../libpurple/account.c:790
 msgid "accounts"
 msgstr "konton"
 
-#: ../libgaim/account.c:915
+#: ../libpurple/account.c:937 ../libpurple/protocols/jabber/auth.c:194
+#: ../libpurple/protocols/jabber/auth.c:233
 msgid "Password is required to sign on."
 msgstr "L旦senord kr辰vs f旦r att logga in."
 
@@ -5698,181 +1590,199 @@
 # nedst奪ende meningarna? Jag tycker det l奪ter b辰ttre, eftersom
 # det 辰r ett visst l旦senord man pratar om.
 # Jo, du har helt r辰tt i det.
-#: ../libgaim/account.c:940
+#: ../libpurple/account.c:963
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Ange l旦senordet f旦r %s (%s)"
 
-#: ../libgaim/account.c:947
+#: ../libpurple/account.c:970
 msgid "Enter Password"
 msgstr "Ange l旦senordet"
 
-#: ../libgaim/account.c:952
+#: ../libpurple/account.c:975
 msgid "Save password"
 msgstr "Spara l旦senordet"
 
-#: ../libgaim/account.c:986
-#: ../libgaim/connection.c:104
+#: ../libpurple/account.c:1010 ../libpurple/connection.c:104
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Saknar protokollmodul f旦r %s"
 
-#: ../libgaim/account.c:1085
-#: ../libgaim/protocols/gg/gg.c:696
-#: ../libgaim/protocols/jabber/jabber.c:1318
+#: ../libpurple/account.c:1012 ../libpurple/connection.c:107
+#: ../pidgin/gtkblist.c:4010
+msgid "Connection Error"
+msgstr "Anslutningsfel"
+
+#: ../libpurple/account.c:1170 ../libpurple/protocols/gg/gg.c:702
+#: ../libpurple/protocols/jabber/jabber.c:1334
 msgid "New passwords do not match."
 msgstr "De nya l旦senorden st辰mmer inte 旦verens."
 
-#: ../libgaim/account.c:1094
+#: ../libpurple/account.c:1179
 msgid "Fill out all fields completely."
 msgstr "Fyll i alla f辰lt fullst辰ndigt."
 
-#: ../libgaim/account.c:1117
+#: ../libpurple/account.c:1202
 msgid "Original password"
 msgstr "Ursprugligt l旦senord"
 
-#: ../libgaim/account.c:1124
+#: ../libpurple/account.c:1209
 msgid "New password"
 msgstr "Nytt l旦senord"
 
-#: ../libgaim/account.c:1131
+#: ../libpurple/account.c:1216
 msgid "New password (again)"
 msgstr "Nytt l旦senord (igen)"
 
-#: ../libgaim/account.c:1137
+#: ../libpurple/account.c:1222
 #, c-format
 msgid "Change password for %s"
 msgstr "�ndra l旦senord f旦r %s"
 
-#: ../libgaim/account.c:1145
+#: ../libpurple/account.c:1230
 msgid "Please enter your current password and your new password."
 msgstr "Ange ditt nuvarande l旦senord och ditt nya l旦senord."
 
-#: ../libgaim/account.c:1175
+#: ../libpurple/account.c:1261
 #, c-format
 msgid "Change user information for %s"
 msgstr "�ndra anv辰ndarinformationen f旦r %s"
 
-#: ../libgaim/account.c:1178
-#: ../libgaim/protocols/toc/toc.c:1690
+#: ../libpurple/account.c:1264 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Ange anv辰ndarinformation"
 
-#: ../libgaim/blist.c:548
+#: ../libpurple/account.c:1744 ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/jabber/buddy.c:642
+#: ../libpurple/protocols/jabber/buddy.c:1462
+#: ../libpurple/protocols/jabber/buddy.c:1479
+#: ../libpurple/protocols/novell/novell.c:2831
+#: ../libpurple/protocols/qq/qq.c:230 ../pidgin/gtkft.c:159
+msgid "Unknown"
+msgstr "Ok辰nd"
+
+#: ../libpurple/blist.c:521 ../libpurple/blist.c:1289
+#: ../libpurple/blist.c:1518 ../libpurple/protocols/jabber/roster.c:68
+#: ../pidgin/gtkblist.c:5310 ../pidgin/plugins/gevolution/gevolution.c:96
+#: ../pidgin/plugins/gevolution/gevo-util.c:64
+msgid "Buddies"
+msgstr "Kompisar"
+
+#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "kompislista"
 
-#: ../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] "%d kompis fr奪n gruppen %s togs inte bort eftersom den tillh旦r ett konto som 辰r avaktiverat eller inte 辰r inloggat. Kompisen och gruppen togs inte bort.\n"
-msgstr[1] "%d kompisar fr奪n gruppen %s togs inte bort eftersom den tillh旦r till ett konto som antingen 辰r avaktiverat eller inte inloggat. Kompisarna och gruppen togs inte bort.\n"
-
-#: ../libgaim/blist.c:1929
-msgid "Group not removed"
-msgstr "Gruppen togs inte bort"
-
-#: ../libgaim/connection.c:106
+#: ../libpurple/connection.c:106
 msgid "Registration Error"
 msgstr "Registreringsfel"
 
-#: ../libgaim/connection.c:292
+#: ../libpurple/connection.c:293
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s har loggat in"
 
-#: ../libgaim/connection.c:322
+#: ../libpurple/connection.c:323
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s har kopplat ifr奪n"
 
-#: ../libgaim/conversation.c:165
+#: ../libpurple/connection.c:440 ../libpurple/plugin.c:282
+#: ../libpurple/protocols/jabber/buddy.c:1750
+#: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msn/session.c:322
+msgid "Unknown error"
+msgstr "Ok辰nt fel"
+
+#: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
 msgstr "Kan inte skicka meddelandet: Det 辰r f旦r stort."
 
-#: ../libgaim/conversation.c:168
-#: ../libgaim/conversation.c:181
+#: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Kan inte skicka meddelandet till %s."
 
-#: ../libgaim/conversation.c:169
+#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "Meddelandet 辰r f旦r stort."
 
-#: ../libgaim/conversation.c:178
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:284
+#: ../libpurple/protocols/bonjour/jabber.c:326
 msgid "Unable to send message."
 msgstr "Kan inte skicka meddelandet."
 
-#: ../libgaim/conversation.c:1162
+#: ../libpurple/conversation.c:1169
 msgid "Send Message"
 msgstr "Skicka meddelande"
 
-#: ../libgaim/conversation.c:1163
+#: ../libpurple/conversation.c:1172
 msgid "_Send Message"
 msgstr "_Skicka meddelande"
 
-#: ../libgaim/conversation.c:1566
+#: ../libpurple/conversation.c:1578
 #, c-format
 msgid "%s entered the room."
 msgstr "%s kom in i rummet."
 
-#: ../libgaim/conversation.c:1569
+#: ../libpurple/conversation.c:1581
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] kom in i rummet."
 
-#: ../libgaim/conversation.c:1674
+#: ../libpurple/conversation.c:1691
 #, c-format
 msgid "You are now known as %s"
 msgstr "Du 辰r nu k辰nd som %s"
 
-#: ../libgaim/conversation.c:1694
+#: ../libpurple/conversation.c:1711
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s 辰r nu k辰nd som %s"
 
-#: ../libgaim/conversation.c:1767
+#: ../libpurple/conversation.c:1786
 #, c-format
 msgid "%s left the room."
 msgstr "%s l辰mnade rummet."
 
-#: ../libgaim/conversation.c:1770
+#: ../libpurple/conversation.c:1789
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s l辰mnade rummet (%s)."
 
-#: ../libgaim/desktopitem.c:286
-#: ../libgaim/desktopitem.c:877
-msgid "No name"
-msgstr "Inget namn"
-
-#: ../libgaim/dbus-server.c:578
+#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Kan inte skapa anslutning: %s"
 
-#: ../libgaim/dbus-server.c:590
+#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Kunde inte f奪 namn: %s"
 
-#: ../libgaim/dbus-server.c:603
+#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Kunde inte f奪 serv namn: %s"
 
-#: ../libgaim/dnsquery.c:491
+#: ../libpurple/dbus-server.h:84
+msgid "Purple's D-BUS server is not running for the reason listed below"
+msgstr ""
+"Purples D-BUS server k旦rs inte p奪 grund av n奪gon av de nedan listade "
+"anledningarna"
+
+#: ../libpurple/desktopitem.c:286 ../libpurple/desktopitem.c:877
+msgid "No name"
+msgstr "Inget namn"
+
+#: ../libpurple/dnsquery.c:510
 msgid "Unable to create new resolver process\n"
 msgstr "Kunde inte skapar ny uppslagningsprocess\n"
 
-#: ../libgaim/dnsquery.c:496
+#: ../libpurple/dnsquery.c:515
 msgid "Unable to send request to resolver process\n"
 msgstr "Kunde inte skicka f旦rfr奪gan till uppslagningsprocessen\n"
 
-#: ../libgaim/dnsquery.c:529
-#: ../libgaim/dnsquery.c:677
+#: ../libpurple/dnsquery.c:548 ../libpurple/dnsquery.c:696
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -5881,14 +1791,13 @@
 "Fel vid uppslagning %s:\n"
 "%s"
 
-#: ../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 "Fel vid uppslagning %s: %d"
 
-#: ../libgaim/dnsquery.c:554
+#: ../libpurple/dnsquery.c:573
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -5897,21 +1806,20 @@
 "Fel vid l辰sning av fr奪n uppslagningsprocess:\n"
 "%s"
 
-#: ../libgaim/dnsquery.c:558
+#: ../libpurple/dnsquery.c:577
 msgid "EOF while reading from resolver process"
 msgstr "EOF under l辰sning fr奪n uppslagningsprocess"
 
-#: ../libgaim/dnsquery.c:735
+#: ../libpurple/dnsquery.c:760
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Fel vid tr奪dskapning: %s"
 
-#: ../libgaim/dnsquery.c:736
+#: ../libpurple/dnsquery.c:761
 msgid "Unknown reason"
 msgstr "Ok辰nd anledning"
 
-#: ../libgaim/ft.c:195
-#: ../libgaim/protocols/msn/msn.c:408
+#: ../libpurple/ft.c:207
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -5920,7 +1828,7 @@
 "Fel vid l辰sning av %s:\n"
 "%s.\n"
 
-#: ../libgaim/ft.c:199
+#: ../libpurple/ft.c:211
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -5929,7 +1837,7 @@
 "Fel vid skrivning av %s: \n"
 "%s.\n"
 
-#: ../libgaim/ft.c:203
+#: ../libpurple/ft.c:215
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -5938,39 +1846,39 @@
 "Fel vid f旦rs旦k att n奪  %s: \n"
 "%s.\n"
 
-#: ../libgaim/ft.c:239
+#: ../libpurple/ft.c:251
 msgid "Directory is not writable."
 msgstr "Katalogen 辰r inte skrivbar."
 
-#: ../libgaim/ft.c:254
+#: ../libpurple/ft.c:266
 msgid "Cannot send a file of 0 bytes."
 msgstr "Kan inte skicka en fil med 0 bytes storlek."
 
-#: ../libgaim/ft.c:264
+#: ../libpurple/ft.c:276
 msgid "Cannot send a directory."
 msgstr "Kan inte skicka en katalog"
 
-#: ../libgaim/ft.c:273
+#: ../libpurple/ft.c:285
 #, c-format
 msgid "%s is not a regular file. Cowardly refusing to overwrite it.\n"
 msgstr "%s 辰r ingen vanlig fil. V辰grar fegt att skriva 旦ver den.\n"
 
-#: ../libgaim/ft.c:331
+#: ../libpurple/ft.c:345
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s vill skicka %s (%s) till dig"
 
-#: ../libgaim/ft.c:338
+#: ../libpurple/ft.c:352
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s vill skicka en fil till dig"
 
-#: ../libgaim/ft.c:379
+#: ../libpurple/ft.c:395
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Acceptera fil旦verf旦ringsf旦rfr奪gan fr奪n %s?"
 
-#: ../libgaim/ft.c:383
+#: ../libpurple/ft.c:399
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -5981,303 +1889,447 @@
 "Fj辰rrdator:%s\n"
 "Fj辰rrport:%d"
 
-#: ../libgaim/ft.c:416
+#: ../libpurple/ft.c:434
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s erbjuder sig att skicka filen %s"
 
-#: ../libgaim/ft.c:468
+#: ../libpurple/ft.c:486
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s 辰r inte ett giltigt filnamn.\n"
 
-#: ../libgaim/ft.c:489
+#: ../libpurple/ft.c:507
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Erbjuder att skicka %s till %s"
 
-#: ../libgaim/ft.c:501
+#: ../libpurple/ft.c:519
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Inleder fil旦verf旦ring av %s fr奪n %s"
 
-#: ../libgaim/ft.c:655
+#: ../libpurple/ft.c:680
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "�verf旦ringen av filen %s 辰r f辰rdig"
 
-#: ../libgaim/ft.c:658
+#: ../libpurple/ft.c:683
 msgid "File transfer complete"
 msgstr "Fil旦verf旦ringen slutf旦rdes"
 
-#: ../libgaim/ft.c:1075
+#: ../libpurple/ft.c:1101
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Du avbr旦t 旦verf旦ringen av %s"
 
-#: ../libgaim/ft.c:1080
+#: ../libpurple/ft.c:1106
 msgid "File transfer cancelled"
 msgstr "Fil旦verf旦ringen avbr旦ts"
 
-#: ../libgaim/ft.c:1138
+#: ../libpurple/ft.c:1164
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s avbr旦t 旦verf旦ringen av %s"
 
-#: ../libgaim/ft.c:1143
+#: ../libpurple/ft.c:1169
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s avbr旦t fil旦verf旦ringen"
 
-#: ../libgaim/ft.c:1200
+#: ../libpurple/ft.c:1226
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Fil旦verf旦ringen till %s misslyckades."
 
-#: ../libgaim/ft.c:1202
+#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Fil旦verf旦ringen fr奪n %s misslyckades."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:1
+#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "K旦r kommandot i en terminal"
 
-#: ../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 "Kommandot f旦r att hantera \"aim\" URLer, om aktiverat."
 
-#: ../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 "Kommandot f旦r att hantera \"gg\" URLer, om aktiverat."
 
-#: ../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 "Kommandot f旦r att hantera \"icq\" URLer, om aktiverat."
 
-#: ../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 "Kommandot f旦r att hantera \"irc\" URLer, om aktiverat."
 
-#: ../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 "Kommandot f旦r att hantera \"msnim\" URLer, om aktiverat."
 
-#: ../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 "Kommandot f旦r att hantera \"sip\" URLer, om aktiverat."
 
-#: ../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 "Kommandot f旦r att hantera \"xmpp\" URLer, om aktiverat."
 
-#: ../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 "Kommandot f旦r att hantera \"ymsgr\" URLer, om aktiverat."
 
-#: ../libgaim/gconf/gaim.schemas.in.h:10
+#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "Hanteraren f旦r \"aim\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:11
+#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "Hanteraren f旦r \"gg\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:12
+#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "Hanteraren f旦r \"icq\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:13
+#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "Hanteraren f旦r \"irc\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:14
+#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "Hanteraren f旦r \"msnim\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:15
+#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "Hanteraren f旦r \"sip\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:16
+#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "Hanteraren f旦r \"xmpp\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:17
+#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "Hanteraren f旦r \"ymsgr\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:18
-msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
+#: ../libpurple/gconf/purple.schemas.in.h:18
+msgid ""
+"True if the command specified in the \"command\" key should handle \"aim\" "
+"URLs."
 msgstr "Sant om kommandot i nykeln \"kommando\" ska hantera \"aim\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:19
-msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
+#: ../libpurple/gconf/purple.schemas.in.h:19
+msgid ""
+"True if the command specified in the \"command\" key should handle \"gg\" "
+"URLs."
 msgstr "Sant om kommandot i nykeln \"kommando\" ska hantera \"gg\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:20
-msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
+#: ../libpurple/gconf/purple.schemas.in.h:20
+msgid ""
+"True if the command specified in the \"command\" key should handle \"icq\" "
+"URLs."
 msgstr "Sant om kommandot i nykeln \"kommando\" ska hantera \"icq\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:21
-msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
+#: ../libpurple/gconf/purple.schemas.in.h:21
+msgid ""
+"True if the command specified in the \"command\" key should handle \"irc\" "
+"URLs."
 msgstr "Sant om kommandot i nykeln \"kommando\" ska hantera \"irc\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:22
-msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
+#: ../libpurple/gconf/purple.schemas.in.h:22
+msgid ""
+"True if the command specified in the \"command\" key should handle \"msnim\" "
+"URLs."
 msgstr "Sant om kommandot i nykeln \"kommando\" ska hantera \"msnim\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:23
-msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
+#: ../libpurple/gconf/purple.schemas.in.h:23
+msgid ""
+"True if the command specified in the \"command\" key should handle \"sip\" "
+"URLs."
 msgstr "Sant om kommandot i nykeln \"kommando\" ska hantera \"sip\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:24
-msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
+#: ../libpurple/gconf/purple.schemas.in.h:24
+msgid ""
+"True if the command specified in the \"command\" key should handle \"xmpp\" "
+"URLs."
 msgstr "Sant om kommandot i nykeln \"kommando\" ska hantera \"xmpp\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:25
-msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
+#: ../libpurple/gconf/purple.schemas.in.h:25
+msgid ""
+"True if the command specified in the \"command\" key should handle \"ymsgr\" "
+"URLs."
 msgstr "Sant om kommandot i nykeln \"kommando\" ska hantera \"ymsgr\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:26
-msgid "True if the command used to handle this type of URL should be run in a terminal."
-msgstr "Sant om kommandot som anv辰nds f旦r att hantera denna sortens URLer ska k旦ras i en terminal."
-
-#: ../libgaim/gconf/gaim.schemas.in.h:27
+#: ../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."
+msgstr ""
+"Sant om kommandot som anv辰nds f旦r att hantera denna sortens URLer ska k旦ras "
+"i en terminal."
+
+#: ../libpurple/gconf/purple.schemas.in.h:27
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Om det specifika kommandot ska hantera \"aim\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:28
+#: ../libpurple/gconf/purple.schemas.in.h:28
 msgid "Whether the specified command should handle \"gg\" URLs"
 msgstr "Om det specifika kommandot ska hantera \"gg\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:29
+#: ../libpurple/gconf/purple.schemas.in.h:29
 msgid "Whether the specified command should handle \"icq\" URLs"
 msgstr "Om det specifika kommandot ska hantera \"icq\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:30
+#: ../libpurple/gconf/purple.schemas.in.h:30
 msgid "Whether the specified command should handle \"irc\" URLs"
 msgstr "Om det specifika kommandot ska hantera \"irc\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:31
+#: ../libpurple/gconf/purple.schemas.in.h:31
 msgid "Whether the specified command should handle \"msnim\" URLs"
 msgstr "Om det specifika kommandot ska hantera \"msnim\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:32
+#: ../libpurple/gconf/purple.schemas.in.h:32
 msgid "Whether the specified command should handle \"sip\" URLs"
 msgstr "Om det specifika kommandot ska hantera \"sip\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:33
+#: ../libpurple/gconf/purple.schemas.in.h:33
 msgid "Whether the specified command should handle \"xmpp\" URLs"
 msgstr "Om det specifika kommandot ska hantera \"xmpp\" URLer"
 
-#: ../libgaim/gconf/gaim.schemas.in.h:34
+#: ../libpurple/gconf/purple.schemas.in.h:34
 msgid "Whether the specified command should handle \"ymsgr\" URLs"
 msgstr "Om det specifika kommandot ska hantera \"ymsgr\" URLer"
 
-#: ../libgaim/log.c:181
+#: ../libpurple/log.c:182
 msgid "<b><font color=\"red\">The logger has no read function</font></b>"
 msgstr "<b><font color=\"red\">Loggaren har ingen l辰sfunktion</font></b>"
 
-#: ../libgaim/log.c:562
+#: ../libpurple/log.c:597
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libgaim/log.c:573
+#: ../libpurple/log.c:611
 msgid "Plain text"
 msgstr "Vanlig text"
 
-#: ../libgaim/log.c:584
-msgid "Old Gaim"
-msgstr "Gamla Gaim"
-
-#: ../libgaim/log.c:691
+#: ../libpurple/log.c:625
+msgid "Old flat format"
+msgstr "Gammalt platt format"
+
+#: ../libpurple/log.c:837
 msgid "Logging of this conversation failed."
 msgstr "Loggning av denna konversationen misslyckades."
 
-#: ../libgaim/log.c:1041
+#: ../libpurple/log.c:1280
 msgid "XML"
 msgstr "XML"
 
-#: ../libgaim/log.c:1115
-#, c-format
-msgid "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr "<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-SVAR&gt;:</b></font> %s<br/>\n"
-
-#: ../libgaim/log.c:1117
-#, c-format
-msgid "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-REPLY&gt;:</b></font> %s<br/>\n"
-msgstr "<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-SVAR&gt;:</b></font> %s<br/>\n"
-
-#: ../libgaim/log.c:1175
-#: ../libgaim/log.c:1306
+#: ../libpurple/log.c:1364
+#, c-format
+msgid ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#16569E\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-SVAR&gt;:"
+"</b></font> %s<br/>\n"
+
+#: ../libpurple/log.c:1366
+#, c-format
+msgid ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-"
+"REPLY&gt;:</b></font> %s<br/>\n"
+msgstr ""
+"<font color=\"#A82F2F\"><font size=\"2\">(%s)</font> <b>%s &lt;AUTO-SVAR&gt;:"
+"</b></font> %s<br/>\n"
+
+#: ../libpurple/log.c:1424 ../libpurple/log.c:1557
 msgid "<font color=\"red\"><b>Unable to find log path!</b></font>"
 msgstr "<font color=\"red\"><b>Kunde inte hitta loggens s旦kv辰g!</b></font>"
 
-#: ../libgaim/log.c:1187
-#: ../libgaim/log.c:1320
+#: ../libpurple/log.c:1436 ../libpurple/log.c:1566
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
 msgstr "<font color=\"red\"><b>Kunde inte l辰sa fil: %s</b></font>"
 
-#: ../libgaim/log.c:1249
+#: ../libpurple/log.c:1498
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-SVAR>: %s\n"
 
-#: ../libgaim/plugin.c:282
-#: ../libgaim/protocols/jabber/buddy.c:1655
-#: ../libgaim/protocols/msn/servconn.c:139
-#: ../libgaim/protocols/msn/session.c:321
-#: ../libgaim/protocols/oscar/oscar.c:2719
-msgid "Unknown error"
-msgstr "Ok辰nt fel"
-
-#: ../libgaim/plugin.c:365
+#: ../libpurple/plugin.c:365
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Du anv辰nder %s men denna modul beh旦ver %s."
 
-#: ../libgaim/plugin.c:434
+#: ../libpurple/plugin.c:380
+msgid "This plugin has not defined an ID."
+msgstr "Insticksmodulen har inte definierat ett ID."
+
+#: ../libpurple/plugin.c:448
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Modulmagi atchar inte %d (beh旦ver %d)"
 
-#: ../libgaim/plugin.c:451
+#: ../libpurple/plugin.c:465
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI versionen passar inte %d.%d.x (beh旦ver %d.%d.x)"
 
-#: ../libgaim/plugin.c:468
+#: ../libpurple/plugin.c:482
 msgid "Plugin does not implement all required functions"
 msgstr "Insticksmodulen tillhandah奪ller inte alla n旦dv辰ndiga funktioner"
 
-#: ../libgaim/plugin.c:533
-#, c-format
-msgid "The required plugin %s was not found. Please install this plugin and try again."
-msgstr "Den efterfr奪gade insticksmodulen %s kunde inte hittas. Installera insticksmodulen och f旦rs旦k igen."
-
-#: ../libgaim/plugin.c:538
-msgid "Gaim encountered errors loading the plugin."
-msgstr "Gaim kunde inte ladda din insticksmodul."
-
-#: ../libgaim/plugin.c:560
+#: ../libpurple/plugin.c:547
+#, c-format
+msgid ""
+"The required plugin %s was not found. Please install this plugin and try "
+"again."
+msgstr ""
+"Den efterfr奪gade insticksmodulen %s kunde inte hittas. Installera "
+"insticksmodulen och f旦rs旦k igen."
+
+#: ../libpurple/plugin.c:552
+msgid "Unable to load the plugin"
+msgstr "Kunde inte ladda insticksmodulen"
+
+#: ../libpurple/plugin.c:574
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Den beg辰rda insticksmodulen %s kunde inte laddas."
 
-#: ../libgaim/plugin.c:564
-msgid "Gaim was unable to load your plugin."
-msgstr "Gaim kunde inte ladda din insticksmodul."
-
-#: ../libgaim/plugin.c:664
+#: ../libpurple/plugin.c:578
+msgid "Unable to load your plugin."
+msgstr "Kunde inte ladda din insticksmodul."
+
+#: ../libpurple/plugin.c:677
 #, c-format
 msgid "The dependent plugin %s failed to unload."
 msgstr "Den n旦dv辰ndiga insticksmodulen %s kunde inte laddas."
 
-#: ../libgaim/plugin.c:669
-msgid "Gaim encountered errors unloading the plugin."
-msgstr "Gaim st旦tte p奪 problem d奪 insticksmodulen avladdades."
+#: ../libpurple/plugin.c:681
+msgid "There were errors unloading the plugin."
+msgstr "Det blev problem d奪 insticksmodulen avladdades."
+
+#: ../libpurple/plugins/autoaccept.c:23
+msgid "Autoaccept"
+msgstr "Autoacceptera"
+
+#: ../libpurple/plugins/autoaccept.c:25 ../libpurple/plugins/autoaccept.c:26
+msgid "Auto-accept file transfer requests from selected users."
+msgstr "Autoacceptera fil旦verf旦ringsf旦rfr奪gningar fr奪n valda anv辰ndare."
+
+#: ../libpurple/plugins/autoaccept.c:80
+#, c-format
+msgid "Autoaccepted file transfer of \"%s\" from \"%s\" completed."
+msgstr "Automatiskt accepterad fil旦verf旦ring av \"%s\" fr奪n \"%s\" 辰r f辰rdig."
+
+#: ../libpurple/plugins/autoaccept.c:82
+msgid "Autoaccept complete"
+msgstr "Autoacceptering 辰r klar"
+
+#: ../libpurple/plugins/autoaccept.c:160
+#, c-format
+msgid "When a file-transfer request arrives from %s"
+msgstr "N辰r en fil旦verf旦ringsf旦rfr奪gan kommer fr奪n %s"
+
+#: ../libpurple/plugins/autoaccept.c:162
+msgid "Set Autoaccept Setting"
+msgstr "Inst辰llningar f旦r autoacceptera"
+
+# src/menus.c:280
+#: ../libpurple/plugins/autoaccept.c:164
+msgid "_Save"
+msgstr "_Spara"
+
+#: ../libpurple/plugins/autoaccept.c:165 ../libpurple/plugins/idle.c:170
+#: ../libpurple/plugins/idle.c:204 ../libpurple/plugins/idle.c:230
+#: ../libpurple/protocols/oscar/oscar.c:1454
+#: ../libpurple/protocols/oscar/oscar.c:2247
+#: ../libpurple/protocols/oscar/oscar.c:2294
+#: ../libpurple/protocols/oscar/oscar.c:5865
+#: ../libpurple/protocols/oscar/oscar.c:5920
+#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1387
+#: ../libpurple/request.h:1397
+msgid "_Cancel"
+msgstr "A_vbryt"
+
+#: ../libpurple/plugins/autoaccept.c:168
+msgid "Ask"
+msgstr "Fr奪ga"
+
+#: ../libpurple/plugins/autoaccept.c:169
+msgid "Auto Accept"
+msgstr "Autoacceptera"
+
+#: ../libpurple/plugins/autoaccept.c:170
+msgid "Auto Reject"
+msgstr "Autoavsl奪"
+
+#: ../libpurple/plugins/autoaccept.c:185
+msgid "Autoaccept File Transfers..."
+msgstr "Autoacceptera fil旦verf旦ringar..."
+
+#. XXX: Is there a better way than this? There really should be.
+#: ../libpurple/plugins/autoaccept.c:215
+msgid ""
+"Path to save the files in\n"
+"(Please provide the full path)"
+msgstr ""
+"S旦kv辰g d辰r filerna ska sparas\n"
+"(Var god ange fulla s旦kv辰gen)"
+
+#: ../libpurple/plugins/autoaccept.c:220
+msgid "Automatically reject from users not in buddy list"
+msgstr "Neka automatiskt fr奪n anv辰ndare som inte 辰r i min kompislista"
+
+#: ../libpurple/plugins/autoaccept.c:224
+msgid ""
+"Notify with a popup when an autoaccepted file transfer is complete\n"
+"(only when there's no conversation with the sender)"
+msgstr ""
+"Rapportera med en popupp n辰r en autoaccepterad fil旦verf旦ring 辰r avslutad\n"
+"(endast n辰r det inte 辰r n奪gon konversation med s辰ndaren)"
+
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1659
+msgid "Notes"
+msgstr "Noteringar"
+
+#: ../libpurple/plugins/buddynote.c:47
+msgid "Enter your notes below..."
+msgstr "Mata in dina noteringar h辰r under..."
+
+#: ../libpurple/plugins/buddynote.c:65
+msgid "Edit Notes..."
+msgstr "Redigera noteringar..."
+
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/buddynote.c:90
+msgid "Buddy Notes"
+msgstr "Kompiskommentar"
+
+#. *< name
+#. *< version
+#: ../libpurple/plugins/buddynote.c:92
+msgid "Store notes on particular buddies."
+msgstr "Spara noteringar f旦r vissa kompisar."
+
+#. *< summary
+#: ../libpurple/plugins/buddynote.c:93
+msgid "Adds the option to store notes for buddies on your buddy list."
+msgstr ""
+"L辰gger till m旦jligheten att lagra noteringar f旦r kompisar i din kompislista."
 
 #. *< type
 #. *< ui_requirement
@@ -6285,7 +2337,25 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/dbus-example.c:155
+#: ../libpurple/plugins/ciphertest.c:264
+msgid "Cipher Test"
+msgstr "Chiffertest"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/plugins/ciphertest.c:267 ../libpurple/plugins/ciphertest.c:269
+msgid "Tests the ciphers that ship with libpurple."
+msgstr "Testa chiffren som kommer med libpurple."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "DBus-exempel"
 
@@ -6293,8 +2363,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 "Exempel p奪 DBus-plugin"
 
@@ -6304,74 +2374,59 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/filectl.c:248
-msgid "Gaim File Control"
-msgstr "Gaim - Filkontroll"
+#: ../libpurple/plugins/filectl.c:248
+msgid "File Control"
+msgstr "Filkontroll"
 
 #. *< 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 "Ger dig m旦jlighet att kontrollera Gaim genom att ange kommandon i en fil."
-
-#: ../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 "Ger m旦jlighet till styrning genom att ange kommandon i en fil."
+
+#: ../libpurple/plugins/idle.c:158 ../libpurple/plugins/idle.c:218
 msgid "Minutes"
 msgstr "Minuter"
 
 #. 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:199
+#: ../libpurple/plugins/idle.c:225 ../libpurple/plugins/idle.c:318
 msgid "I'dle Mak'er"
 msgstr "Inaktivitetsskapare"
 
-#: ../libgaim/plugins/idle.c:166
-#: ../libgaim/plugins/idle.c:255
+#: ../libpurple/plugins/idle.c:166 ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Ange kontots inaktivitetstid"
 
 # src/menus.c:280
-#: ../libgaim/plugins/idle.c:169
-#: ../libgaim/plugins/idle.c:227
+#: ../libpurple/plugins/idle.c:169 ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "A_nge"
 
-#: ../libgaim/plugins/idle.c:170
-#: ../libgaim/plugins/idle.c:203
-#: ../libgaim/plugins/idle.c:228
-msgid "_Cancel"
-msgstr "A_vbryt"
-
-#: ../libgaim/plugins/idle.c:183
+#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Inga av dina konton 辰r inaktiva."
 
-#: ../libgaim/plugins/idle.c:199
-#: ../libgaim/plugins/idle.c:259
+#: ../libpurple/plugins/idle.c:200 ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Ta bort kontots inaktivitetstid"
 
-#: ../libgaim/plugins/idle.c:202
+#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Ta bort"
 
-#: ../libgaim/plugins/idle.c:224
-#: ../libgaim/plugins/idle.c:263
+#: ../libpurple/plugins/idle.c:226 ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Ange Inaktivitetstiden f旦r alla konton"
 
-#: ../libgaim/plugins/idle.c:268
+#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Tar bort inaktivitetstiden f旦r alla inaktiva konton"
 
-#: ../libgaim/plugins/idle.c:317
-#: ../libgaim/plugins/idle.c:318
+#: ../libpurple/plugins/idle.c:320 ../libpurple/plugins/idle.c:321
 msgid "Allows you to hand-configure how long you've been idle"
 msgstr "L奪ter dig manuellt ange den tid som du varit inaktiv"
 
@@ -6381,21 +2436,61 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ipc-test-client.c:87
+#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "IPC-testklient"
 
 #. *< 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 "Testinsticksmodul f旦r IPC-st旦d, som en klient."
 
 #. *  description
-#: ../libgaim/plugins/ipc-test-client.c:92
-msgid "Test plugin IPC support, as a client. This locates the server plugin and calls the commands registered."
-msgstr "Testinsticksmodul f旦r IPC-st旦d. Denna lokaliserar serverinsticksmodulen och anropar de kommandon som kr辰vs."
+#: ../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."
+msgstr ""
+"Testinsticksmodul f旦r IPC-st旦d. Denna lokaliserar serverinsticksmodulen och "
+"anropar de kommandon som kr辰vs."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/ipc-test-server.c:74
+msgid "IPC Test Server"
+msgstr "IPC-testserver"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../libpurple/plugins/ipc-test-server.c:77
+msgid "Test plugin IPC support, as a server."
+msgstr "Testinsticksmodul f旦r IPC-st旦d, som en server."
+
+#. *  description
+#: ../libpurple/plugins/ipc-test-server.c:79
+msgid "Test plugin IPC support, as a server. This registers the IPC commands."
+msgstr ""
+"Testinsticksmodul f旦r IPC-st旦d, som en server. Denna registrerar IPC-"
+"kommandona."
+
+#: ../libpurple/plugins/joinpart.c:229
+msgid "Join/Part Hiding Configuration"
+msgstr "Kommer in/L辰mnar g旦mningskonfiguration"
+
+#: ../libpurple/plugins/joinpart.c:233
+msgid "Minimum Room Size"
+msgstr "Minimal rumsstorlek"
+
+#: ../libpurple/plugins/joinpart.c:239
+msgid "User Inactivity Timeout (in minutes)"
+msgstr "Anv辰ndares inaktivitetstidsgr辰ns (i minuter)"
 
 #. *< type
 #. *< ui_requirement
@@ -6403,121 +2498,138 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ipc-test-server.c:74
-msgid "IPC Test Server"
-msgstr "IPC-testserver"
+#: ../libpurple/plugins/joinpart.c:270
+msgid "Join/Part Hiding"
+msgstr " D旦lj G奪r in/L辰mnar"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/plugins/ipc-test-server.c:77
-msgid "Test plugin IPC support, as a server."
-msgstr "Testinsticksmodul f旦r IPC-st旦d, som en server."
+#: ../libpurple/plugins/joinpart.c:273
+msgid "Hides extraneous join/part messages."
+msgstr "G旦mmer extraaktiga kommer in/l辰mnar meddelanden."
 
 #. *  description
-#: ../libgaim/plugins/ipc-test-server.c:79
-msgid "Test plugin IPC support, as a server. This registers the IPC commands."
-msgstr "Testinsticksmodul f旦r IPC-st旦d, som en server. Denna registrerar IPC-kommandona."
+#: ../libpurple/plugins/joinpart.c:275
+msgid ""
+"This plugin hides join/part messages in large rooms, except for those users "
+"actively taking part in a conversation."
+msgstr ""
+"Denna modul g旦mmer kommer in/l辰mnar meddelanden i stora rum, f旦rutom f旦r de "
+"anv辰ndare som 辰r aktiva i konversationen."
 
 #. 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:492
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libgaim/plugins/log_reader.c:1552
+#: ../libpurple/plugins/log_reader.c:1573
 msgid "User is offline."
 msgstr "Anv辰ndaren 辰r fr奪nkopplad."
 
-#: ../libgaim/plugins/log_reader.c:1558
+#: ../libpurple/plugins/log_reader.c:1579
 msgid "Auto-response sent:"
 msgstr "Auto-svar skickat:"
 
-#: ../libgaim/plugins/log_reader.c:1568
-#: ../libgaim/plugins/log_reader.c:1571
-#: ../libgaim/plugins/statenotify.c:80
+#: ../libpurple/plugins/log_reader.c:1589
+#: ../libpurple/plugins/log_reader.c:1592
+#: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s har kopplat ifr奪n."
 
-#: ../libgaim/plugins/log_reader.c:1585
+#: ../libpurple/plugins/log_reader.c:1606
 msgid "One or more messages may have been undeliverable."
 msgstr "Ett eller fler meddelande har kanske inte blivit levererad."
 
-#: ../libgaim/plugins/log_reader.c:1595
+#: ../libpurple/plugins/log_reader.c:1616
 msgid "You were disconnected from the server."
 msgstr "Du har blivit fr奪nkopplad fr奪n servern."
 
-#: ../libgaim/plugins/log_reader.c:1603
-msgid "You are currently disconnected. Messages will not be received unless you are logged in."
-msgstr "Du 辰r just nu inte ansluten. Meddelanden kan inte tas emot om du inte 辰r ansluten."
-
-#: ../libgaim/plugins/log_reader.c:1618
+#: ../libpurple/plugins/log_reader.c:1624
+msgid ""
+"You are currently disconnected. Messages will not be received unless you are "
+"logged in."
+msgstr ""
+"Du 辰r just nu inte ansluten. Meddelanden kan inte tas emot om du inte 辰r "
+"ansluten."
+
+#: ../libpurple/plugins/log_reader.c:1639
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "Meddelandet kunde inte skickas eftersom den maximala l辰ngden 旦vertr辰ddes."
-
-#: ../libgaim/plugins/log_reader.c:1623
+msgstr ""
+"Meddelandet kunde inte skickas eftersom den maximala l辰ngden 旦vertr辰ddes."
+
+#: ../libpurple/plugins/log_reader.c:1644
 msgid "Message could not be sent."
 msgstr "Meddelande kunde inte skickas."
 
 #. 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:2343
+#: ../libpurple/plugins/log_reader.c:2466
 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:2356
+#: ../libpurple/plugins/log_reader.c:2471
 msgid "Fire"
-msgstr "Eld"
+msgstr "Fire"
 
 #. 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:2368
+#: ../libpurple/plugins/log_reader.c:2475
 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.
+#: ../libpurple/plugins/log_reader.c:2382
+#: ../libpurple/plugins/log_reader.c:2480
+msgid "QIP"
+msgstr "QIP"
+
 # src/sidebar.c:103
 #. 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:2394
+#: ../libpurple/plugins/log_reader.c:2484
 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:2406
+#: ../libpurple/plugins/log_reader.c:2488
 msgid "Trillian"
 msgstr "Trillian"
 
 #. Add general preferences.
-#: ../libgaim/plugins/log_reader.c:2067
+#: ../libpurple/plugins/log_reader.c:2448
 msgid "General Log Reading Configuration"
 msgstr "Allm辰nn konfiguration f旦r logg-l辰sning"
 
-#: ../libgaim/plugins/log_reader.c:2071
+#: ../libpurple/plugins/log_reader.c:2452
 msgid "Fast size calculations"
 msgstr "Snabb storleksber辰kning"
 
-#: ../libgaim/plugins/log_reader.c:2075
+#: ../libpurple/plugins/log_reader.c:2456
 msgid "Use name heuristics"
 msgstr "Anv辰nd namn heuristiskt"
 
 #. Add Log Directory preferences.
-#: ../libgaim/plugins/log_reader.c:2081
+#: ../libpurple/plugins/log_reader.c:2462
 msgid "Log Directory"
 msgstr "Logg katalog"
 
@@ -6527,84 +2639,185 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/log_reader.c:2126
+#: ../libpurple/plugins/log_reader.c:2517
 msgid "Log Reader"
 msgstr "Loggvisare"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libgaim/plugins/log_reader.c:2130
+#: ../libpurple/plugins/log_reader.c:2521
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Inkludera andra IM-klienters loggfiler i loggfilsvisaren."
 
 #. * description
-#: ../libgaim/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"
+#: ../libpurple/plugins/log_reader.c:2525
+msgid ""
+"When viewing logs, this plugin will include logs from other IM clients. "
+"Currently, this includes Adium, MSN Messenger, and Trillian.\n"
 "\n"
-"WARNING: This plugin is still alpha code and may crash frequently.  Use it at your own risk!"
-msgstr ""
-"Vid visning av loggfiler inkluderar denna modul loggar fr奪n andra IM-klienter. F旦r n辰rvarande inkluderar detta  Adium, MSN Messenger, och Trillian.\n"
+"WARNING: This plugin is still alpha code and may crash frequently.  Use it "
+"at your own risk!"
+msgstr ""
+"Vid visning av loggfiler inkluderar denna modul loggar fr奪n andra IM-"
+"klienter. F旦r n辰rvarande inkluderar detta  Adium, MSN Messenger, och "
+"Trillian.\n"
 "\n"
-"VARNING: Denna modul 辰r fortfarande alpha-kod och kan krasha ofta. Anv辰nd p奪 egen risk!"
-
-#: ../libgaim/plugins/mono/loader/mono.c:213
+"VARNING: Denna modul 辰r fortfarande alpha-kod och kan krasha ofta. Anv辰nd p奪 "
+"egen risk!"
+
+#: ../libpurple/plugins/mono/loader/mono.c:217
 msgid "Mono Plugin Loader"
 msgstr "L辰sare f旦r Monomoduler"
 
-#: ../libgaim/plugins/mono/loader/mono.c:215
-#: ../libgaim/plugins/mono/loader/mono.c:216
+#: ../libpurple/plugins/mono/loader/mono.c:219
+#: ../libpurple/plugins/mono/loader/mono.c:220
 msgid "Loads .NET plugins with Mono."
 msgstr "L辰ser .NET-moduler med Mono."
 
+#. *< magic
+#. *< major version
+#. *< minor version
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../libpurple/plugins/newline.c:68
+msgid "New Line"
+msgstr "Ny rad"
+
+#. *< name
+#. *< version
+#: ../libpurple/plugins/newline.c:70
+msgid "Prepends a newline to displayed message."
+msgstr "L辰gger en tom rad f旦re det visade meddelandet."
+
+#. *< summary
+#: ../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 ""
+"Inleder med en tom linje i meddelandet s奪 att resten av meddelandet "
+"upptr辰der nedanf旦r sk辰rmnamnet i konversationsf旦nstret."
+
+#: ../libpurple/plugins/offlinemsg.c:23
+msgid "Offline Message Emulation"
+msgstr "Fr奪nkopplad meddelandeemulering"
+
+#: ../libpurple/plugins/offlinemsg.c:25 ../libpurple/plugins/offlinemsg.c:26
+msgid "Save messages sent to an offline user as pounce."
+msgstr "Spara meddelandet skickat till en fr奪nkopplad anv辰ndare som en attack"
+
+#: ../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 ""
+"Resten av meddelanden kommer sparas som attacker. Du kan 辰ndra/ta bort "
+"attackerna fr奪n `Kompisattacker' dialogen."
+
+#: ../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 ""
+"\"%s\" 辰r f旦r n辰rvarande fr奪nkopplad. Vill du spara resten av meddelandena "
+"som en attack och skicka dem automatiskt n辰r \"%s\" ansluter igen?"
+
+#: ../libpurple/plugins/offlinemsg.c:156
+msgid "Offline Message"
+msgstr "Fr奪nkopplade meddeladen"
+
+#: ../libpurple/plugins/offlinemsg.c:157
+msgid "You can edit/delete the pounce from the `Buddy Pounces' dialog"
+msgstr "Du kan 辰ndra/ta bort attackerna fr奪n `Kompisattacker' dialogen"
+
+#: ../libpurple/plugins/offlinemsg.c:161
+#: ../libpurple/protocols/msn/dialog.c:133
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:1917
+#: ../libpurple/protocols/silc/buddy.c:317
+#: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:304
+#: ../libpurple/protocols/silc10/buddy.c:314
+#: ../libpurple/protocols/silc10/pk.c:119
+#: ../libpurple/protocols/silc10/wb.c:304 ../pidgin/gtkrequest.c:267
+msgid "Yes"
+msgstr "Ja"
+
+#: ../libpurple/plugins/offlinemsg.c:162
+#: ../libpurple/protocols/msn/dialog.c:134
+#: ../libpurple/protocols/msn/msn.c:522 ../libpurple/protocols/msn/msn.c:532
+#: ../libpurple/protocols/novell/novell.c:1918
+#: ../libpurple/protocols/silc/buddy.c:318
+#: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:305
+#: ../libpurple/protocols/silc10/buddy.c:315
+#: ../libpurple/protocols/silc10/pk.c:120
+#: ../libpurple/protocols/silc10/wb.c:305 ../pidgin/gtkrequest.c:268
+msgid "No"
+msgstr "Nej"
+
+#: ../libpurple/plugins/offlinemsg.c:189
+msgid "Save offline messages in pounce"
+msgstr "Spara fr奪nkopplade meddelanden som attacker"
+
+#: ../libpurple/plugins/offlinemsg.c:193
+msgid "Do not ask. Always save in pounce."
+msgstr "Fr奪ga inte. Spara alltid som attack."
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/perl/perl.c:588
+#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
-msgstr "Perl-insticksmodulladdare"
+msgstr "Inl辰sare f旦r Perl-moduler"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../libgaim/plugins/perl/perl.c:590
-#: ../libgaim/plugins/perl/perl.c:591
+#: ../libpurple/plugins/perl/perl.c:603 ../libpurple/plugins/perl/perl.c:604
 msgid "Provides support for loading perl plugins."
 msgstr "G旦r det m旦jligt att ladda perl-insticksmoduler"
 
-#: ../libgaim/plugins/psychic.c:19
+#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Psykiskt l辰ge"
 
-#: ../libgaim/plugins/psychic.c:20
+#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Siande l辰ge f旦r inkommande konversation"
 
-#: ../libgaim/plugins/psychic.c:21
-msgid "Causes conversation windows to appear as other users begin to message you.  This works for AIM, ICQ, Jabber, Sametime, and Yahoo!"
-msgstr "F奪r konversationsf旦nster att dyka upp d奪 andra anv辰ndare b旦rjar att skicka meddelande till dig. Detta fungerar f旦r AIM, ICQ, Jabber, Sametime och Yahoo!"
-
-#: ../libgaim/plugins/psychic.c:66
+#: ../libpurple/plugins/psychic.c:22
+msgid ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"F奪r konversationsf旦nster att dyka upp d奪 andra anv辰ndare b旦rjar att skicka "
+"meddelande till dig. Detta fungerar f旦r AIM, ICQ, XMPP, Sametime och Yahoo!"
+
+#: ../libpurple/plugins/psychic.c:72
 msgid "You feel a disturbance in the force..."
 msgstr "Du k辰nner en st旦rning i kraften..."
 
-#: ../libgaim/plugins/psychic.c:85
+#: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
 msgstr "Till奪t endast f旦r anv辰ndarna i min kompislista"
 
-#: ../libgaim/plugins/psychic.c:90
+#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "St辰ng av vid fr奪nvaro"
 
-#: ../libgaim/plugins/psychic.c:94
+#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Visa notifieringsmeddelande i konversationer"
 
-#: ../libgaim/plugins/psychic.c:99
+#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "H旦j siade konversationer"
 
@@ -6614,7 +2827,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/signals-test.c:684
+#: ../libpurple/plugins/signals-test.c:684
 msgid "Signals Test"
 msgstr "Signaltest"
 
@@ -6622,8 +2835,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 "Test f旦r att avg旦ra om alla signaler fungerar korrekt."
 
@@ -6633,7 +2846,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/simple.c:37
+#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Enken insticksmodul"
 
@@ -6643,8 +2856,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 "Testar f旦r att se att det mesta fungerar."
 
@@ -6654,7 +2866,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl.c:94
+#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -6662,8 +2874,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 "Ger ett omslag runt SSL-st旦dsbibliotek"
 
@@ -6673,7 +2884,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:240
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:275
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -6681,8 +2892,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:243
-#: ../libgaim/plugins/ssl/ssl-gnutls.c:245
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:278
+#: ../libpurple/plugins/ssl/ssl-gnutls.c:280
 msgid "Provides SSL support through GNUTLS."
 msgstr "Ger SSL-st旦d genom GNUTLS."
 
@@ -6692,7 +2903,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/ssl/ssl-nss.c:409
+#: ../libpurple/plugins/ssl/ssl-nss.c:423
 msgid "NSS"
 msgstr "NSS"
 
@@ -6700,49 +2911,49 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/ssl/ssl-nss.c:412
-#: ../libgaim/plugins/ssl/ssl-nss.c:414
+#: ../libpurple/plugins/ssl/ssl-nss.c:426
+#: ../libpurple/plugins/ssl/ssl-nss.c:428
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Ger SSL-st旦d genom Mozilla NNS."
 
-#: ../libgaim/plugins/statenotify.c:50
+#: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s 辰r inte l辰ngre fr奪nvarande."
 
-#: ../libgaim/plugins/statenotify.c:52
+#: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s har g奪tt iv辰g."
 
-#: ../libgaim/plugins/statenotify.c:62
+#: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s har blivit inaktiv."
 
-#: ../libgaim/plugins/statenotify.c:64
+#: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s 辰r inte l辰ngre inaktiv."
 
-#: ../libgaim/plugins/statenotify.c:73
+#: ../libpurple/plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s har loggat in."
 
-#: ../libgaim/plugins/statenotify.c:91
+#: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Rapportera n辰r"
 
-#: ../libgaim/plugins/statenotify.c:94
+#: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "Kompisen _f旦rsvinner"
 
-#: ../libgaim/plugins/statenotify.c:97
+#: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "Kompisen blir _inaktiv"
 
-#: ../libgaim/plugins/statenotify.c:100
+#: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "En kompi_s loggar in/kopplar ifr奪n"
 
@@ -6752,7 +2963,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libgaim/plugins/statenotify.c:142
+#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Rapportering av kompisstatus"
 
@@ -6760,33 +2971,61 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/plugins/statenotify.c:145
-#: ../libgaim/plugins/statenotify.c:148
-msgid "Notifies in a conversation window when a buddy goes or returns from away or idle."
-msgstr "Rapporterar i konversationsf旦nstret n辰r en kompis blir fr奪nvarande/inaktiv eller kommer tillbaka."
-
-#: ../libgaim/plugins/tcl/tcl.c:413
+#: ../libpurple/plugins/statenotify.c:151
+#: ../libpurple/plugins/statenotify.c:154
+msgid ""
+"Notifies in a conversation window when a buddy goes or returns from away or "
+"idle."
+msgstr ""
+"Rapporterar i konversationsf旦nstret n辰r en kompis blir fr奪nvarande/inaktiv "
+"eller kommer tillbaka."
+
+#: ../libpurple/plugins/tcl/tcl.c:421
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-insticksmodulladdare"
 
-#: ../libgaim/plugins/tcl/tcl.c:415
-#: ../libgaim/plugins/tcl/tcl.c:416
+#: ../libpurple/plugins/tcl/tcl.c:423 ../libpurple/plugins/tcl/tcl.c:424
 msgid "Provides support for loading Tcl plugins"
 msgstr "G旦r det m旦jligt att ladda Tcl-insticksmoduler"
 
-#: ../libgaim/plugins/tcl/tcl.c:481
-msgid "Unable to detect ActiveTCL installation. If you wish to use TCL plugins, install ActiveTCL from http://www.activestate.com\n"
-msgstr "Kunde inte finna en installation av  ActiveTCL. Om du t辰nker anv辰nda TCL-modulen m奪ste du installera ActiveTCL fr奪n http://www.activestate.com\n"
+#: ../libpurple/plugins/tcl/tcl.c:507
+msgid ""
+"Unable to detect ActiveTCL installation. If you wish to use TCL plugins, "
+"install ActiveTCL from http://www.activestate.com\n"
+msgstr ""
+"Kunde inte finna en installation av  ActiveTCL. Om du t辰nker anv辰nda TCL-"
+"modulen m奪ste du installera ActiveTCL fr奪n http://www.activestate.com\n"
 
 #. Send a message about the connection error
-#: ../libgaim/protocols/bonjour/bonjour.c:111
+#: ../libpurple/protocols/bonjour/bonjour.c:112
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Kan inte lyssna efter inkommande IM anslutningar\n"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:146
-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+#: ../libpurple/protocols/bonjour/bonjour.c:137
+msgid ""
+"Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr "Kunde inte skapa en anslutning via den lokala mDNS-servern. K旦rs den?"
 
+#. 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:294
+#: ../libpurple/protocols/gg/gg.c:1009 ../libpurple/protocols/irc/irc.c:530
+#: ../libpurple/protocols/irc/msgs.c:310
+#: ../libpurple/protocols/jabber/buddy.c:1472
+#: ../libpurple/protocols/novell/novell.c:2819
+#: ../libpurple/protocols/oscar/oscar.c:733
+#: ../libpurple/protocols/oscar/oscar.c:4545
+#: ../libpurple/protocols/oscar/oscar.c:5611
+#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/silc/buddy.c:1476
+#: ../libpurple/protocols/silc10/buddy.c:1476
+#: ../libpurple/protocols/yahoo/yahoo.c:3397
+#: ../libpurple/protocols/yahoo/yahoo.c:3470 ../libpurple/status.c:157
+#: ../pidgin/gtkdocklet.c:442 ../pidgin/gtkprefs.c:1932
+#: ../pidgin/gtkstatusbox.c:1056
+msgid "Away"
+msgstr "Fr奪nvarande"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -6797,420 +3036,425 @@
 #. *< 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 "Insticksmodul f旦r Bonjour-protokollet"
 
-#: ../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-anv辰ndare"
+#: ../libpurple/protocols/bonjour/bonjour.c:470
+#: ../libpurple/protocols/bonjour/bonjour.c:477
+#: ../libpurple/protocols/bonjour/bonjour.c:526
+msgid "Purple Person"
+msgstr "Purple person"
 
 #. Creating the user splits
-#: ../libgaim/protocols/bonjour/bonjour.c:578
-#: ../libgaim/protocols/silc/silc.c:931
+#: ../libpurple/protocols/bonjour/bonjour.c:575
+#: ../libpurple/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "V辰rdnamn"
 
 #. Creating the options for the protocol
-#: ../libgaim/protocols/bonjour/bonjour.c:582
-#: ../libgaim/protocols/gg/gg.c:622
-#: ../libgaim/protocols/jabber/jabber.c:805
+#: ../libpurple/protocols/bonjour/bonjour.c:579
+#: ../libpurple/protocols/gg/gg.c:627
+#: ../libpurple/protocols/jabber/jabber.c:828
 msgid "First name"
 msgstr "F旦rnamn"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:585
-#: ../libgaim/protocols/gg/gg.c:617
-#: ../libgaim/protocols/jabber/jabber.c:810
+#: ../libpurple/protocols/bonjour/bonjour.c:582
+#: ../libpurple/protocols/gg/gg.c:622
+#: ../libpurple/protocols/jabber/jabber.c:833
 msgid "Last name"
 msgstr "Efternamn"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:588
-#: ../libgaim/protocols/gg/gg.c:468
-#: ../libgaim/protocols/jabber/jabber.c:795
-#: ../libgaim/protocols/silc/silc.c:695
-#: ../libgaim/protocols/silc/silc.c:935
+#: ../libpurple/protocols/bonjour/bonjour.c:585
+#: ../libpurple/protocols/gg/gg.c:472
+#: ../libpurple/protocols/jabber/jabber.c:818
+#: ../libpurple/protocols/silc/silc.c:770
+#: ../libpurple/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc10/silc.c:681
+#: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
 msgstr "E-post"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:591
+#: ../libpurple/protocols/bonjour/bonjour.c:588
 msgid "AIM Account"
 msgstr "AIM-konto"
 
-#: ../libgaim/protocols/bonjour/bonjour.c:594
-msgid "Jabber Account"
-msgstr "Jabber-konto"
-
-#: ../libgaim/protocols/bonjour/bonjour.h:35
+#: ../libpurple/protocols/bonjour/bonjour.c:591
+msgid "XMPP Account"
+msgstr "XMPP-konto"
+
+#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libgaim/protocols/bonjour/jabber.c:374
+#: ../libpurple/protocols/bonjour/jabber.c:395
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s har st辰ngt konversationen."
 
-#: ../libgaim/protocols/bonjour/jabber.c:461
-msgid "Cannot open socket"
-msgstr "Kan inte 旦ppna uttag"
-
-#: ../libgaim/protocols/bonjour/jabber.c:469
-msgid "Error setting socket options"
-msgstr "Fel vid angivning av socket-val"
-
-#: ../libgaim/protocols/bonjour/jabber.c:493
-msgid "Could not bind socket to port"
-msgstr "Kunde inte binda uttag till port"
-
-#: ../libgaim/protocols/bonjour/jabber.c:501
-msgid "Could not listen on socket"
-msgstr "Kunde inte lyssna p奪 uttag"
-
-#: ../libgaim/protocols/bonjour/jabber.c:594
+#: ../libpurple/protocols/bonjour/jabber.c:441
+#: ../libpurple/protocols/bonjour/jabber.c:654
+#: ../libpurple/protocols/bonjour/jabber.c:679
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Kan inte skicka meddelandet, konversationen kunde inte startas."
 
-#: ../libgaim/protocols/gg/gg.c:76
-#: ../libgaim/proxy.c:1791
+#: ../libpurple/protocols/bonjour/jabber.c:575
+msgid "Cannot open socket"
+msgstr "Kan inte 旦ppna uttag"
+
+#: ../libpurple/protocols/bonjour/jabber.c:583
+msgid "Error setting socket options"
+msgstr "Fel vid angivning av socket-val"
+
+#: ../libpurple/protocols/bonjour/jabber.c:607
+msgid "Could not bind socket to port"
+msgstr "Kunde inte binda uttag till port"
+
+#: ../libpurple/protocols/bonjour/jabber.c:615
+msgid "Could not listen on socket"
+msgstr "Kunde inte lyssna p奪 uttag"
+
+#: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1812
 msgid "Invalid proxy settings"
 msgstr "Felaktiga proxyinst辰llningar"
 
-#: ../libgaim/protocols/gg/gg.c:77
-#: ../libgaim/proxy.c:1791
-msgid "Either the host name or port number specified for your given proxy type is invalid."
-msgstr "Antingen v辰rdnamnet eller portnummret som 辰r angivet f旦r din proxytyp 辰r ogiltigt."
-
-#: ../libgaim/protocols/gg/gg.c:115
-#: ../libgaim/protocols/gg/gg.c:137
-#: ../libgaim/protocols/gg/gg.c:180
+#: ../libpurple/protocols/gg/gg.c:77 ../libpurple/proxy.c:1812
+msgid ""
+"Either the host name or port number specified for your given proxy type is "
+"invalid."
+msgstr ""
+"Antingen v辰rdnamnet eller portnummret som 辰r angivet f旦r din proxytyp 辰r "
+"ogiltigt."
+
+#: ../libpurple/protocols/gg/gg.c:115 ../libpurple/protocols/gg/gg.c:137
+#: ../libpurple/protocols/gg/gg.c:180
 msgid "Token Error"
 msgstr "Mark旦rsfel"
 
-#: ../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 "Kan inte h辰mta mark旦ren.\n"
 
 # Eller m旦jligtvis i best辰md form, "kompislistan".
-#: ../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 "Spara kompislista..."
 
-#: ../libgaim/protocols/gg/gg.c:270
+#: ../libpurple/protocols/gg/gg.c:270
 msgid "Your buddylist is empty, nothing was written to the file."
 msgstr "Din kompislista 辰r tom. Ingenting skrevs till filen."
 
-#: ../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 "Kan inte 旦ppna fil"
 
-#: ../libgaim/protocols/gg/gg.c:289
+#: ../libpurple/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Kompislistan sparad utan problem!"
 
-#: ../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 "Kunde inte l辰sa in kompislista"
 
-#: ../libgaim/protocols/gg/gg.c:324
+#: ../libpurple/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "L辰s in _kompislista..."
 
-#: ../libgaim/protocols/gg/gg.c:325
+#: ../libpurple/protocols/gg/gg.c:325
 msgid "Buddylist loaded successfully!"
 msgstr "Kompislistan inl辰st utan problem!"
 
 # M旦jligen b辰ttre i best辰md form, eftersom man antaligen bara
 # har en kompislista.
-#: ../libgaim/protocols/gg/gg.c:336
+#: ../libpurple/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Spara kompislista..."
 
-#: ../libgaim/protocols/gg/gg.c:380
+#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "Fyll i registreringsf辰lten."
 
-#: ../libgaim/protocols/gg/gg.c:385
+#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "L旦senorden st辰mmer inte 旦verens."
 
-#: ../libgaim/protocols/gg/gg.c:394
+#: ../libpurple/protocols/gg/gg.c:398
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Kunde inte registrera nytt konto. Ett fel uppstod.\n"
 
-#: ../libgaim/protocols/gg/gg.c:407
+#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nytt Gadu-gadu-konto registrerat"
 
-#: ../libgaim/protocols/gg/gg.c:408
+#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "Registreringen lyckades!"
 
-#: ../libgaim/protocols/gg/gg.c:473
-#: ../libgaim/protocols/gg/gg.c:764
-#: ../libgaim/protocols/jabber/jabber.c:784
-#: ../libgaim/protocols/jabber/jabber.c:1353
+#: ../libpurple/protocols/gg/gg.c:477 ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/jabber/jabber.c:807
+#: ../libpurple/protocols/jabber/jabber.c:1369
 msgid "Password"
 msgstr "L旦senord"
 
-#: ../libgaim/protocols/gg/gg.c:478
-#: ../libgaim/protocols/gg/gg.c:769
+#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
 msgid "Password (retype)"
 msgstr "L旦senord (upprepa)"
 
-#: ../libgaim/protocols/gg/gg.c:483
-#: ../libgaim/protocols/gg/gg.c:774
+#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
 msgid "Enter current token"
 msgstr "Ange nuvarande mark旦r"
 
-#: ../libgaim/protocols/gg/gg.c:489
-#: ../libgaim/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Current token"
 msgstr "Nuvarande mark旦r"
 
-#: ../libgaim/protocols/gg/gg.c:493
-#: ../libgaim/protocols/gg/gg.c:494
+#: ../libpurple/protocols/gg/gg.c:497 ../libpurple/protocols/gg/gg.c:498
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrera nytt Gadu-Gadu-konto"
 
-#: ../libgaim/protocols/gg/gg.c:495
+#: ../libpurple/protocols/gg/gg.c:499
 msgid "Please, fill in the following fields"
 msgstr "Fyll i f旦ljande f辰lt"
 
-#: ../libgaim/protocols/gg/gg.c:632
-#: ../libgaim/protocols/gg/gg.c:1039
-#: ../libgaim/protocols/gg/gg.c:1113
-#: ../libgaim/protocols/jabber/jabber.c:820
-#: ../libgaim/protocols/oscar/oscar.c:3764
-#: ../libgaim/protocols/oscar/oscar.c:3777
-#: ../libgaim/protocols/qq/buddy_info.c:49
+#: ../libpurple/protocols/gg/gg.c:637 ../libpurple/protocols/gg/gg.c:1049
+#: ../libpurple/protocols/gg/gg.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:843
+#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3811
+#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Stad"
 
-#: ../libgaim/protocols/gg/gg.c:637
+#: ../libpurple/protocols/gg/gg.c:642
 msgid "Year of birth"
 msgstr "F旦delse奪r"
 
-#: ../libgaim/protocols/gg/gg.c:640
-#: ../libgaim/protocols/msn/msn.c:1538
-#: ../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:645 ../libpurple/protocols/msn/msn.c:1558
+#: ../libpurple/protocols/oscar/oscar.c:3741
+#: ../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:1091
 msgid "Gender"
 msgstr "K旦n"
 
-#: ../libgaim/protocols/gg/gg.c:641
+#: ../libpurple/protocols/gg/gg.c:646
 msgid "Male or female"
 msgstr "Man eller kvinna"
 
-#: ../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:647
+#: ../libpurple/protocols/oscar/oscar.c:3741
+#: ../libpurple/protocols/qq/buddy_info.c:83
+#: ../libpurple/protocols/qq/qq.c:224
 msgid "Male"
 msgstr "Man"
 
-#: ../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:648
+#: ../libpurple/protocols/oscar/oscar.c:3741
+#: ../libpurple/protocols/qq/buddy_info.c:84
+#: ../libpurple/protocols/qq/qq.c:227
 msgid "Female"
 msgstr "Kvinna"
 
-#: ../libgaim/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Only online"
 msgstr "Enbart ansluten"
 
-#: ../libgaim/protocols/gg/gg.c:651
-#: ../libgaim/protocols/gg/gg.c:652
+#: ../libpurple/protocols/gg/gg.c:656 ../libpurple/protocols/gg/gg.c:657
 msgid "Find buddies"
 msgstr "S旦k efter kompisar"
 
-#: ../libgaim/protocols/gg/gg.c:653
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Please, enter your search criteria below"
 msgstr "Ange dina s旦kkriterier nedan"
 
-#: ../libgaim/protocols/gg/gg.c:690
+#: ../libpurple/protocols/gg/gg.c:696
 msgid "Fill in the fields."
 msgstr "Fyll i f辰lten."
 
-#: ../libgaim/protocols/gg/gg.c:702
+#: ../libpurple/protocols/gg/gg.c:708
 msgid "Your current password is different from the one that you specified."
 msgstr "Ditt nuvarande l旦senord 辰r ett annat 辰n det du angav."
 
-#: ../libgaim/protocols/gg/gg.c:716
+#: ../libpurple/protocols/gg/gg.c:722
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Kan inte 辰ndra l旦senordet. Ett fel uppstod.\n"
 
-#: ../libgaim/protocols/gg/gg.c:725
+#: ../libpurple/protocols/gg/gg.c:731
 msgid "Change password for the Gadu-Gadu account"
 msgstr "�ndra l旦senordet f旦r Gadu-Gadu-kontot"
 
-#: ../libgaim/protocols/gg/gg.c:726
+#: ../libpurple/protocols/gg/gg.c:732
 msgid "Password was changed successfully!"
 msgstr "L旦senordet 辰ndrat utan problem!"
 
-#: ../libgaim/protocols/gg/gg.c:759
+#: ../libpurple/protocols/gg/gg.c:765
 msgid "Current password"
 msgstr "Nuvarande l旦senord"
 
-#: ../libgaim/protocols/gg/gg.c:784
+#: ../libpurple/protocols/gg/gg.c:790
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Var god ange ditt nuvarande l旦senord och nya l旦senord f旦r UIN: "
 
-#: ../libgaim/protocols/gg/gg.c:788
-#: ../libgaim/protocols/gg/gg.c:789
+#: ../libpurple/protocols/gg/gg.c:794 ../libpurple/protocols/gg/gg.c:795
 msgid "Change Gadu-Gadu Password"
 msgstr "�ndra Gadu-Gadu-l旦senord"
 
-#: ../libgaim/protocols/gg/gg.c:863
+#: ../libpurple/protocols/gg/gg.c:871
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "V辰lj en chatt f旦r kompisen: %s"
 
-#: ../libgaim/protocols/gg/gg.c:866
-#: ../libgaim/protocols/gg/gg.c:867
+#: ../libpurple/protocols/gg/gg.c:874 ../libpurple/protocols/gg/gg.c:875
 msgid "Add to chat..."
 msgstr "L辰gg till i chatt..."
 
-#: ../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:1003
+#: ../libpurple/protocols/jabber/buddy.c:1466
+#: ../libpurple/protocols/novell/novell.c:2828
+#: ../libpurple/protocols/oscar/oscar.c:828
+#: ../libpurple/protocols/oscar/oscar.c:5583
+#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
+#: ../libpurple/protocols/yahoo/yahoo.c:2917 ../libpurple/status.c:153
+#: ../pidgin/gtkblist.c:3070 ../pidgin/gtkblist.c:3411
+#: ../pidgin/gtkdocklet.c:450 ../pidgin/gtkstatusbox.c:1059
+msgid "Offline"
+msgstr "Fr奪nkopplad"
+
+#: ../libpurple/protocols/gg/gg.c:1006
+#: ../libpurple/protocols/jabber/buddy.c:1468
+#: ../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:2816
+#: ../libpurple/protocols/yahoo/yahoo.c:2919 ../libpurple/status.c:154
+#: ../pidgin/gtkdocklet.c:438 ../pidgin/gtkstatusbox.c:1055
+msgid "Available"
+msgstr "Tillg辰nglig"
+
+#: ../libpurple/protocols/gg/gg.c:1038 ../libpurple/protocols/gg/gg.c:1112
+#: ../libpurple/protocols/oscar/oscar.c:2671
+#: ../libpurple/protocols/oscar/oscar.c:3708
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libgaim/protocols/gg/gg.c:1031
-#: ../libgaim/protocols/gg/gg.c:1107
-#: ../libgaim/protocols/jabber/buddy.c:1528
-#: ../libgaim/protocols/jabber/buddy.c:1704
-#: ../libgaim/protocols/oscar/oscar.c:3704
-#: ../libgaim/protocols/silc/ops.c:1024
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1115
+#: ../libpurple/protocols/jabber/buddy.c:1623
+#: ../libpurple/protocols/jabber/buddy.c:1799
+#: ../libpurple/protocols/oscar/oscar.c:3719
+#: ../libpurple/protocols/silc/ops.c:990
+#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "F旦rnamn"
 
-#: ../libgaim/protocols/gg/gg.c:1044
-#: ../libgaim/protocols/gg/gg.c:1116
+#: ../libpurple/protocols/gg/gg.c:1054 ../libpurple/protocols/gg/gg.c:1124
 msgid "Birth Year"
 msgstr "F旦delse奪r"
 
-#: ../libgaim/protocols/gg/gg.c:1098
-#: ../libgaim/protocols/gg/gg.c:1167
-#: ../libgaim/protocols/oscar/oscar.c:3886
+#: ../libpurple/protocols/gg/gg.c:1106 ../libpurple/protocols/gg/gg.c:1175
+#: ../libpurple/protocols/oscar/oscar.c:3920
 msgid "Unable to display the search results."
 msgstr "Kan inte visa s旦kningsresultatet."
 
-#: ../libgaim/protocols/gg/gg.c:1158
+#: ../libpurple/protocols/gg/gg.c:1166
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu Publik katalog"
 
-#: ../libgaim/protocols/gg/gg.c:1159
+#: ../libpurple/protocols/gg/gg.c:1167
 msgid "Search results"
 msgstr "S旦kresultat"
 
-#: ../libgaim/protocols/gg/gg.c:1202
+#: ../libpurple/protocols/gg/gg.c:1210
 msgid "No matching users found"
 msgstr "Inga matchande anv辰ndare funna"
 
-#: ../libgaim/protocols/gg/gg.c:1203
+#: ../libpurple/protocols/gg/gg.c:1211
 msgid "There are no users matching your search criteria."
 msgstr "Det finns inga anv辰ndare som matchar dina s旦kkriterier."
 
-#: ../libgaim/protocols/gg/gg.c:1297
-#: ../libgaim/protocols/gg/gg.c:1446
+#: ../libpurple/protocols/gg/gg.c:1305 ../libpurple/protocols/gg/gg.c:1458
 msgid "Unable to read socket"
 msgstr "Kan inte l辰sa fr奪n uttag"
 
-#: ../libgaim/protocols/gg/gg.c:1382
+#: ../libpurple/protocols/gg/gg.c:1390
 msgid "Buddy list downloaded"
 msgstr "Kompislistan 辰r nerladdad"
 
-#: ../libgaim/protocols/gg/gg.c:1383
+#: ../libpurple/protocols/gg/gg.c:1391
 msgid "Your buddy list was downloaded from the server."
 msgstr "Din kompislista blev nerladdad fr奪n servern."
 
-#: ../libgaim/protocols/gg/gg.c:1390
+#: ../libpurple/protocols/gg/gg.c:1398
 msgid "Buddy list uploaded"
 msgstr "Kompislistan 辰r uppladdad"
 
-#: ../libgaim/protocols/gg/gg.c:1391
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Your buddy list was stored on the server."
 msgstr "Din kompislista blev lagrad p奪 servern."
 
-#: ../libgaim/protocols/gg/gg.c:1492
-#: ../libgaim/protocols/gg/gg.c:1723
+#: ../libpurple/protocols/gg/gg.c:1504 ../libpurple/protocols/gg/gg.c:1710
 msgid "Connection failed."
 msgstr "Anslutning misslyckad"
 
-#: ../libgaim/protocols/gg/gg.c:1629
-#: ../libgaim/protocols/msn/msn.c:561
+#: ../libpurple/protocols/gg/gg.c:1616 ../libpurple/protocols/msn/msn.c:531
 msgid "Blocked"
 msgstr "Blockerad"
 
-#: ../libgaim/protocols/gg/gg.c:1652
+#: ../libpurple/protocols/gg/gg.c:1639
 msgid "Add to chat"
 msgstr "L辰gg till i chatt"
 
-#: ../libgaim/protocols/gg/gg.c:1661
+#: ../libpurple/protocols/gg/gg.c:1648
 msgid "Unblock"
 msgstr "Ta bort blockering"
 
-#: ../libgaim/protocols/gg/gg.c:1665
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Block"
 msgstr "Blockera"
 
-#: ../libgaim/protocols/gg/gg.c:1682
+#: ../libpurple/protocols/gg/gg.c:1669
 msgid "Chat _name:"
 msgstr "Chatt_namn:"
 
-#: ../libgaim/protocols/gg/gg.c:1922
+#: ../libpurple/protocols/gg/gg.c:1909
 msgid "Chat error"
 msgstr "Chattfel"
 
-#: ../libgaim/protocols/gg/gg.c:1923
+#: ../libpurple/protocols/gg/gg.c:1910
 msgid "This chat name is already in use"
 msgstr "Det chattnamnet anv辰nds redan"
 
-#: ../libgaim/protocols/gg/gg.c:2006
+#: ../libpurple/protocols/gg/gg.c:1993
 msgid "Not connected to the server."
 msgstr "Inte ansluten till servern."
 
-#: ../libgaim/protocols/gg/gg.c:2029
+#: ../libpurple/protocols/gg/gg.c:2016
 msgid "Find buddies..."
 msgstr "Hitta kompisar..."
 
-#: ../libgaim/protocols/gg/gg.c:2035
+#: ../libpurple/protocols/gg/gg.c:2022
 msgid "Change password..."
 msgstr "Byt l旦senord..."
 
-#: ../libgaim/protocols/gg/gg.c:2041
+#: ../libpurple/protocols/gg/gg.c:2028
 msgid "Upload buddylist to Server"
 msgstr "Skicka kompislista till servern"
 
-#: ../libgaim/protocols/gg/gg.c:2045
+#: ../libpurple/protocols/gg/gg.c:2032
 msgid "Download buddylist from Server"
 msgstr "H辰mta kompislista fr奪n server"
 
-#: ../libgaim/protocols/gg/gg.c:2049
+#: ../libpurple/protocols/gg/gg.c:2036
 msgid "Delete buddylist from Server"
 msgstr "Ta bort kompislista fr奪n server"
 
-#: ../libgaim/protocols/gg/gg.c:2053
+#: ../libpurple/protocols/gg/gg.c:2040
 msgid "Save buddylist to file..."
 msgstr "Spara kompislista till fil..."
 
-#: ../libgaim/protocols/gg/gg.c:2057
+#: ../libpurple/protocols/gg/gg.c:2044
 msgid "Load buddylist from file..."
 msgstr "L辰s in kompislista fr奪n fil..."
 
@@ -7225,137 +3469,153 @@
 #. id
 #. name
 #. version
-#: ../libgaim/protocols/gg/gg.c:2155
+#: ../libpurple/protocols/gg/gg.c:2148
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Insticksmodul f旦r Gadu-Gadu-protokoll"
 
 #. summary
-#: ../libgaim/protocols/gg/gg.c:2156
+#: ../libpurple/protocols/gg/gg.c:2149
 msgid "Polish popular IM"
 msgstr "Popul辰r polsk IM"
 
-#: ../libgaim/protocols/gg/gg.c:2204
+#: ../libpurple/protocols/gg/gg.c:2203
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-anv辰ndare"
 
-#: ../libgaim/protocols/irc/cmds.c:43
-#: ../libgaim/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/irc/cmds.c:43
+#: ../libpurple/protocols/silc/silc.c:1637
+#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Ok辰nt kommando: %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:591
+#: ../libpurple/protocols/silc/silc.c:1345
+#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "det aktuella 辰mnet 辰r: %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:595
+#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "Inget 辰mne 辰r inst辰llt"
 
-#: ../libgaim/protocols/irc/dcc_send.c:293
-#: ../libgaim/protocols/irc/dcc_send.c:334
-#: ../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:269
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:278
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:291
 msgid "File Transfer Failed"
 msgstr "Fil旦verf旦ringen misslyckades"
 
-#: ../libgaim/protocols/irc/dcc_send.c:294
-#: ../libgaim/protocols/irc/dcc_send.c:335
-msgid "Gaim could not open a listening port."
-msgstr "Gaim kunde inte 旦ppna en lyssnande port."
-
-#: ../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 "Kunde inte 旦ppna en lyssnande port."
+
+#: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
 msgstr "Fel vid visning av MOTD"
 
-#: ../libgaim/protocols/irc/irc.c:80
+#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "Ingen MOTD tillg辰nglig"
 
-#: ../libgaim/protocols/irc/irc.c:81
+#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "Det finns ingen MOTD associerad med denna anslutning."
 
-#: ../libgaim/protocols/irc/irc.c:84
+#: ../libpurple/protocols/irc/irc.c:83
 #, c-format
 msgid "MOTD for %s"
 msgstr "MOTD f旦r %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:614 ../libpurple/protocols/irc/irc.c:639
 msgid "Server has disconnected"
 msgstr "Servern har kopplat ifr奪n"
 
-#: ../libgaim/protocols/irc/irc.c:259
+#: ../libpurple/protocols/irc/irc.c:249
 msgid "View MOTD"
 msgstr "Visa MOTD"
 
-#: ../libgaim/protocols/irc/irc.c:271
-#: ../libgaim/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanal:"
 
-#: ../libgaim/protocols/irc/irc.c:277
-#: ../libgaim/protocols/jabber/chat.c:59
+#: ../libpurple/protocols/irc/irc.c:267
+#: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:526
 msgid "_Password:"
 msgstr "_L旦senord:"
 
-#: ../libgaim/protocols/irc/irc.c:308
+#: ../libpurple/protocols/irc/irc.c:298
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-nickar f奪r inte inneh奪lla blanksteg"
 
-#: ../libgaim/protocols/irc/irc.c:337
-#: ../libgaim/protocols/jabber/jabber.c:580
-#: ../libgaim/protocols/jabber/jabber.c:925
+#. connect to the server
+#: ../libpurple/protocols/irc/irc.c:319
+#: ../libpurple/protocols/jabber/jabber.c:1046
+#: ../libpurple/protocols/msn/session.c:345
+#: ../libpurple/protocols/novell/novell.c:2182
+#: ../libpurple/protocols/oscar/oscar.c:1288
+#: ../libpurple/protocols/qq/qq.c:136
+#: ../libpurple/protocols/sametime/sametime.c:3724
+#: ../libpurple/protocols/simple/simple.c:1676
+#: ../libpurple/protocols/yahoo/yahoo.c:2762
+#: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:661
+msgid "Connecting"
+msgstr "Ansluter"
+
+#: ../libpurple/protocols/irc/irc.c:327
+#: ../libpurple/protocols/jabber/jabber.c:603
+#: ../libpurple/protocols/jabber/jabber.c:950
 msgid "SSL support unavailable"
 msgstr "SSL-st旦d ej tillg辰ngligt"
 
-#: ../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:1591
 msgid "Couldn't create socket"
 msgstr "Kunde inte skapa socket"
 
-#: ../libgaim/protocols/irc/irc.c:412
-#: ../libgaim/protocols/jabber/jabber.c:458
-#: ../libgaim/protocols/oscar/oscar.c:1263
+#: ../libpurple/protocols/irc/irc.c:416
+#: ../libpurple/protocols/oscar/oscar.c:1284
 msgid "Couldn't connect to host"
 msgstr "Kunde inte ansluta till v辰rden"
 
-#: ../libgaim/protocols/irc/irc.c:434
-#: ../libgaim/protocols/jabber/jabber.c:482
+#: ../libpurple/protocols/irc/irc.c:438
+#: ../libpurple/protocols/jabber/jabber.c:499
 msgid "Connection Failed"
 msgstr "Anslutning misslyckad"
 
-#: ../libgaim/protocols/irc/irc.c:437
-#: ../libgaim/protocols/jabber/jabber.c:485
+#: ../libpurple/protocols/irc/irc.c:441
+#: ../libpurple/protocols/jabber/jabber.c:502
 msgid "SSL Handshake Failed"
 msgstr "SSL-handskakning misslyckades"
 
-#: ../libgaim/protocols/irc/irc.c:605
-#: ../libgaim/protocols/irc/irc.c:630
+#: ../libpurple/protocols/irc/irc.c:611 ../libpurple/protocols/irc/irc.c:636
 msgid "Read error"
 msgstr "L辰sfel"
 
-#: ../libgaim/protocols/irc/irc.c:769
-#: ../libgaim/protocols/silc/chat.c:1421
-#: ../libgaim/protocols/yahoo/yahoochat.c:1438
+#: ../libpurple/protocols/irc/irc.c:775
+#: ../libpurple/protocols/silc/chat.c:1412
+#: ../libpurple/protocols/silc10/chat.c:1426
+#: ../libpurple/protocols/yahoo/yahoochat.c:1401
 msgid "Users"
 msgstr "Anv辰ndare"
 
-#: ../libgaim/protocols/irc/irc.c:772
-#: ../libgaim/protocols/sametime/sametime.c:3385
-#: ../libgaim/protocols/silc/chat.c:1424
-#: ../libgaim/protocols/silc/ops.c:1382
-#: ../libgaim/protocols/yahoo/yahoochat.c:1447
+#: ../libpurple/protocols/irc/irc.c:778
+#: ../libpurple/protocols/sametime/sametime.c:3375
+#: ../libpurple/protocols/silc/chat.c:1415
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/chat.c:1429
+#: ../libpurple/protocols/silc10/ops.c:1382
+#: ../libpurple/protocols/yahoo/yahoochat.c:1410
 msgid "Topic"
 msgstr "�mne"
 
@@ -7367,581 +3627,704 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/irc/irc.c:903
+#: ../libpurple/protocols/irc/irc.c:916
 msgid "IRC Protocol Plugin"
 msgstr "Insticksmodul f旦r IRC-protokoll"
 
 #. *  summary
-#: ../libgaim/protocols/irc/irc.c:904
+#: ../libpurple/protocols/irc/irc.c:917
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Insticksmodulen f旦r IRC-protokollet som inte suger lika mycket"
 
 #. host to connect to
-#: ../libgaim/protocols/irc/irc.c:923
-#: ../libgaim/protocols/irc/msgs.c:239
-#: ../libgaim/protocols/jabber/jabber.c:1985
-#: ../libgaim/protocols/msn/msn.c:2054
-#: ../libgaim/protocols/qq/qq.c:758
-#: ../libgaim/protocols/sametime/sametime.c:5713
-#: ../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:942 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2154
+#: ../libpurple/protocols/oscar/oscar.c:6650
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5728
+#: ../libpurple/protocols/silc/ops.c:1249
+#: ../libpurple/protocols/silc/ops.c:1341
+#: ../libpurple/protocols/silc10/ops.c:1244
+#: ../libpurple/protocols/silc10/ops.c:1347
+#: ../libpurple/protocols/simple/simple.c:1855
+#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libgaim/protocols/irc/irc.c:926
-#: ../libgaim/protocols/msn/msn.c:2059
-#: ../libgaim/protocols/qq/qq.c:761
-#: ../libgaim/protocols/sametime/sametime.c:5718
-#: ../libgaim/protocols/silc/silc.c:1856
-#: ../libgaim/protocols/toc/toc.c:2351
+#: ../libpurple/protocols/irc/irc.c:945 ../libpurple/protocols/msn/msn.c:2159
+#: ../libpurple/protocols/oscar/oscar.c:6653
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5733
+#: ../libpurple/protocols/silc/silc.c:1918
+#: ../libpurple/protocols/silc10/silc.c:1861
+#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libgaim/protocols/irc/irc.c:929
+#: ../libpurple/protocols/irc/irc.c:948
 msgid "Encodings"
 msgstr "Kodning"
 
-#: ../libgaim/protocols/irc/irc.c:932
-#: ../libgaim/protocols/irc/msgs.c:232
-#: ../libgaim/protocols/jabber/jabber.c:780
-#: ../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:951 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:803
+#: ../libpurple/protocols/silc/buddy.c:1539
+#: ../libpurple/protocols/silc/ops.c:1197
+#: ../libpurple/protocols/silc/ops.c:1200
+#: ../libpurple/protocols/silc/ops.c:1334
+#: ../libpurple/protocols/silc/ops.c:1337
+#: ../libpurple/protocols/silc/silc.c:1005
+#: ../libpurple/protocols/silc10/buddy.c:1539
+#: ../libpurple/protocols/silc10/ops.c:1191
+#: ../libpurple/protocols/silc10/ops.c:1194
+#: ../libpurple/protocols/silc10/ops.c:1340
+#: ../libpurple/protocols/silc10/ops.c:1343
+#: ../libpurple/protocols/silc10/silc.c:916
 msgid "Username"
 msgstr "Anv辰ndarnamn"
 
-#: ../libgaim/protocols/irc/irc.c:935
-#: ../libgaim/protocols/irc/msgs.c:233
-#: ../libgaim/protocols/silc/silc.c:933
+#: ../libpurple/protocols/irc/irc.c:954 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1009
+#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Fullst辰ndigt namn"
 
 #.
-#. 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:962
 msgid "Use SSL"
 msgstr "Anv辰nd SSL"
 
-#: ../libgaim/protocols/irc/msgs.c:107
+#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "Felaktigt l辰ge"
 
-#: ../libgaim/protocols/irc/msgs.c:118
+#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "Du 辰r bannlyst i %s."
 
-#: ../libgaim/protocols/irc/msgs.c:119
+#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "Bannlyst"
 
-#: ../libgaim/protocols/irc/msgs.c:136
+#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Kan inte bannlysa %s: bannlysningslistan 辰r full"
 
-#: ../libgaim/protocols/irc/msgs.c:217
+#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:218
+#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifierad)</i>"
 
-#: ../libgaim/protocols/irc/msgs.c:219
-#: ../libgaim/protocols/oscar/oscar.c:3694
-#: ../libgaim/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/irc/msgs.c:303
+#: ../libpurple/protocols/oscar/oscar.c:3709
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Smeknamn"
 
-#: ../libgaim/protocols/irc/msgs.c:245
-#: ../libgaim/protocols/silc/ops.c:1272
+#: ../libpurple/protocols/irc/msgs.c:329
+#: ../libpurple/protocols/silc/ops.c:1268
+#: ../libpurple/protocols/silc10/ops.c:1272
 msgid "Currently on"
 msgstr "F旦r n辰rvarande p奪"
 
-#: ../libgaim/protocols/irc/msgs.c:250
+#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "Inaktiv i"
 
-#: ../libgaim/protocols/irc/msgs.c:253
+#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "Ansluten sedan"
 
-#: ../libgaim/protocols/irc/msgs.c:257
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Definiera adjektiv:</b>"
 
-#: ../libgaim/protocols/irc/msgs.c:257
+#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "Str奪lande"
 
-#: ../libgaim/protocols/irc/msgs.c:333
+#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s har bytt 辰mne till: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:335
+#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s har rensat 辰mnet."
 
-#: ../libgaim/protocols/irc/msgs.c:343
+#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "�mnet f旦r %s 辰r: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:361
+#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Ok辰nt meddelande '%s'"
 
-#: ../libgaim/protocols/irc/msgs.c:362
+#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Ok辰nt meddelande"
 
-#: ../libgaim/protocols/irc/msgs.c:362
-msgid "Gaim has sent a message the IRC server did not understand."
-msgstr "Gaim har skickat ett meddelande som IRC-servern inte f旦rstod."
-
-#: ../libgaim/protocols/irc/msgs.c:385
+#: ../libpurple/protocols/irc/msgs.c:449
+msgid "The IRC server received a message it did not understand."
+msgstr "IRC-servern fick ett meddelande den inte f旦rstod."
+
+#: ../libpurple/protocols/irc/msgs.c:470
 #, c-format
 msgid "Users on %s: %s"
 msgstr "Anv辰ndare p奪 %s: %s"
 
-#: ../libgaim/protocols/irc/msgs.c:515
+#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "Tidssvar"
 
-#: ../libgaim/protocols/irc/msgs.c:516
+#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "IRC-serverns lokala tid 辰r:"
 
-#: ../libgaim/protocols/irc/msgs.c:527
+#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "Finns ingen s奪dan kanal"
 
 #. does this happen?
-#: ../libgaim/protocols/irc/msgs.c:538
+#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "ingen s奪dan kanal"
 
-#: ../libgaim/protocols/irc/msgs.c:541
+#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "Anv辰ndaren 辰r inte inloggad"
 
-#: ../libgaim/protocols/irc/msgs.c:546
+#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "Inget s奪dant nick eller kanal"
 
-#: ../libgaim/protocols/irc/msgs.c:566
+#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "Kunde inte skicka"
 
-#: ../libgaim/protocols/irc/msgs.c:622
+#: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
 msgid "Joining %s requires an invitation."
 msgstr "Det kr辰vs en inbjudan f旦r att g奪 in i %s."
 
-#: ../libgaim/protocols/irc/msgs.c:623
+#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "Endast inbjudna"
 
-#: ../libgaim/protocols/irc/msgs.c:732
+#: ../libpurple/protocols/irc/msgs.c:795
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Du har sparkats ut av %s: (%s)"
 
 #. Remove user from channel
-#: ../libgaim/protocols/irc/msgs.c:737
-#: ../libgaim/protocols/silc/ops.c:720
+#: ../libpurple/protocols/irc/msgs.c:800 ../libpurple/protocols/silc/ops.c:699
+#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Utsparkad av %s (%s)"
 
-#: ../libgaim/protocols/irc/msgs.c:760
+#: ../libpurple/protocols/irc/msgs.c:823
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "l辰ge (%s %s) av %s"
 
-#: ../libgaim/protocols/irc/msgs.c:845
-#: ../libgaim/protocols/irc/msgs.c:846
+#: ../libpurple/protocols/irc/msgs.c:908 ../libpurple/protocols/irc/msgs.c:909
 msgid "Invalid nickname"
 msgstr "Ogiltigt smeknamn"
 
-#: ../libgaim/protocols/irc/msgs.c:847
-msgid "Your selected nickname was rejected by the server.  It probably contains invalid characters."
-msgstr "Ditt valda smeknamn v辰grades av servern. Det inneh奪ller antagligen otill奪tna tecken."
-
-#: ../libgaim/protocols/irc/msgs.c:852
-msgid "Your selected account name was rejected by the server.  It probably contains invalid characters."
-msgstr "Ditt valda kontonamn v辰grades av servern. Det inneh奪ller antagligen otill奪tna tecken."
-
-#: ../libgaim/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:910
+msgid ""
+"Your selected nickname was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Ditt valda smeknamn v辰grades av servern. Det inneh奪ller antagligen otill奪tna "
+"tecken."
+
+#: ../libpurple/protocols/irc/msgs.c:915
+msgid ""
+"Your selected account name was rejected by the server.  It probably contains "
+"invalid characters."
+msgstr ""
+"Ditt valda kontonamn v辰grades av servern. Det inneh奪ller antagligen "
+"otill奪tna tecken."
+
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Cannot change nick"
 msgstr "Kan inte 辰ndra nick"
 
-#: ../libgaim/protocols/irc/msgs.c:891
+#: ../libpurple/protocols/irc/msgs.c:954
 msgid "Could not change nick"
 msgstr "Kunde inte byta smeknamn"
 
-#: ../libgaim/protocols/irc/msgs.c:912
+#: ../libpurple/protocols/irc/msgs.c:975
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Du har l辰mnat kanalen%s%s"
 
-#: ../libgaim/protocols/irc/msgs.c:954
+#: ../libpurple/protocols/irc/msgs.c:1017
 msgid "Error: invalid PONG from server"
 msgstr "Fel: Ogiltig PONG fr奪n server"
 
-#: ../libgaim/protocols/irc/msgs.c:956
+#: ../libpurple/protocols/irc/msgs.c:1019
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING-svar -- F旦rdr旦jning: %lu sekunder"
 
-#: ../libgaim/protocols/irc/msgs.c:1037
-#, c-format
-msgid "Cannot join %s:"
-msgstr "Kan inte ansluta till %s:"
-
-#: ../libgaim/protocols/irc/msgs.c:1038
-#: ../libgaim/protocols/silc/ops.c:1128
+#: ../libpurple/protocols/irc/msgs.c:1110
+#, c-format
+msgid "Cannot join %s: Registration is required."
+msgstr "Kan inte ansluta till %s: Registrering kr辰vs"
+
+#: ../libpurple/protocols/irc/msgs.c:1111
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Kan inte ansluta till kanalen"
 
-#: ../libgaim/protocols/irc/msgs.c:1072
+#: ../libpurple/protocols/irc/msgs.c:1145
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Nick eller kanal 辰r tempor辰rt otillg辰nglig."
 
-#: ../libgaim/protocols/irc/msgs.c:1084
+#: ../libpurple/protocols/irc/msgs.c:1157
 #, c-format
 msgid "Wallops from %s"
 msgstr "Smocka fr奪n %s"
 
-#: ../libgaim/protocols/irc/parse.c:116
+#: ../libpurple/protocols/irc/parse.c:122
 msgid "action &lt;action to perform&gt;:  Perform an action."
 msgstr "action &lt;action to perform&gt;:  Utf旦r en 奪tg辰rd."
 
-#: ../libgaim/protocols/irc/parse.c:117
-msgid "away [message]:  Set an away message, or use no message to return from being away."
-msgstr "away [meddelande]:  Ange ett fr奪nvaromeddelande eller ange utan meddelande f旦r att 奪terv辰nda fr奪n fr奪nvaro."
-
-#: ../libgaim/protocols/irc/parse.c:118
+#: ../libpurple/protocols/irc/parse.c:123
+msgid ""
+"away [message]:  Set an away message, or use no message to return from being "
+"away."
+msgstr ""
+"away [meddelande]:  Ange ett fr奪nvaromeddelande eller ange utan meddelande "
+"f旦r att 奪terv辰nda fr奪n fr奪nvaro."
+
+#: ../libpurple/protocols/irc/parse.c:124
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Skicka ett kommando till chanserv"
 
-#: ../libgaim/protocols/irc/parse.c:119
-msgid "deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from someone. You must be a channel operator to do this."
-msgstr "deop &lt;smeknamn1&gt; [smeknamn2] ...:  Ta bort kanaloperat旦rsstatus fr奪n n奪gon. Du m奪ste vara en operat旦r sj辰lv f旦r att kunna g旦ra detta."
-
-#: ../libgaim/protocols/irc/parse.c:120
-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 "devoice &lt;smeknamn1&gt; [smeknamn2] ...:  Tar bort kanalr旦ststatus fr奪n n奪gon f旦r att f旦rhindra den fr奪n att tala d奪 kanalen 辰r modererad (+m). Du m奪ste vara en operat旦r sj辰lv f旦r att kunna g旦ra detta."
-
-#: ../libgaim/protocols/irc/parse.c:121
-msgid "invite &lt;nick&gt; [room]:  Invite someone to join you in the specified channel, or the current channel."
-msgstr "invite &lt;smeknamn&gt; [rum]:  Bjud in n奪gon till en specificerad kanal eller till den nuvarande."
-
-#: ../libgaim/protocols/irc/parse.c:122
-msgid "j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr "j &lt;rum1&gt;[,rum2][,...] [nyckel1[,nyckel2][,...]]:  Anslut till en eller fler kanaler, m旦jligen med en kanalnyckel f旦r varje om det beh旦vs."
-
-#: ../libgaim/protocols/irc/parse.c:123
-msgid "join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more channels, optionally providing a channel key for each if needed."
-msgstr "join &lt;rum1&gt;[,rum2][,...] [nyckel1[,nyckel2][,...]]:  Anslut till en eller fler kanaler, m旦jligen med en kanalnyckel f旦r varje om det beh旦vs."
-
-#: ../libgaim/protocols/irc/parse.c:124
-msgid "kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a channel operator to do this."
-msgstr "kick &lt;smeknamn&gt; [meddelande]:  Tar bort n奪gon fr奪n en kanal. Du m奪ste vara kanaloperat旦r f旦r att kunna g旦ra detta."
-
-#: ../libgaim/protocols/irc/parse.c:125
-msgid "list:  Display a list of chat rooms on the network. <i>Warning, some servers may disconnect you upon doing this.</i>"
-msgstr "list:  Visar en lista 旦ver alla chattrum p奪 ett n辰tverk. <i>Varning: N奪gra servrar kan koppla ifr奪n dig n辰r du g旦r detta.</i>"
-
-#: ../libgaim/protocols/irc/parse.c:126
+#: ../libpurple/protocols/irc/parse.c:125
+msgid ""
+"deop &lt;nick1&gt; [nick2] ...:  Remove channel operator status from "
+"someone. You must be a channel operator to do this."
+msgstr ""
+"deop &lt;smeknamn1&gt; [smeknamn2] ...:  Ta bort kanaloperat旦rsstatus fr奪n "
+"n奪gon. Du m奪ste vara en operat旦r sj辰lv f旦r att kunna g旦ra detta."
+
+#: ../libpurple/protocols/irc/parse.c:126
+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 ""
+"devoice &lt;smeknamn1&gt; [smeknamn2] ...:  Tar bort kanalr旦ststatus fr奪n "
+"n奪gon f旦r att f旦rhindra den fr奪n att tala d奪 kanalen 辰r modererad (+m). Du "
+"m奪ste vara en operat旦r sj辰lv f旦r att kunna g旦ra detta."
+
+#: ../libpurple/protocols/irc/parse.c:127
+msgid ""
+"invite &lt;nick&gt; [room]:  Invite someone to join you in the specified "
+"channel, or the current channel."
+msgstr ""
+"invite &lt;smeknamn&gt; [rum]:  Bjud in n奪gon till en specificerad kanal "
+"eller till den nuvarande."
+
+#: ../libpurple/protocols/irc/parse.c:128
+msgid ""
+"j &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"j &lt;rum1&gt;[,rum2][,...] [nyckel1[,nyckel2][,...]]:  Anslut till en eller "
+"fler kanaler, m旦jligen med en kanalnyckel f旦r varje om det beh旦vs."
+
+#: ../libpurple/protocols/irc/parse.c:129
+msgid ""
+"join &lt;room1&gt;[,room2][,...] [key1[,key2][,...]]:  Enter one or more "
+"channels, optionally providing a channel key for each if needed."
+msgstr ""
+"join &lt;rum1&gt;[,rum2][,...] [nyckel1[,nyckel2][,...]]:  Anslut till en "
+"eller fler kanaler, m旦jligen med en kanalnyckel f旦r varje om det beh旦vs."
+
+#: ../libpurple/protocols/irc/parse.c:130
+msgid ""
+"kick &lt;nick&gt; [message]:  Remove someone from a channel. You must be a "
+"channel operator to do this."
+msgstr ""
+"kick &lt;smeknamn&gt; [meddelande]:  Tar bort n奪gon fr奪n en kanal. Du m奪ste "
+"vara kanaloperat旦r f旦r att kunna g旦ra detta."
+
+#: ../libpurple/protocols/irc/parse.c:131
+msgid ""
+"list:  Display a list of chat rooms on the network. <i>Warning, some servers "
+"may disconnect you upon doing this.</i>"
+msgstr ""
+"list:  Visar en lista 旦ver alla chattrum p奪 ett n辰tverk. <i>Varning: N奪gra "
+"servrar kan koppla ifr奪n dig n辰r du g旦r detta.</i>"
+
+#: ../libpurple/protocols/irc/parse.c:132
 msgid "me &lt;action to perform&gt;:  Perform an action."
 msgstr "me &lt;奪tg辰rd som ska utf旦ras&gt;:  Utf旦r en 奪tg辰rd."
 
-#: ../libgaim/protocols/irc/parse.c:127
+#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Skicka ett kommando till memoserv"
 
-#: ../libgaim/protocols/irc/parse.c:128
-msgid "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel or user mode."
-msgstr "mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;smeknamn|kanal&gt;:  S辰tt eller ta bort kanal- eller anv辰ndarl辰ge."
-
-#: ../libgaim/protocols/irc/parse.c:129
-msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
-msgstr "msg &lt;smeknamn&gt; &lt;meddelande&gt;:  Skicka ett privat meddelande till en anv辰ndare (i motsats till en kanal)."
-
-#: ../libgaim/protocols/irc/parse.c:130
+#: ../libpurple/protocols/irc/parse.c:134
+msgid ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;nick|channel&gt;:  Set or unset a channel "
+"or user mode."
+msgstr ""
+"mode &lt;+|-&gt;&lt;A-Za-z&gt; &lt;smeknamn|kanal&gt;:  S辰tt eller ta bort "
+"kanal- eller anv辰ndarl辰ge."
+
+#: ../libpurple/protocols/irc/parse.c:135
+msgid ""
+"msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"msg &lt;smeknamn&gt; &lt;meddelande&gt;:  Skicka ett privat meddelande till "
+"en anv辰ndare (i motsats till en kanal)."
+
+#: ../libpurple/protocols/irc/parse.c:136
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanal]:  Lista anv辰ndarna som 辰r i kanalen just nu."
 
-#: ../libgaim/protocols/irc/parse.c:131
-#: ../libgaim/protocols/jabber/jabber.c:1789
+#: ../libpurple/protocols/irc/parse.c:137
+#: ../libpurple/protocols/jabber/jabber.c:1813
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nytt smeknamn&gt;:  �ndra ditt smeknamn."
 
-#: ../libgaim/protocols/irc/parse.c:132
+#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Skicka ett kommando till nickserv"
 
-#: ../libgaim/protocols/irc/parse.c:133
-msgid "op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You must be a channel operator to do this."
-msgstr "op &lt;smeknamn1&gt; [smeknamn2] ...:  Ge kanaloperat旦rsstatus till n奪gon. Du m奪ste vara kanaloperat旦r f旦r att kunna g旦ra detta."
-
-#: ../libgaim/protocols/irc/parse.c:134
-msgid "operwall &lt;message&gt;:  If you don't know what this is, you probably can't use it."
-msgstr "operwall &lt;meddelande&gt;:  Om du inte vet vad detta g旦r kan du antagligen inte g旦ra det."
-
-#: ../libgaim/protocols/irc/parse.c:135
+#: ../libpurple/protocols/irc/parse.c:139
+msgid ""
+"op &lt;nick1&gt; [nick2] ...:  Grant channel operator status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"op &lt;smeknamn1&gt; [smeknamn2] ...:  Ge kanaloperat旦rsstatus till n奪gon. "
+"Du m奪ste vara kanaloperat旦r f旦r att kunna g旦ra detta."
+
+#: ../libpurple/protocols/irc/parse.c:140
+msgid ""
+"operwall &lt;message&gt;:  If you don't know what this is, you probably "
+"can't use it."
+msgstr ""
+"operwall &lt;meddelande&gt;:  Om du inte vet vad detta g旦r kan du antagligen "
+"inte g旦ra det."
+
+#: ../libpurple/protocols/irc/parse.c:141
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Skicka ett kommando till operserv"
 
-#: ../libgaim/protocols/irc/parse.c:136
-msgid "part [room] [message]:  Leave the current channel, or a specified channel, with an optional message."
-msgstr "part [rum] [meddelande]:  L辰mna det nuvarande rummet med ett m旦jligt meddelande."
-
-#: ../libgaim/protocols/irc/parse.c:137
-msgid "ping [nick]:  Asks how much lag a user (or the server if no user specified) has."
-msgstr "ping [smeknamn]:  Fr奪gar hur mycket lagg en anv辰ndaren (eller servern om  ingen anv辰ndare 辰r specificerad) har."
-
-#: ../libgaim/protocols/irc/parse.c:138
-msgid "query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as opposed to a channel)."
-msgstr "query &lt;smeknamn&gt; &lt;meddelande&gt;:  Skicka ett privat meddelande till en anv辰ndare."
-
-#: ../libgaim/protocols/irc/parse.c:139
+#: ../libpurple/protocols/irc/parse.c:142
+msgid ""
+"part [room] [message]:  Leave the current channel, or a specified channel, "
+"with an optional message."
+msgstr ""
+"part [rum] [meddelande]:  L辰mna det nuvarande rummet med ett m旦jligt "
+"meddelande."
+
+#: ../libpurple/protocols/irc/parse.c:143
+msgid ""
+"ping [nick]:  Asks how much lag a user (or the server if no user specified) "
+"has."
+msgstr ""
+"ping [smeknamn]:  Fr奪gar hur mycket lagg en anv辰ndaren (eller servern om  "
+"ingen anv辰ndare 辰r specificerad) har."
+
+#: ../libpurple/protocols/irc/parse.c:144
+msgid ""
+"query &lt;nick&gt; &lt;message&gt;:  Send a private message to a user (as "
+"opposed to a channel)."
+msgstr ""
+"query &lt;smeknamn&gt; &lt;meddelande&gt;:  Skicka ett privat meddelande "
+"till en anv辰ndare."
+
+#: ../libpurple/protocols/irc/parse.c:145
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [meddelande]:  Koppla ifr奪n servern med ett frivilligt meddelande."
-
-#: ../libgaim/protocols/irc/parse.c:140
+msgstr ""
+"quit [meddelande]:  Koppla ifr奪n servern med ett frivilligt meddelande."
+
+#: ../libpurple/protocols/irc/parse.c:146
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Skicka ett r奪tt kommando till servern."
 
-#: ../libgaim/protocols/irc/parse.c:141
-msgid "remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a channel operator to do this."
-msgstr "remove &lt;smeknamn&gt; [meddelande]:  Ta bort n奪gon fr奪n ett rum. Du m奪ste vara kanaloperat旦r f旦r att g旦ra detta."
-
-#: ../libgaim/protocols/irc/parse.c:142
+#: ../libpurple/protocols/irc/parse.c:147
+msgid ""
+"remove &lt;nick&gt; [message]:  Remove someone from a room. You must be a "
+"channel operator to do this."
+msgstr ""
+"remove &lt;smeknamn&gt; [meddelande]:  Ta bort n奪gon fr奪n ett rum. Du m奪ste "
+"vara kanaloperat旦r f旦r att g旦ra detta."
+
+#: ../libpurple/protocols/irc/parse.c:148
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Visar IRC-serverns lokala tid."
 
-#: ../libgaim/protocols/irc/parse.c:143
+#: ../libpurple/protocols/irc/parse.c:149
 msgid "topic [new topic]:  View or change the channel topic."
 msgstr "topic [nytt 辰mne]:  Visa eller 辰ndra kanalens 辰mne."
 
-#: ../libgaim/protocols/irc/parse.c:144
+#: ../libpurple/protocols/irc/parse.c:150
 msgid "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Set or unset a user mode."
 msgstr "umode &lt;+|-&gt;&lt;A-Za-z&gt;:  Ange eller ta bort ett anv辰ndarl辰ge."
 
-#: ../libgaim/protocols/irc/parse.c:145
+#: ../libpurple/protocols/irc/parse.c:151
 msgid "version [nick]: send CTCP VERSION request to a user"
-msgstr "version [smeknamn]: skickar en CTCP VERSION f旦rfr奪gan till en anv辰ndare"
-
-#: ../libgaim/protocols/irc/parse.c:146
-msgid "voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You must be a channel operator to do this."
-msgstr "voice &lt;smeknamn1&gt; [smeknamn2] ...:  Ge kanalr旦ststatus till n奪gon. Du m奪ste vara kanaloperat旦r f旦r att g旦ra detta."
-
-#: ../libgaim/protocols/irc/parse.c:147
-msgid "wallops &lt;message&gt;:  If you don't know what this is, you probably can't use it."
-msgstr "wallops &lt;meddelande&gt;:  Om du inte vet vad detta 辰r kan du antagligen inte anv辰nda det."
-
-#: ../libgaim/protocols/irc/parse.c:148
+msgstr ""
+"version [smeknamn]: skickar en CTCP VERSION f旦rfr奪gan till en anv辰ndare"
+
+#: ../libpurple/protocols/irc/parse.c:152
+msgid ""
+"voice &lt;nick1&gt; [nick2] ...:  Grant channel voice status to someone. You "
+"must be a channel operator to do this."
+msgstr ""
+"voice &lt;smeknamn1&gt; [smeknamn2] ...:  Ge kanalr旦ststatus till n奪gon. Du "
+"m奪ste vara kanaloperat旦r f旦r att g旦ra detta."
+
+#: ../libpurple/protocols/irc/parse.c:153
+msgid ""
+"wallops &lt;message&gt;:  If you don't know what this is, you probably can't "
+"use it."
+msgstr ""
+"wallops &lt;meddelande&gt;:  Om du inte vet vad detta 辰r kan du antagligen "
+"inte anv辰nda det."
+
+#: ../libpurple/protocols/irc/parse.c:154
 msgid "whois [server] &lt;nick&gt;:  Get information on a user."
-msgstr "whois [server] &lt;smeknamn&gt;:  H辰mta informationen f旦r en anv辰ndare."
-
-#: ../libgaim/protocols/irc/parse.c:442
+msgstr ""
+"whois [server] &lt;smeknamn&gt;:  H辰mta informationen f旦r en anv辰ndare."
+
+#: ../libpurple/protocols/irc/parse.c:155
+msgid "whowas &lt;nick&gt;: Get information on a user that has logged off."
+msgstr ""
+"whowas &lt;smeknamn&gt;: H辰mta informationen f旦r en anv辰ndare som har "
+"kopplat ifr奪n."
+
+#: ../libpurple/protocols/irc/parse.c:465
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Svarstid fr奪n %s: %lu sekunder"
 
-#: ../libgaim/protocols/irc/parse.c:443
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libgaim/protocols/irc/parse.c:443
+#: ../libpurple/protocols/irc/parse.c:466
 msgid "CTCP PING reply"
 msgstr "CTCP PING-svar"
 
-#: ../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:577
+#: ../libpurple/protocols/irc/parse.c:581 ../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 "Fr奪nkopplad."
 
-#: ../libgaim/protocols/jabber/auth.c:49
+#: ../libpurple/protocols/jabber/auth.c:52
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Servern kr辰ver TLS/SSL vid inloggning. Hittade inget st旦d f旦r TLS/SSL."
 
-#: ../libgaim/protocols/jabber/auth.c:112
+#: ../libpurple/protocols/jabber/auth.c:115
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Servern kr辰ver klartextautentisering 旦ver en okrypterad str旦m"
 
-#: ../libgaim/protocols/jabber/auth.c:232
-msgid "Server couldn't authenticate you without a password"
-msgstr "Servern kan inte autenticera dig utan ett l旦senord"
-
-#: ../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:294
+#: ../libpurple/protocols/jabber/auth.c:483
+#, c-format
+msgid ""
+"%s requires plaintext authentication over an unencrypted connection.  Allow "
+"this and continue authentication?"
+msgstr ""
+"%s kr辰ver klartextautentisering 旦ver en okrypterad anslutning. Till奪t detta "
+"och forts辰tt?"
+
+#: ../libpurple/protocols/jabber/auth.c:296
+#: ../libpurple/protocols/jabber/auth.c:297
+#: ../libpurple/protocols/jabber/auth.c:485
+#: ../libpurple/protocols/jabber/auth.c:486
+#: ../libpurple/protocols/jabber/auth.c:570
+#: ../libpurple/protocols/jabber/auth.c:571
 msgid "Plaintext Authentication"
 msgstr "Klartextautentisering"
 
-#: ../libgaim/protocols/jabber/auth.c:237
-#: ../libgaim/protocols/jabber/auth.c:406
-#: ../libgaim/protocols/jabber/auth.c:488
-msgid "This server requires plaintext authentication over an unencrypted connection.  Allow this and continue authentication?"
-msgstr "Servern kr辰ver klartextautentisering 旦ver en okrypterad anslutning. Till奪t detta och forts辰tt?"
-
-#: ../libgaim/protocols/jabber/auth.c:243
-#: ../libgaim/protocols/jabber/auth.c:414
-#: ../libgaim/protocols/jabber/auth.c:496
+#: ../libpurple/protocols/jabber/auth.c:309
+#: ../libpurple/protocols/jabber/auth.c:498
+#: ../libpurple/protocols/jabber/auth.c:582
 msgid "Server does not use any supported authentication method"
 msgstr "Servern anv辰nder inga autentiseringsmetoder som st旦ds"
 
 #. 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:437
+#: ../libpurple/protocols/jabber/auth.c:533
+#: ../libpurple/protocols/jabber/auth.c:748
+#: ../libpurple/protocols/jabber/auth.c:889
+#: ../libpurple/protocols/jabber/auth.c:914
+#: ../libpurple/protocols/jabber/auth.c:933
+#: ../libpurple/protocols/jabber/jabber.c:115
 msgid "Invalid response from server."
 msgstr "Ogiltigt svar fr奪n servern."
 
-#: ../libgaim/protocols/jabber/auth.c:638
+#: ../libpurple/protocols/jabber/auth.c:572
+msgid ""
+"This server requires plaintext authentication over an unencrypted "
+"connection.  Allow this and continue authentication?"
+msgstr ""
+"Servern kr辰ver klartextautentisering 旦ver en okrypterad anslutning. Till奪t "
+"detta och forts辰tt?"
+
+#: ../libpurple/protocols/jabber/auth.c:769
+#: ../libpurple/protocols/jabber/auth.c:792
 msgid "Invalid challenge from server"
 msgstr "Ogiltigt utmaning fr奪n servern"
 
-#: ../libgaim/protocols/jabber/auth.c:726
+#: ../libpurple/protocols/jabber/auth.c:864
 msgid "SASL error"
 msgstr "SASL fel"
 
-#: ../libgaim/protocols/jabber/buddy.c:271
-#: ../libgaim/protocols/jabber/buddy.c:775
-#: ../libgaim/protocols/sametime/sametime.c:4137
-#: ../libgaim/protocols/silc/ops.c:1020
+#: ../libpurple/protocols/jabber/buddy.c:271
+#: ../libpurple/protocols/jabber/buddy.c:825
+#: ../libpurple/protocols/sametime/sametime.c:4129
+#: ../libpurple/protocols/silc/ops.c:986
+#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Fullst辰ndigt namn"
 
-#: ../libgaim/protocols/jabber/buddy.c:272
-#: ../libgaim/protocols/jabber/buddy.c:788
-#: ../libgaim/protocols/silc/ops.c:1032
+#: ../libpurple/protocols/jabber/buddy.c:272
+#: ../libpurple/protocols/jabber/buddy.c:838
+#: ../libpurple/protocols/silc/ops.c:998
+#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Efternamn"
 
-#: ../libgaim/protocols/jabber/buddy.c:273
-#: ../libgaim/protocols/jabber/buddy.c:792
+#: ../libpurple/protocols/jabber/buddy.c:273
+#: ../libpurple/protocols/jabber/buddy.c:842
 msgid "Given Name"
 msgstr "F旦rnamn"
 
-#: ../libgaim/protocols/jabber/buddy.c:275
-#: ../libgaim/protocols/jabber/jabber.c:840
+#: ../libpurple/protocols/jabber/buddy.c:275
+#: ../libpurple/protocols/jabber/jabber.c:863
 msgid "URL"
 msgstr "URL"
 
-#: ../libgaim/protocols/jabber/buddy.c:276
-#: ../libgaim/protocols/jabber/buddy.c:844
+#: ../libpurple/protocols/jabber/buddy.c:276
+#: ../libpurple/protocols/jabber/buddy.c:894
 msgid "Street Address"
 msgstr "Gatuadress"
 
-#: ../libgaim/protocols/jabber/buddy.c:277
-#: ../libgaim/protocols/jabber/buddy.c:840
+#: ../libpurple/protocols/jabber/buddy.c:277
+#: ../libpurple/protocols/jabber/buddy.c:890
 msgid "Extended Address"
 msgstr "Ut旦kad adress"
 
-#: ../libgaim/protocols/jabber/buddy.c:278
-#: ../libgaim/protocols/jabber/buddy.c:848
+#: ../libpurple/protocols/jabber/buddy.c:278
+#: ../libpurple/protocols/jabber/buddy.c:898
 msgid "Locality"
 msgstr "Lokalitet"
 
-#: ../libgaim/protocols/jabber/buddy.c:279
-#: ../libgaim/protocols/jabber/buddy.c:852
+#: ../libpurple/protocols/jabber/buddy.c:279
+#: ../libpurple/protocols/jabber/buddy.c:902
 msgid "Region"
 msgstr "Region"
 
-#: ../libgaim/protocols/jabber/buddy.c:280
-#: ../libgaim/protocols/jabber/buddy.c:856
+#: ../libpurple/protocols/jabber/buddy.c:280
+#: ../libpurple/protocols/jabber/buddy.c:906
 msgid "Postal Code"
 msgstr "Postnummer"
 
-#: ../libgaim/protocols/jabber/buddy.c:281
-#: ../libgaim/protocols/jabber/buddy.c:861
-#: ../libgaim/protocols/silc/silc.c:939
+#: ../libpurple/protocols/jabber/buddy.c:281
+#: ../libpurple/protocols/jabber/buddy.c:911
+#: ../libpurple/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Land"
 
-#: ../libgaim/protocols/jabber/buddy.c:282
-#: ../libgaim/protocols/jabber/buddy.c:872
-#: ../libgaim/protocols/jabber/buddy.c:879
+#: ../libpurple/protocols/jabber/buddy.c:282
+#: ../libpurple/protocols/jabber/buddy.c:922
+#: ../libpurple/protocols/jabber/buddy.c:929
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../libgaim/protocols/jabber/buddy.c:283
-#: ../libgaim/protocols/jabber/buddy.c:890
-#: ../libgaim/protocols/jabber/buddy.c:898
-#: ../libgaim/protocols/jabber/buddy.c:1534
-#: ../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:940
+#: ../libpurple/protocols/jabber/buddy.c:948
+#: ../libpurple/protocols/jabber/buddy.c:1629
+#: ../libpurple/protocols/silc/ops.c:1041
+#: ../libpurple/protocols/silc/util.c:555
+#: ../libpurple/protocols/silc10/ops.c:1075
+#: ../libpurple/protocols/silc10/util.c:551
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "E-Mail"
 msgstr "E-post"
 
-#: ../libgaim/protocols/jabber/buddy.c:284
-#: ../libgaim/protocols/jabber/buddy.c:913
+#: ../libpurple/protocols/jabber/buddy.c:284
+#: ../libpurple/protocols/jabber/buddy.c:963
 msgid "Organization Name"
 msgstr "Organisationens namn"
 
-#: ../libgaim/protocols/jabber/buddy.c:285
-#: ../libgaim/protocols/jabber/buddy.c:917
+#: ../libpurple/protocols/jabber/buddy.c:285
+#: ../libpurple/protocols/jabber/buddy.c:967
 msgid "Organization Unit"
 msgstr "Organisationsenhet"
 
-#: ../libgaim/protocols/jabber/buddy.c:287
-#: ../libgaim/protocols/jabber/buddy.c:926
+#: ../libpurple/protocols/jabber/buddy.c:287
+#: ../libpurple/protocols/jabber/buddy.c:976
 msgid "Role"
 msgstr "Roll"
 
-#: ../libgaim/protocols/jabber/buddy.c:288
-#: ../libgaim/protocols/jabber/buddy.c:809
-#: ../libgaim/protocols/msn/msn.c:1607
-#: ../libgaim/protocols/oscar/oscar.c:3743
+#: ../libpurple/protocols/jabber/buddy.c:288
+#: ../libpurple/protocols/jabber/buddy.c:859
+#: ../libpurple/protocols/msn/msn.c:1627
+#: ../libpurple/protocols/oscar/oscar.c:3758
 msgid "Birthday"
 msgstr "F旦delsedag"
 
+#: ../libpurple/protocols/jabber/buddy.c:289
+#: ../libpurple/protocols/jabber/buddy.c:979
+#: ../libpurple/protocols/jabber/chat.c:775 ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkprefs.c:738
+msgid "Description"
+msgstr "Beskrivning"
+
 # "vCard" fattar ingen som inte insatt i Jabber vad det betyder.
 # Visitkort k辰nner d辰remot de flesta till.
-#: ../libgaim/protocols/jabber/buddy.c:582
-#: ../libgaim/protocols/jabber/buddy.c:583
-msgid "Edit Jabber vCard"
-msgstr "Redigera Jabber-visitkort"
-
-#: ../libgaim/protocols/jabber/buddy.c:584
-msgid "All items below are optional. Enter only the information with which you feel comfortable."
-msgstr "Alla poster nedan 辰r frivilliga. Ange endast den information som du vill l辰mna ut."
-
-#: ../libgaim/protocols/jabber/buddy.c:640
-#: ../libgaim/protocols/jabber/buddy.c:679
+#: ../libpurple/protocols/jabber/buddy.c:582
+#: ../libpurple/protocols/jabber/buddy.c:583
+msgid "Edit XMPP vCard"
+msgstr "Redigera XMPP vCard"
+
+#: ../libpurple/protocols/jabber/buddy.c:584
+msgid ""
+"All items below are optional. Enter only the information with which you feel "
+"comfortable."
+msgstr ""
+"Alla poster nedan 辰r frivilliga. Ange endast den information som du vill "
+"l辰mna ut."
+
+#: ../libpurple/protocols/jabber/buddy.c:655
+#: ../libpurple/protocols/jabber/buddy.c:696
 msgid "Client"
 msgstr "Klient"
 
-#: ../libgaim/protocols/jabber/buddy.c:644
-#: ../libgaim/protocols/jabber/buddy.c:683
+#: ../libpurple/protocols/jabber/buddy.c:659
+#: ../libpurple/protocols/jabber/buddy.c:700
 msgid "Operating System"
 msgstr "Operativsystem"
 
@@ -7950,686 +4333,756 @@
 # att 奪tminstone de som k辰nner till vad Resource betyder i Jabber
 # fattar vad det 辰r."Resurs" anv辰nds ocks奪 i str辰ngen "Resurskonflikt"
 # p奪 ett annat st辰lle i denna fil.
-#: ../libgaim/protocols/jabber/buddy.c:654
-#: ../libgaim/protocols/jabber/jabber.c:1988
+#: ../libpurple/protocols/jabber/buddy.c:669
+#: ../libpurple/protocols/jabber/libxmpp.c:202
+#: ../libpurple/protocols/jabber/si.c:853
 msgid "Resource"
 msgstr "Resurs"
 
-#: ../libgaim/protocols/jabber/buddy.c:656
-#: ../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
+#: ../libpurple/protocols/jabber/buddy.c:671
+#: ../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:1283
 msgid "Priority"
 msgstr "Prioritet"
 
-#: ../libgaim/protocols/jabber/buddy.c:796
-#: ../libgaim/protocols/silc/ops.c:1028
+#: ../libpurple/protocols/jabber/buddy.c:846
+#: ../libpurple/protocols/silc/ops.c:994
+#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Andranamn"
 
-#: ../libgaim/protocols/jabber/buddy.c:829
-#: ../libgaim/protocols/jabber/jabber.c:815
-#: ../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:879
+#: ../libpurple/protocols/jabber/jabber.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3797
+#: ../libpurple/protocols/oscar/oscar.c:3810
+#: ../libpurple/protocols/qq/buddy_info.c:56
+#: ../libpurple/protocols/silc/ops.c:1030
+#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Adress"
 
-#: ../libgaim/protocols/jabber/buddy.c:836
+#: ../libpurple/protocols/jabber/buddy.c:886
 msgid "P.O. Box"
 msgstr "Postbox"
 
-#: ../libgaim/protocols/jabber/buddy.c:950
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libgaim/protocols/jabber/buddy.c:950
+#: ../libpurple/protocols/jabber/buddy.c:1000
 msgid "Logo"
 msgstr "Logotyp"
 
-#: ../libgaim/protocols/jabber/buddy.c:1314
+#: ../libpurple/protocols/jabber/buddy.c:1409
 msgid "Un-hide From"
 msgstr "G旦m inte \"Fr奪n\""
 
-#: ../libgaim/protocols/jabber/buddy.c:1318
+#: ../libpurple/protocols/jabber/buddy.c:1413
 msgid "Temporarily Hide From"
 msgstr "G旦m tempor辰rt \"Fr奪n\""
 
 #. && NOT ME
-#: ../libgaim/protocols/jabber/buddy.c:1326
+#: ../libpurple/protocols/jabber/buddy.c:1421
 msgid "Cancel Presence Notification"
 msgstr "Avbryt n辰rvarorapportering"
 
-#: ../libgaim/protocols/jabber/buddy.c:1333
+#: ../libpurple/protocols/jabber/buddy.c:1428
 msgid "(Re-)Request authorization"
 msgstr "Beg辰r autentiserings (igen)"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libgaim/protocols/jabber/buddy.c:1342
+#: ../libpurple/protocols/jabber/buddy.c:1437
 msgid "Unsubscribe"
 msgstr "Sluta prenumerera"
 
-#: ../libgaim/protocols/jabber/buddy.c:1375
-#: ../libgaim/protocols/jabber/jabber.c:1236
+#: ../libpurple/protocols/jabber/buddy.c:1470
+#: ../libpurple/protocols/jabber/jabber.c:1252
 msgid "Chatty"
 msgstr "Pratig"
 
-#: ../libgaim/protocols/jabber/buddy.c:1379
-#: ../libgaim/status.c:159
+#: ../libpurple/protocols/jabber/buddy.c:1474
 msgid "Extended Away"
 msgstr "Ut旦kad fr奪nvaro"
 
-#: ../libgaim/protocols/jabber/buddy.c:1381
-#: ../libgaim/protocols/jabber/jabber.c:1266
-#: ../libgaim/protocols/oscar/oscar.c:706
-#: ../libgaim/protocols/oscar/oscar.c:5760
-#: ../libgaim/protocols/sametime/sametime.c:3308
+#: ../libpurple/protocols/jabber/buddy.c:1476
+#: ../libpurple/protocols/jabber/jabber.c:1282
+#: ../libpurple/protocols/oscar/oscar.c:727
+#: ../libpurple/protocols/oscar/oscar.c:5787
+#: ../libpurple/protocols/sametime/sametime.c:3298
 msgid "Do Not Disturb"
 msgstr "St旦r inte"
 
-#: ../libgaim/protocols/jabber/buddy.c:1526
+#: ../libpurple/protocols/jabber/buddy.c:1621
 msgid "JID"
 msgstr "JID"
 
-#: ../libgaim/protocols/jabber/buddy.c:1530
-#: ../libgaim/protocols/jabber/buddy.c:1709
-#: ../libgaim/protocols/oscar/oscar.c:3705
+#: ../libpurple/protocols/jabber/buddy.c:1625
+#: ../libpurple/protocols/jabber/buddy.c:1804
+#: ../libpurple/protocols/oscar/oscar.c:3720
 msgid "Last Name"
 msgstr "Efternamn"
 
-#: ../libgaim/protocols/jabber/buddy.c:1562
+#: ../libpurple/protocols/jabber/buddy.c:1657
 msgid "The following are the results of your search"
 msgstr "Din s旦kning gav f旦ljande resultat"
 
 #. current comment from Jabber User Directory users.jabber.org
-#: ../libgaim/protocols/jabber/buddy.c:1637
-msgid "Find a contact by entering the search criteria in the given fields. Note: Each field supports wild card searches (%)"
-msgstr "Hitta en kontakt genom att ange s旦kkriteriet i de givna f辰lten. Notera: Alla f辰lten st旦djer wild card s旦kningar (%)"
-
-#: ../libgaim/protocols/jabber/buddy.c:1657
+#: ../libpurple/protocols/jabber/buddy.c:1732
+msgid ""
+"Find a contact by entering the search criteria in the given fields. Note: "
+"Each field supports wild card searches (%)"
+msgstr ""
+"Hitta en kontakt genom att ange s旦kkriteriet i de givna f辰lten. Notera: Alla "
+"f辰lten st旦djer wild card s旦kningar (%)"
+
+#: ../libpurple/protocols/jabber/buddy.c:1752
 msgid "Directory Query Failed"
 msgstr "Katalogf旦rfr奪gning misslyckades"
 
-#: ../libgaim/protocols/jabber/buddy.c:1658
+#: ../libpurple/protocols/jabber/buddy.c:1753
 msgid "Could not query the directory server."
 msgstr "Kunde inte efterfr奪ga katalogservern."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
-#: ../libgaim/protocols/jabber/buddy.c:1692
+#: ../libpurple/protocols/jabber/buddy.c:1787
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Serverinstruktioner: %s"
 
-#: ../libgaim/protocols/jabber/buddy.c:1699
-msgid "Fill in one or more fields to search for any matching Jabber users."
-msgstr "Fyll i ett eller flera f辰lt f旦r att s旦ka efter matchande Jabberanv辰ndare."
-
-#: ../libgaim/protocols/jabber/buddy.c:1719
-#: ../libgaim/protocols/novell/novell.c:1488
-#: ../libgaim/protocols/oscar/oscar.c:3708
-#: ../libgaim/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/jabber/buddy.c:1794
+msgid "Fill in one or more fields to search for any matching XMPP users."
+msgstr ""
+"Fyll i ett eller flera f辰lt f旦r att s旦ka efter matchande XMPPanv辰ndare."
+
+#: ../libpurple/protocols/jabber/buddy.c:1814
+#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/oscar/oscar.c:3723
+#: ../libpurple/protocols/oscar/oscar.c:3732
 msgid "E-Mail Address"
 msgstr "E-postadress"
 
-#: ../libgaim/protocols/jabber/buddy.c:1728
-#: ../libgaim/protocols/jabber/buddy.c:1729
-msgid "Search for Jabber users"
-msgstr "S旦k efter Jabberanv辰ndare"
-
-#: ../libgaim/protocols/jabber/buddy.c:1743
+#: ../libpurple/protocols/jabber/buddy.c:1823
+#: ../libpurple/protocols/jabber/buddy.c:1824
+msgid "Search for XMPP users"
+msgstr "S旦k efter XMPP anv辰ndare"
+
+#. "Search"
+#: ../libpurple/protocols/jabber/buddy.c:1825
+#: ../libpurple/protocols/qq/group.c:123
+#: ../libpurple/protocols/qq/group_im.c:147
+#: ../libpurple/protocols/qq/sys_msg.c:176
+#: ../libpurple/protocols/qq/sys_msg.c:253
+#: ../libpurple/protocols/qq/sys_msg.c:271
+#: ../libpurple/protocols/sametime/sametime.c:5612
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:356
+msgid "Search"
+msgstr "S旦k"
+
+#: ../libpurple/protocols/jabber/buddy.c:1840
 msgid "Invalid Directory"
 msgstr "Ogiltigt register"
 
-#: ../libgaim/protocols/jabber/buddy.c:1760
+#: ../libpurple/protocols/jabber/buddy.c:1857
 msgid "Enter a User Directory"
 msgstr "Ange ett anv辰ndarregister"
 
-#: ../libgaim/protocols/jabber/buddy.c:1761
+#: ../libpurple/protocols/jabber/buddy.c:1858
 msgid "Select a user directory to search"
 msgstr "V辰lj ett anv辰ndarregister som du vill s旦ka i"
 
-#: ../libgaim/protocols/jabber/buddy.c:1764
+#: ../libpurple/protocols/jabber/buddy.c:1861
 msgid "Search Directory"
 msgstr "S旦kregister"
 
-#: ../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:5273
+#: ../libpurple/protocols/yahoo/yahoochat.c:962
 msgid "_Room:"
 msgstr "_Rum:"
 
-#: ../libgaim/protocols/jabber/chat.c:47
+#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../libgaim/protocols/jabber/chat.c:53
+#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Alias:"
 
-#: ../libgaim/protocols/jabber/chat.c:225
+#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s 辰r inte ett giltigt rumsnamn"
 
-#: ../libgaim/protocols/jabber/chat.c:226
+#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Ogiltigt rumsnamn"
 
-#: ../libgaim/protocols/jabber/chat.c:231
+#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s 辰r inte ett giltigt servernamn"
 
-#: ../libgaim/protocols/jabber/chat.c:232
-#: ../libgaim/protocols/jabber/chat.c:233
+#: ../libpurple/protocols/jabber/chat.c:230
+#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Ogiltigt servernamn"
 
-#: ../libgaim/protocols/jabber/chat.c:237
+#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s 辰r inte en giltig rumstitel"
 
-#: ../libgaim/protocols/jabber/chat.c:238
-#: ../libgaim/protocols/jabber/chat.c:239
+#: ../libpurple/protocols/jabber/chat.c:236
+#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Ogiltig rumstitel"
 
-#: ../libgaim/protocols/jabber/chat.c:398
+#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Anslutningsfel"
 
-#: ../libgaim/protocols/jabber/chat.c:407
-#: ../libgaim/protocols/jabber/chat.c:550
+#: ../libpurple/protocols/jabber/chat.c:405
+#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Kan inte konfigurera"
 
-#: ../libgaim/protocols/jabber/chat.c:422
+#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Rumkonfigurationsfel"
 
-#: ../libgaim/protocols/jabber/chat.c:423
+#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Det h辰r rummet kan inte konfigureras"
 
-#: ../libgaim/protocols/jabber/chat.c:472
-#: ../libgaim/protocols/jabber/chat.c:541
+#: ../libpurple/protocols/jabber/chat.c:470
+#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Registreringsfel"
 
-#: ../libgaim/protocols/jabber/chat.c:629
+#: ../libpurple/protocols/jabber/chat.c:627
 msgid "Nick changing not supported in non-MUC chatrooms"
 msgstr "Att 辰ndra smeknamn st旦djs inte i rum som inte 辰r MUC-chattrum"
 
 # "Rumslistan" ist辰llet?
-#: ../libgaim/protocols/jabber/chat.c:680
-#: ../libgaim/protocols/jabber/chat.c:691
-#: ../libgaim/protocols/silc/ops.c:1451
+#: ../libpurple/protocols/jabber/chat.c:678
+#: ../libpurple/protocols/jabber/chat.c:689
+#: ../libpurple/protocols/silc/ops.c:1456
+#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
 msgstr "Fel vid h辰mtning av rumlistan"
 
-#: ../libgaim/protocols/jabber/chat.c:739
+#: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
 msgstr "Ogiltig server"
 
-#: ../libgaim/protocols/jabber/chat.c:783
+#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "Ange en konferensserver"
 
-#: ../libgaim/protocols/jabber/chat.c:784
+#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "V辰lj en konferensserver att fr奪ga"
 
-#: ../libgaim/protocols/jabber/chat.c:787
+#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "S旦k rum"
 
-#: ../libgaim/protocols/jabber/jabber.c:82
+#: ../libpurple/protocols/jabber/jabber.c:84
 msgid "Error initializing session"
 msgstr "Fel vid initiering av session"
 
-#: ../libgaim/protocols/jabber/jabber.c:241
-#: ../libgaim/protocols/jabber/jabber.c:292
-#: ../libgaim/protocols/jabber/jabber.c:320
+#: ../libpurple/protocols/jabber/jabber.c:247
+#: ../libpurple/protocols/jabber/jabber.c:300
+#: ../libpurple/protocols/jabber/jabber.c:328
 msgid "Write error"
 msgstr "Skrivfel"
 
-#: ../libgaim/protocols/jabber/jabber.c:388
-#: ../libgaim/protocols/jabber/jabber.c:425
+#: ../libpurple/protocols/jabber/jabber.c:396
+#: ../libpurple/protocols/jabber/jabber.c:433
 msgid "Read Error"
 msgstr "L辰sfel"
 
-#: ../libgaim/protocols/jabber/jabber.c:502
+#: ../libpurple/protocols/jabber/jabber.c:467
+#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/yahoo/yahoo.c:2381
+#: ../libpurple/protocols/yahoo/yahoo.c:2413
+#, c-format
+msgid ""
+"Could not establish a connection with the server:\n"
+"%s"
+msgstr ""
+"Kunde inte skapa en anslutning med servern:\n"
+"%s"
+
+#: ../libpurple/protocols/jabber/jabber.c:523
 msgid "Unable to create socket"
 msgstr "Kan inte skapa socket"
 
-#: ../libgaim/protocols/jabber/jabber.c:550
-#: ../libgaim/protocols/jabber/jabber.c:893
-msgid "Invalid Jabber ID"
-msgstr "Ogiltigt Jabber-ID"
-
-#: ../libgaim/protocols/jabber/jabber.c:621
+#: ../libpurple/protocols/jabber/jabber.c:568
+#: ../libpurple/protocols/jabber/jabber.c:918
+msgid "Invalid XMPP ID"
+msgstr "Ogiltigt XMPP ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:573
+msgid "Invalid XMPP ID. Domain must be set."
+msgstr "Ogiltigt XMPP IP. Dom辰n m奪ste anges."
+
+#: ../libpurple/protocols/jabber/jabber.c:644
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrering av %s@%s lyckades"
 
-#: ../libgaim/protocols/jabber/jabber.c:623
-#: ../libgaim/protocols/jabber/jabber.c:624
+#: ../libpurple/protocols/jabber/jabber.c:646
+#: ../libpurple/protocols/jabber/jabber.c:647
 msgid "Registration Successful"
 msgstr "Registreringen lyckades"
 
-#: ../libgaim/protocols/jabber/jabber.c:630
-#: ../libgaim/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:653
+#: ../libpurple/protocols/jabber/jabber.c:1524
 msgid "Unknown Error"
 msgstr "Ok辰nt fel"
 
-#: ../libgaim/protocols/jabber/jabber.c:632
-#: ../libgaim/protocols/jabber/jabber.c:633
+#: ../libpurple/protocols/jabber/jabber.c:655
+#: ../libpurple/protocols/jabber/jabber.c:656
 msgid "Registration Failed"
 msgstr "Registreringen misslyckades"
 
-#: ../libgaim/protocols/jabber/jabber.c:748
-#: ../libgaim/protocols/jabber/jabber.c:749
+#: ../libpurple/protocols/jabber/jabber.c:771
+#: ../libpurple/protocols/jabber/jabber.c:772
 msgid "Already Registered"
 msgstr "Redan registrerad"
 
-#: ../libgaim/protocols/jabber/jabber.c:825
-#: ../libgaim/protocols/oscar/oscar.c:3765
-#: ../libgaim/protocols/oscar/oscar.c:3778
+#: ../libpurple/protocols/jabber/jabber.c:848
+#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3812
 msgid "State"
 msgstr "Delstat"
 
-#: ../libgaim/protocols/jabber/jabber.c:830
+#: ../libpurple/protocols/jabber/jabber.c:853
 msgid "Postal code"
 msgstr "Postnummer"
 
-#: ../libgaim/protocols/jabber/jabber.c:835
-#: ../libgaim/protocols/silc/ops.c:1069
-#: ../libgaim/protocols/silc/silc.c:697
-#: ../libgaim/protocols/silc/util.c:555
+#: ../libpurple/protocols/jabber/jabber.c:858
+#: ../libpurple/protocols/silc/ops.c:1035
+#: ../libpurple/protocols/silc/silc.c:772
+#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc10/ops.c:1069
+#: ../libpurple/protocols/silc10/silc.c:683
+#: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../libgaim/protocols/jabber/jabber.c:845
+#: ../libpurple/protocols/jabber/jabber.c:868
 msgid "Date"
 msgstr "Datum"
 
-#: ../libgaim/protocols/jabber/jabber.c:853
+#: ../libpurple/protocols/jabber/jabber.c:876
 msgid "Please fill out the information below to register your new account."
 msgstr "Fyll i informationen nedan f旦r att registrera ditt nya konto."
 
-#: ../libgaim/protocols/jabber/jabber.c:856
-#: ../libgaim/protocols/jabber/jabber.c:857
-msgid "Register New Jabber Account"
-msgstr "Registrera nytt Jabber-konto"
-
-#: ../libgaim/protocols/jabber/jabber.c:1023
+#: ../libpurple/protocols/jabber/jabber.c:879
+#: ../libpurple/protocols/jabber/jabber.c:880
+msgid "Register New XMPP Account"
+msgstr "Registrera nytt XMPP-konto"
+
+#. Register button
+#: ../libpurple/protocols/jabber/jabber.c:881 ../pidgin/gtkaccount.c:1518
+msgid "Register"
+msgstr "Registrera"
+
+#: ../libpurple/protocols/jabber/jabber.c:1050
 msgid "Initializing Stream"
 msgstr "Initierar fl旦de"
 
-#: ../libgaim/protocols/jabber/jabber.c:1028
-#: ../libgaim/protocols/msn/session.c:350
+#: ../libpurple/protocols/jabber/jabber.c:1055
+#: ../libpurple/protocols/msn/session.c:351
 msgid "Authenticating"
 msgstr "Autentiserar"
 
-#: ../libgaim/protocols/jabber/jabber.c:1037
+#: ../libpurple/protocols/jabber/jabber.c:1064
 msgid "Re-initializing Stream"
 msgstr "�terinitierar fl旦de"
 
-#: ../libgaim/protocols/jabber/jabber.c:1110
-#: ../libgaim/protocols/jabber/jabber.c:1480
-#: ../libgaim/protocols/jabber/jabber.c:1521
-#: ../libgaim/protocols/jabber/jabber.c:1555
-#: ../libgaim/protocols/oscar/oscar.c:805
-#: ../libgaim/protocols/oscar/oscar.c:5549
+#: ../libpurple/protocols/jabber/jabber.c:1126
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/oscar/oscar.c:826
+#: ../libpurple/protocols/oscar/oscar.c:5581
 msgid "Not Authorized"
 msgstr "Inte auktoriserad"
 
-#: ../libgaim/protocols/jabber/jabber.c:1152
+#: ../libpurple/protocols/jabber/jabber.c:1168
 msgid "Both"
 msgstr "B奪da"
 
-#: ../libgaim/protocols/jabber/jabber.c:1154
+#: ../libpurple/protocols/jabber/jabber.c:1170
 msgid "From (To pending)"
 msgstr "Fr奪n (till v辰ntande)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1159
+#: ../libpurple/protocols/jabber/jabber.c:1172
+msgid "From"
+msgstr "Fr奪n"
+
+#: ../libpurple/protocols/jabber/jabber.c:1175
 msgid "To"
 msgstr "Till"
 
-#: ../libgaim/protocols/jabber/jabber.c:1161
+#: ../libpurple/protocols/jabber/jabber.c:1177
 msgid "None (To pending)"
 msgstr "Ingen (till v辰ntande)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1166
+#: ../libpurple/protocols/jabber/jabber.c:1179
+#: ../pidgin/plugins/gevolution/eds-utils.c:73
+#: ../pidgin/plugins/gevolution/eds-utils.c:86
+msgid "None"
+msgstr "Ingen"
+
+#: ../libpurple/protocols/jabber/jabber.c:1182
 msgid "Subscription"
 msgstr "Prenumeration"
 
-#: ../libgaim/protocols/jabber/jabber.c:1296
+#: ../libpurple/protocols/jabber/jabber.c:1312
 msgid "Password Changed"
 msgstr "L旦senordet 辰r 辰ndrat"
 
-#: ../libgaim/protocols/jabber/jabber.c:1297
+#: ../libpurple/protocols/jabber/jabber.c:1313
 msgid "Your password has been changed."
 msgstr "Ditt l旦senord har 辰ndrats."
 
-#: ../libgaim/protocols/jabber/jabber.c:1301
-#: ../libgaim/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1317
+#: ../libpurple/protocols/jabber/jabber.c:1318
 msgid "Error changing password"
 msgstr "Fel vid byte av l旦senord"
 
-#: ../libgaim/protocols/jabber/jabber.c:1358
+#: ../libpurple/protocols/jabber/jabber.c:1375
 msgid "Password (again)"
 msgstr "L旦senord (igen)"
 
-#: ../libgaim/protocols/jabber/jabber.c:1363
-#: ../libgaim/protocols/jabber/jabber.c:1364
-msgid "Change Jabber Password"
-msgstr "Byt Jabber-l旦senord"
-
-#: ../libgaim/protocols/jabber/jabber.c:1364
+#: ../libpurple/protocols/jabber/jabber.c:1381
+#: ../libpurple/protocols/jabber/jabber.c:1382
+msgid "Change XMPP Password"
+msgstr "Byt XMPP l旦senord"
+
+#: ../libpurple/protocols/jabber/jabber.c:1382
 msgid "Please enter your new password"
 msgstr "Ange ditt nya l旦senord"
 
-#: ../libgaim/protocols/jabber/jabber.c:1374
-#: ../libgaim/protocols/oscar/oscar.c:6352
-#: ../libgaim/protocols/silc/silc.c:1019
+#: ../libpurple/protocols/jabber/jabber.c:1394
+#: ../libpurple/protocols/oscar/oscar.c:6367
+#: ../libpurple/protocols/silc/silc.c:1093
+#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "�ndra anv辰ndarinfo..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libgaim/protocols/jabber/jabber.c:1379
-#: ../libgaim/protocols/oscar/oscar.c:6363
-#: ../libgaim/protocols/silc/silc.c:1015
+#: ../libpurple/protocols/jabber/jabber.c:1399
+#: ../libpurple/protocols/oscar/oscar.c:6378
+#: ../libpurple/protocols/silc/silc.c:1089
+#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Byt l旦senor..."
 
 #. }
-#: ../libgaim/protocols/jabber/jabber.c:1384
+#: ../libpurple/protocols/jabber/jabber.c:1404
 msgid "Search for Users..."
 msgstr "S旦k efter anv辰ndare..."
 
-#: ../libgaim/protocols/jabber/jabber.c:1460
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "Bad Request"
 msgstr "Felaktig f旦rfr奪gan"
 
-#: ../libgaim/protocols/jabber/jabber.c:1462
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: ../libgaim/protocols/jabber/jabber.c:1464
+#: ../libpurple/protocols/jabber/jabber.c:1486
 msgid "Feature Not Implemented"
 msgstr "Funktionen 辰r inte implementerad"
 
-#: ../libgaim/protocols/jabber/jabber.c:1466
+#: ../libpurple/protocols/jabber/jabber.c:1488
 msgid "Forbidden"
 msgstr "F旦rbjuden"
 
-#: ../libgaim/protocols/jabber/jabber.c:1468
+#: ../libpurple/protocols/jabber/jabber.c:1490
 msgid "Gone"
 msgstr "Borta"
 
-#: ../libgaim/protocols/jabber/jabber.c:1470
-#: ../libgaim/protocols/jabber/jabber.c:1545
+#: ../libpurple/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1569
 msgid "Internal Server Error"
 msgstr "Internt serverfel"
 
-#: ../libgaim/protocols/jabber/jabber.c:1472
+#: ../libpurple/protocols/jabber/jabber.c:1494
 msgid "Item Not Found"
 msgstr "F旦rem奪let hittades inte"
 
-#: ../libgaim/protocols/jabber/jabber.c:1474
-msgid "Malformed Jabber ID"
-msgstr "Felformaterat Jabber-ID"
-
-#: ../libgaim/protocols/jabber/jabber.c:1476
+#: ../libpurple/protocols/jabber/jabber.c:1496
+msgid "Malformed XMPP ID"
+msgstr "Felformaterat XMPP-ID"
+
+#: ../libpurple/protocols/jabber/jabber.c:1498
 msgid "Not Acceptable"
 msgstr "Ej Acceptabel"
 
-#: ../libgaim/protocols/jabber/jabber.c:1478
+#: ../libpurple/protocols/jabber/jabber.c:1500
 msgid "Not Allowed"
 msgstr "Ej till奪ten"
 
-#: ../libgaim/protocols/jabber/jabber.c:1482
+#: ../libpurple/protocols/jabber/jabber.c:1504
 msgid "Payment Required"
 msgstr "Betalning kr辰vs"
 
-#: ../libgaim/protocols/jabber/jabber.c:1484
+#: ../libpurple/protocols/jabber/jabber.c:1506
 msgid "Recipient Unavailable"
 msgstr "Mottagaren ej tillg辰nglig"
 
-#: ../libgaim/protocols/jabber/jabber.c:1488
+#: ../libpurple/protocols/jabber/jabber.c:1510
 msgid "Registration Required"
 msgstr "Registrering kr辰vs"
 
-#: ../libgaim/protocols/jabber/jabber.c:1490
+#: ../libpurple/protocols/jabber/jabber.c:1512
 msgid "Remote Server Not Found"
 msgstr "Fj辰rrserver hittades inte"
 
-#: ../libgaim/protocols/jabber/jabber.c:1492
+#: ../libpurple/protocols/jabber/jabber.c:1514
 msgid "Remote Server Timeout"
 msgstr "V辰ntetiden f旦r fj辰rrservern 辰r slut"
 
-#: ../libgaim/protocols/jabber/jabber.c:1494
+#: ../libpurple/protocols/jabber/jabber.c:1516
 msgid "Server Overloaded"
 msgstr "Servern 辰r 旦verlastad"
 
-#: ../libgaim/protocols/jabber/jabber.c:1496
+#: ../libpurple/protocols/jabber/jabber.c:1518
 msgid "Service Unavailable"
 msgstr "Tj辰nsten 辰r ej tillg辰nglig"
 
-#: ../libgaim/protocols/jabber/jabber.c:1498
+#: ../libpurple/protocols/jabber/jabber.c:1520
 msgid "Subscription Required"
 msgstr "Prenumeration kr辰vs"
 
-#: ../libgaim/protocols/jabber/jabber.c:1500
+#: ../libpurple/protocols/jabber/jabber.c:1522
 msgid "Unexpected Request"
 msgstr "Ov辰ntad beg辰ran"
 
-#: ../libgaim/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/jabber/jabber.c:1529
 msgid "Authorization Aborted"
 msgstr "Auktorisering avbruten"
 
-#: ../libgaim/protocols/jabber/jabber.c:1509
+#: ../libpurple/protocols/jabber/jabber.c:1531
 msgid "Incorrect encoding in authorization"
 msgstr "Inkorrekt kodning i auktoriseringen"
 
-#: ../libgaim/protocols/jabber/jabber.c:1512
+#: ../libpurple/protocols/jabber/jabber.c:1534
 msgid "Invalid authzid"
 msgstr "Ogiltigt authzid"
 
-#: ../libgaim/protocols/jabber/jabber.c:1515
+#: ../libpurple/protocols/jabber/jabber.c:1537
 msgid "Invalid Authorization Mechanism"
 msgstr "Ogiltigt auktoriseringsmekanism"
 
-#: ../libgaim/protocols/jabber/jabber.c:1518
+#: ../libpurple/protocols/jabber/jabber.c:1540
 msgid "Authorization mechanism too weak"
 msgstr "Auktoriseringsmekanism f旦r svag"
 
-#: ../libgaim/protocols/jabber/jabber.c:1523
+#: ../libpurple/protocols/jabber/jabber.c:1545
 msgid "Temporary Authentication Failure"
 msgstr "Tillf辰lligt Autentiseringsfel"
 
-#: ../libgaim/protocols/jabber/jabber.c:1526
+#: ../libpurple/protocols/jabber/jabber.c:1548
 msgid "Authentication Failure"
 msgstr "Autentiseringen misslyckades"
 
-#: ../libgaim/protocols/jabber/jabber.c:1530
+#: ../libpurple/protocols/jabber/jabber.c:1554
 msgid "Bad Format"
 msgstr "Felaktigt format"
 
-#: ../libgaim/protocols/jabber/jabber.c:1532
+#: ../libpurple/protocols/jabber/jabber.c:1556
 msgid "Bad Namespace Prefix"
 msgstr "Felaktigt namnrymdsprefix"
 
-#: ../libgaim/protocols/jabber/jabber.c:1535
+#: ../libpurple/protocols/jabber/jabber.c:1559
 msgid "Resource Conflict"
 msgstr "Resurskonflikt"
 
-#: ../libgaim/protocols/jabber/jabber.c:1537
-#: ../libgaim/protocols/silc/ops.c:1729
+#: ../libpurple/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/silc/silc.c:244
+#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Anslutningen 旦verskred en tidsgr辰ns och tappades"
 
-#: ../libgaim/protocols/jabber/jabber.c:1539
+#: ../libpurple/protocols/jabber/jabber.c:1563
 msgid "Host Gone"
 msgstr "V辰rden f旦rsvann"
 
-#: ../libgaim/protocols/jabber/jabber.c:1541
+#: ../libpurple/protocols/jabber/jabber.c:1565
 msgid "Host Unknown"
 msgstr "Ok辰nd v辰rd"
 
-#: ../libgaim/protocols/jabber/jabber.c:1543
+#: ../libpurple/protocols/jabber/jabber.c:1567
 msgid "Improper Addressing"
 msgstr "Ol辰mplig adressering"
 
-#: ../libgaim/protocols/jabber/jabber.c:1547
+#: ../libpurple/protocols/jabber/jabber.c:1571
 msgid "Invalid ID"
 msgstr "Ogiltigt ID"
 
-#: ../libgaim/protocols/jabber/jabber.c:1549
+#: ../libpurple/protocols/jabber/jabber.c:1573
 msgid "Invalid Namespace"
 msgstr "Ogiltig namnrymd"
 
-#: ../libgaim/protocols/jabber/jabber.c:1551
+#: ../libpurple/protocols/jabber/jabber.c:1575
 msgid "Invalid XML"
 msgstr "Ogiltig XML"
 
-#: ../libgaim/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1577
 msgid "Non-matching Hosts"
 msgstr "Ej 旦verensst辰mmande v辰rdar"
 
-#: ../libgaim/protocols/jabber/jabber.c:1557
+#: ../libpurple/protocols/jabber/jabber.c:1581
 msgid "Policy Violation"
 msgstr "Policy旦vertr辰delse"
 
-#: ../libgaim/protocols/jabber/jabber.c:1559
+#: ../libpurple/protocols/jabber/jabber.c:1583
 msgid "Remote Connection Failed"
 msgstr "Fj辰rranslutning misslyckades"
 
-#: ../libgaim/protocols/jabber/jabber.c:1561
+#: ../libpurple/protocols/jabber/jabber.c:1585
 msgid "Resource Constraint"
 msgstr "Resursbegr辰nsning"
 
-#: ../libgaim/protocols/jabber/jabber.c:1563
+#: ../libpurple/protocols/jabber/jabber.c:1587
 msgid "Restricted XML"
 msgstr "Begr辰nsad XML"
 
-#: ../libgaim/protocols/jabber/jabber.c:1565
+#: ../libpurple/protocols/jabber/jabber.c:1589
 msgid "See Other Host"
 msgstr "Se anna v辰rd"
 
-#: ../libgaim/protocols/jabber/jabber.c:1567
+#: ../libpurple/protocols/jabber/jabber.c:1591
 msgid "System Shutdown"
 msgstr "Systemet st辰ngs ner"
 
-#: ../libgaim/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1593
 msgid "Undefined Condition"
 msgstr "Odefinierade villkor"
 
-#: ../libgaim/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1595
 msgid "Unsupported Encoding"
 msgstr "St旦djer ej kodningen"
 
-#: ../libgaim/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1597
 msgid "Unsupported Stanza Type"
 msgstr "Ej st旦d stroftyp"
 
-#: ../libgaim/protocols/jabber/jabber.c:1575
+#: ../libpurple/protocols/jabber/jabber.c:1599
 msgid "Unsupported Version"
 msgstr "Ej st旦d version"
 
-#: ../libgaim/protocols/jabber/jabber.c:1577
+#: ../libpurple/protocols/jabber/jabber.c:1601
 msgid "XML Not Well Formed"
 msgstr "XML:en 辰r inte v辰l utformad"
 
-#: ../libgaim/protocols/jabber/jabber.c:1579
+#: ../libpurple/protocols/jabber/jabber.c:1603
 msgid "Stream Error"
 msgstr "Fel i str旦m"
 
-#: ../libgaim/protocols/jabber/jabber.c:1646
+#: ../libpurple/protocols/jabber/jabber.c:1670
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Kan inte banna anv辰ndaren %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1690
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Ok辰nd koppling: \"%s\""
 
-#: ../libgaim/protocols/jabber/jabber.c:1671
+#: ../libpurple/protocols/jabber/jabber.c:1695
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Kan inte koppla anv辰ndaren %s till \"%s\""
 
-#: ../libgaim/protocols/jabber/jabber.c:1690
+#: ../libpurple/protocols/jabber/jabber.c:1714
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Ok辰nd roll: \"%s\""
 
-#: ../libgaim/protocols/jabber/jabber.c:1697
+#: ../libpurple/protocols/jabber/jabber.c:1721
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Kan inte ange roll \"%s\" f旦r anv辰ndare: %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1750
+#: ../libpurple/protocols/jabber/jabber.c:1774
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Kan inte sparka ut anv辰ndaren %s"
 
-#: ../libgaim/protocols/jabber/jabber.c:1781
+#: ../libpurple/protocols/jabber/jabber.c:1805
 msgid "config:  Configure a chat room."
 msgstr "config: Konfigurera ett chattrum."
 
-#: ../libgaim/protocols/jabber/jabber.c:1785
+#: ../libpurple/protocols/jabber/jabber.c:1809
 msgid "configure:  Configure a chat room."
 msgstr "configure: Konfigurera ett chattrum."
 
-#: ../libgaim/protocols/jabber/jabber.c:1794
+#: ../libpurple/protocols/jabber/jabber.c:1818
 msgid "part [room]:  Leave the room."
 msgstr "part [rum]: l辰mna rummet."
 
-#: ../libgaim/protocols/jabber/jabber.c:1799
+#: ../libpurple/protocols/jabber/jabber.c:1823
 msgid "register:  Register with a chat room."
 msgstr "register: Registrera i ett chattrum."
 
-#: ../libgaim/protocols/jabber/jabber.c:1805
+#: ../libpurple/protocols/jabber/jabber.c:1829
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nytt 辰mne]:  Visa eller 辰ndra 辰mne."
 
-#: ../libgaim/protocols/jabber/jabber.c:1811
+#: ../libpurple/protocols/jabber/jabber.c:1835
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;anv辰ndare&gt; [rum]:  Bannlys en anv辰ndare fr奪n rummet."
 
-#: ../libgaim/protocols/jabber/jabber.c:1817
-msgid "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's affiliation with the room."
-msgstr "affiliate &lt;anv辰ndare&gt; &lt;辰gare|admin|medlem|utst旦tt|ingen&gt;: Ange en anv辰ndares koppling till rummet."
-
-#: ../libgaim/protocols/jabber/jabber.c:1823
-msgid "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's role in the room."
-msgstr "role &lt;anv辰ndare&gt; &lt;moderator|deltagare|bes旦kare|inget&gt;: Ange en anv辰ndares roll i rummet."
-
-#: ../libgaim/protocols/jabber/jabber.c:1829
+#: ../libpurple/protocols/jabber/jabber.c:1841
+msgid ""
+"affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
+"affiliation with the room."
+msgstr ""
+"affiliate &lt;anv辰ndare&gt; &lt;辰gare|admin|medlem|utst旦tt|ingen&gt;: Ange "
+"en anv辰ndares koppling till rummet."
+
+#: ../libpurple/protocols/jabber/jabber.c:1847
+msgid ""
+"role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
+"role in the room."
+msgstr ""
+"role &lt;anv辰ndare&gt; &lt;moderator|deltagare|bes旦kare|inget&gt;: Ange en "
+"anv辰ndares roll i rummet."
+
+#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
-msgstr "invite &lt;anv辰ndare&gt; [meddelande]:  Bjud in anv辰ndaren till rummet."
-
-#: ../libgaim/protocols/jabber/jabber.c:1835
+msgstr ""
+"invite &lt;anv辰ndare&gt; [meddelande]:  Bjud in anv辰ndaren till rummet."
+
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr "join: &lt;rum&gt; [server]:  Anslut till en chatt p奪 denna server."
 
-#: ../libgaim/protocols/jabber/jabber.c:1841
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;anv辰ndare&gt; [rum]:  Sparka ut en anv辰ndare fr奪n rummet."
 
-#: ../libgaim/protocols/jabber/jabber.c:1846
-msgid "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
-msgstr "msg &lt;anv辰ndare&gt; &lt;meddelande&gt;:  Skicka ett privat meddelande till en annan anv辰ndare."
+#: ../libpurple/protocols/jabber/jabber.c:1870
+msgid ""
+"msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
+msgstr ""
+"msg &lt;anv辰ndare&gt; &lt;meddelande&gt;:  Skicka ett privat meddelande till "
+"en annan anv辰ndare."
 
 #. *< type
 #. *< ui_requirement
@@ -8641,717 +5094,773 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/jabber/jabber.c:1963
-#: ../libgaim/protocols/jabber/jabber.c:1965
-msgid "Jabber Protocol Plugin"
-msgstr "Jabber-insticksmodul"
-
-#: ../libgaim/protocols/jabber/jabber.c:1991
+#: ../libpurple/protocols/jabber/libxmpp.c:169
+#: ../libpurple/protocols/jabber/libxmpp.c:171
+msgid "XMPP Protocol Plugin"
+msgstr "Insticksmodul f旦r XMPP-Protokollet"
+
+#. Translators: 'domain' is used here in the context of Internet domains, e.g. pidgin.im
+#: ../libpurple/protocols/jabber/libxmpp.c:198 ../pidgin/gtkaccount.c:508
+msgid "Domain"
+msgstr "Dom辰n"
+
+#: ../libpurple/protocols/jabber/libxmpp.c:206
 msgid "Force old (port 5223) SSL"
 msgstr "Tvinga fram anv辰ndning av gammal (port 5223) SSL"
 
-#: ../libgaim/protocols/jabber/jabber.c:1996
+#: ../libpurple/protocols/jabber/libxmpp.c:211
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Till奪t klartextautentisering 旦ver okrypterad str旦m"
 
-#: ../libgaim/protocols/jabber/jabber.c:2001
-#: ../libgaim/protocols/simple/simple.c:1842
+#: ../libpurple/protocols/jabber/libxmpp.c:216
+#: ../libpurple/protocols/simple/simple.c:1861
 msgid "Connect port"
 msgstr "Anslutningsport"
 
 #. Account options
-#: ../libgaim/protocols/jabber/jabber.c:2005
-#: ../libgaim/protocols/silc/silc.c:1852
+#: ../libpurple/protocols/jabber/libxmpp.c:220
+#: ../libpurple/protocols/silc/silc.c:1914
+#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:837
 msgid "Connect server"
 msgstr "Anslutningsserver"
 
-#: ../libgaim/protocols/jabber/message.c:117
+#: ../libpurple/protocols/jabber/message.c:102
+#, c-format
+msgid "%s has left the conversation."
+msgstr "%s har l辰mnat konversationen."
+
+#: ../libpurple/protocols/jabber/message.c:153
 #, c-format
 msgid "Message from %s"
 msgstr "Meddelande fr奪n %s"
 
-#: ../libgaim/protocols/jabber/message.c:181
+#: ../libpurple/protocols/jabber/message.c:217
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s har satt 辰mnet till: %s"
 
-#: ../libgaim/protocols/jabber/message.c:183
+#: ../libpurple/protocols/jabber/message.c:219
 #, c-format
 msgid "The topic is: %s"
 msgstr "�mnet 辰r: %s"
 
-#: ../libgaim/protocols/jabber/message.c:233
+#: ../libpurple/protocols/jabber/message.c:267
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Leverans av meddelande till %s misslyckades: %s"
 
-#: ../libgaim/protocols/jabber/message.c:236
-msgid "Jabber Message Error"
-msgstr "Jabber-meddelandefel"
-
-#: ../libgaim/protocols/jabber/message.c:316
+#: ../libpurple/protocols/jabber/message.c:270
+msgid "XMPP Message Error"
+msgstr "XMPP meddelandefel"
+
+#: ../libpurple/protocols/jabber/message.c:359
 #, c-format
 msgid " (Code %s)"
 msgstr " (Kod %s)"
 
-#: ../libgaim/protocols/jabber/parser.c:192
+#: ../libpurple/protocols/jabber/parser.c:193
 msgid "XML Parse error"
 msgstr "XML-tolkningsfel"
 
-#: ../libgaim/protocols/jabber/presence.c:280
+#: ../libpurple/protocols/jabber/presence.c:290
 msgid "Unknown Error in presence"
 msgstr "Ok辰nt fel i n辰rvaro"
 
-#: ../libgaim/protocols/jabber/presence.c:354
-#: ../libgaim/protocols/jabber/presence.c:355
+#: ../libpurple/protocols/jabber/presence.c:364
+#: ../libpurple/protocols/jabber/presence.c:365
 msgid "Create New Room"
 msgstr "Skapa nytt rum"
 
-#: ../libgaim/protocols/jabber/presence.c:356
-msgid "You are creating a new room.  Would you like to configure it, or accept the default settings?"
-msgstr "Du skapar ett nytt rum. Vill du konfigurera det eller n旦jer du dig med f旦rvalda inst辰llningar?"
-
-#: ../libgaim/protocols/jabber/presence.c:359
+#: ../libpurple/protocols/jabber/presence.c:366
+msgid ""
+"You are creating a new room.  Would you like to configure it, or accept the "
+"default settings?"
+msgstr ""
+"Du skapar ett nytt rum. Vill du konfigurera det eller n旦jer du dig med "
+"f旦rvalda inst辰llningar?"
+
+#: ../libpurple/protocols/jabber/presence.c:372
 msgid "_Configure Room"
 msgstr "_Konfigurera rum"
 
-#: ../libgaim/protocols/jabber/presence.c:361
+#: ../libpurple/protocols/jabber/presence.c:373
 msgid "_Accept Defaults"
 msgstr "_Acceptera f旦rval"
 
-#: ../libgaim/protocols/jabber/presence.c:399
+#: ../libpurple/protocols/jabber/presence.c:409
 #, c-format
 msgid "Error in chat %s"
 msgstr "Fel i chatt %s"
 
-#: ../libgaim/protocols/jabber/presence.c:402
+#: ../libpurple/protocols/jabber/presence.c:412
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Fel vid anslutning till chatt %s"
 
-#: ../libgaim/protocols/jabber/si.c:765
+#: ../libpurple/protocols/jabber/si.c:769
 #, c-format
 msgid "Unable to send file to %s, user does not support file transfers"
 msgstr "Kan inte skicka fil till %s, anv辰ndaren st旦djer inte fil旦verf旦ringar"
 
-#: ../libgaim/protocols/jabber/si.c:766
-#: ../libgaim/protocols/jabber/si.c:767
+#: ../libpurple/protocols/jabber/si.c:770
+#: ../libpurple/protocols/jabber/si.c:771
+#: ../libpurple/protocols/jabber/si.c:839
 msgid "File Send Failed"
 msgstr "Fils辰ndning misslyckades"
 
-#: ../libgaim/protocols/msn/dialog.c:110
+#: ../libpurple/protocols/jabber/si.c:832
+#, c-format
+msgid "Unable to send file to %s, invalid JID"
+msgstr "Kan inte skicka filen till %s, ogiltig JID"
+
+#: ../libpurple/protocols/jabber/si.c:834
+#, c-format
+msgid "Unable to send file to %s, user is not online"
+msgstr "Kan inte skicka filen till %s, anv辰ndaren 辰r inte ansluten"
+
+#: ../libpurple/protocols/jabber/si.c:836
+#, c-format
+msgid "Unable to send file to %s, not subscribed to user presence"
+msgstr ""
+"Kan inte skicka filen till %s, prenumrerar inte p奪 anv辰ndartillg辰nglighet"
+
+#: ../libpurple/protocols/jabber/si.c:851
+#, c-format
+msgid "Please select which resource of %s you would like to send a file to"
+msgstr "Var god v辰lj vilken tillflykt f旦r %s du vill s辰nda filen till"
+
+#: ../libpurple/protocols/jabber/si.c:867
+msgid "Select a Resource"
+msgstr "V辰lj en tillflykt"
+
+#: ../libpurple/protocols/msn/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problem med synkroniseringen av kompislistan i %s (%s)"
 
-#: ../libgaim/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 "%s p奪 den lokala listan finns i gruppen \"%s\" men inte p奪 serverns lista. Ska kompisen l辰ggas till?"
-
-#: ../libgaim/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 "%s finns p奪 den lokala listan men inte p奪 serverns lista. Ska kompisen l辰ggas till?"
-
-#: ../libgaim/protocols/msn/error.c:35
+#: ../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 ""
+"%s p奪 den lokala listan finns i gruppen \"%s\" men inte p奪 serverns lista. "
+"Ska kompisen l辰ggas till?"
+
+#: ../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 ""
+"%s finns p奪 den lokala listan men inte p奪 serverns lista. Ska kompisen "
+"l辰ggas till?"
+
+#: ../libpurple/protocols/msn/error.c:36
 msgid "Unable to parse message"
 msgstr "Kan inte avkoda meddelandet"
 
-#: ../libgaim/protocols/msn/error.c:38
-msgid "Syntax Error (probably a Gaim bug)"
-msgstr "Syntaxfel (antagligen ett bug i Gaim)"
-
-#: ../libgaim/protocols/msn/error.c:42
+#: ../libpurple/protocols/msn/error.c:41
+msgid "Syntax Error (probably a client bug)"
+msgstr "Syntaxfel (antagligen ett klient bug)"
+
+#: ../libpurple/protocols/msn/error.c:46
 msgid "Invalid e-mail address"
 msgstr "Ogiltig e-postadress"
 
-#: ../libgaim/protocols/msn/error.c:45
+#: ../libpurple/protocols/msn/error.c:49
 msgid "User does not exist"
 msgstr "Anv辰ndaren finns inte"
 
-#: ../libgaim/protocols/msn/error.c:49
+#: ../libpurple/protocols/msn/error.c:53
 msgid "Fully qualified domain name missing"
 msgstr "Fullst辰ndigt kvalificerat dom辰nnamn saknas"
 
-#: ../libgaim/protocols/msn/error.c:52
+#: ../libpurple/protocols/msn/error.c:56
 msgid "Already logged in"
 msgstr "Redan inloggad"
 
-#: ../libgaim/protocols/msn/error.c:55
+#: ../libpurple/protocols/msn/error.c:59
 msgid "Invalid screen name"
 msgstr "Ogiltigt sk辰rmnamn"
 
-#: ../libgaim/protocols/msn/error.c:58
+#: ../libpurple/protocols/msn/error.c:62
 msgid "Invalid friendly name"
 msgstr "Ogiltigt smeknamn"
 
 # Os辰ker (lista fullst辰ndig?)
-#: ../libgaim/protocols/msn/error.c:61
+#: ../libpurple/protocols/msn/error.c:65
 msgid "List full"
 msgstr "Listan 辰r full"
 
-#: ../libgaim/protocols/msn/error.c:64
+#: ../libpurple/protocols/msn/error.c:68
 msgid "Already there"
 msgstr "Finns redan"
 
-#: ../libgaim/protocols/msn/error.c:67
+#: ../libpurple/protocols/msn/error.c:72
 msgid "Not on list"
 msgstr "Finns inte i listan"
 
-#: ../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 "Anv辰ndaren 辰r fr奪nkopplad"
 
-#: ../libgaim/protocols/msn/error.c:73
+#: ../libpurple/protocols/msn/error.c:78
 msgid "Already in the mode"
 msgstr "Redan i det l辰get"
 
-#: ../libgaim/protocols/msn/error.c:76
+#: ../libpurple/protocols/msn/error.c:82
 msgid "Already in opposite list"
 msgstr "Finns redan i motpartens lista"
 
-#: ../libgaim/protocols/msn/error.c:79
+#: ../libpurple/protocols/msn/error.c:86
 msgid "Too many groups"
 msgstr "F旦r m奪nga grupper"
 
-#: ../libgaim/protocols/msn/error.c:82
+#: ../libpurple/protocols/msn/error.c:89
 msgid "Invalid group"
 msgstr "Ogiltig grupp"
 
-#: ../libgaim/protocols/msn/error.c:85
+#: ../libpurple/protocols/msn/error.c:92
 msgid "User not in group"
 msgstr "Anv辰ndaren finns inte i gruppen"
 
-#: ../libgaim/protocols/msn/error.c:88
+#: ../libpurple/protocols/msn/error.c:95
 msgid "Group name too long"
 msgstr "Gruppnamnet 辰r f旦r l奪ngt"
 
-#: ../libgaim/protocols/msn/error.c:91
+#: ../libpurple/protocols/msn/error.c:98
 msgid "Cannot remove group zero"
 msgstr "Kunde inte ta bort grupp noll"
 
-#: ../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 "F旦rs旦kte l辰gga till en anv辰ndare till en grupp som inte finns"
 
-#: ../libgaim/protocols/msn/error.c:99
+#: ../libpurple/protocols/msn/error.c:107
 msgid "Switchboard failed"
 msgstr "V辰xeln misslyckades"
 
-#: ../libgaim/protocols/msn/error.c:102
+#: ../libpurple/protocols/msn/error.c:111
 msgid "Notify transfer failed"
 msgstr "Rapportera misslyckade 旦verf旦ringar"
 
-#: ../libgaim/protocols/msn/error.c:106
+#: ../libpurple/protocols/msn/error.c:116
 msgid "Required fields missing"
 msgstr "N旦dv辰ndiga f辰lt saknas"
 
-#: ../libgaim/protocols/msn/error.c:109
+#: ../libpurple/protocols/msn/error.c:120
 msgid "Too many hits to a FND"
 msgstr "F旦r m奪nga tr辰ffar p奪 ett FND"
 
-#: ../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 "Inte inloggad"
 
-#: ../libgaim/protocols/msn/error.c:116
+#: ../libpurple/protocols/msn/error.c:128
 msgid "Service temporarily unavailable"
 msgstr "Tj辰nst 辰r f旦r tillf辰llet otillg辰nglig"
 
-#: ../libgaim/protocols/msn/error.c:119
+#: ../libpurple/protocols/msn/error.c:131
 msgid "Database server error"
 msgstr "Databasserverfel"
 
-#: ../libgaim/protocols/msn/error.c:122
+#: ../libpurple/protocols/msn/error.c:135
 msgid "Command disabled"
 msgstr "Kommandot avst辰ngt"
 
-#: ../libgaim/protocols/msn/error.c:125
+#: ../libpurple/protocols/msn/error.c:139
 msgid "File operation error"
 msgstr "Filoperationsfel"
 
-#: ../libgaim/protocols/msn/error.c:128
+#: ../libpurple/protocols/msn/error.c:143
 msgid "Memory allocation error"
 msgstr "Minnesallokeringsfel"
 
-#: ../libgaim/protocols/msn/error.c:131
+#: ../libpurple/protocols/msn/error.c:147
 msgid "Wrong CHL value sent to server"
 msgstr "Fel CHL-v辰rde skickat till servern"
 
-#: ../libgaim/protocols/msn/error.c:135
+#: ../libpurple/protocols/msn/error.c:152
 msgid "Server busy"
 msgstr "Servern upptagen"
 
-#: ../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 "Servern 辰r ej tillg辰nglig"
 
 # Os辰ker
-#: ../libgaim/protocols/msn/error.c:141
+#: ../libpurple/protocols/msn/error.c:158
 msgid "Peer notification server down"
 msgstr "Motpartsnotifieringsservern 辰r nere"
 
-#: ../libgaim/protocols/msn/error.c:144
+#: ../libpurple/protocols/msn/error.c:162
 msgid "Database connect error"
 msgstr "Databasanslutningsfel"
 
-#: ../libgaim/protocols/msn/error.c:148
+#: ../libpurple/protocols/msn/error.c:167
 msgid "Server is going down (abandon ship)"
 msgstr "Servern 辰r p奪v辰g ner (旦verge skeppet)"
 
-#: ../libgaim/protocols/msn/error.c:155
+#: ../libpurple/protocols/msn/error.c:174
 msgid "Error creating connection"
 msgstr "Fel vid skapandet av anslutning"
 
-#: ../libgaim/protocols/msn/error.c:159
+#: ../libpurple/protocols/msn/error.c:179
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parametrar 辰r antingen ok辰nda eller inte till奪tna"
 
-#: ../libgaim/protocols/msn/error.c:162
+#: ../libpurple/protocols/msn/error.c:183
 msgid "Unable to write"
 msgstr "Kan inte skriva"
 
-#: ../libgaim/protocols/msn/error.c:165
+#: ../libpurple/protocols/msn/error.c:186
 msgid "Session overload"
 msgstr "Sessions旦verlast"
 
-#: ../libgaim/protocols/msn/error.c:168
+#: ../libpurple/protocols/msn/error.c:190
 msgid "User is too active"
 msgstr "Anv辰ndaren 辰r f旦r aktiv"
 
-#: ../libgaim/protocols/msn/error.c:171
+#: ../libpurple/protocols/msn/error.c:193
 msgid "Too many sessions"
 msgstr "F旦r m奪nga sessioner"
 
-#: ../libgaim/protocols/msn/error.c:174
+#: ../libpurple/protocols/msn/error.c:196
 msgid "Passport not verified"
 msgstr "Passkonto inte verifierat"
 
-#: ../libgaim/protocols/msn/error.c:177
+#: ../libpurple/protocols/msn/error.c:199
 msgid "Bad friend file"
 msgstr "Fel p奪 friend-fil"
 
-#: ../libgaim/protocols/msn/error.c:180
+#: ../libpurple/protocols/msn/error.c:203
 msgid "Not expected"
 msgstr "Ej v辰ntat"
 
-#: ../libgaim/protocols/msn/error.c:185
+#: ../libpurple/protocols/msn/error.c:209
 msgid "Friendly name changes too rapidly"
 msgstr "Smeknamn 辰ndras f旦r ofta"
 
-#: ../libgaim/protocols/msn/error.c:194
+#: ../libpurple/protocols/msn/error.c:218
 msgid "Server too busy"
 msgstr "Servern 辰r f旦r upptagen"
 
-#: ../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:1381
+#: ../libpurple/protocols/silc/silc.c:233
+#: ../libpurple/protocols/silc10/ops.c:1709
+#: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1363
 msgid "Authentication failed"
 msgstr "Autentisering misslyckades"
 
-#: ../libgaim/protocols/msn/error.c:201
+#: ../libpurple/protocols/msn/error.c:225
 msgid "Not allowed when offline"
 msgstr "Inte till奪tet vid ej ansluten"
 
-#: ../libgaim/protocols/msn/error.c:209
+#: ../libpurple/protocols/msn/error.c:233
 msgid "Not accepting new users"
 msgstr "Accepterar inte nya anv辰ndare"
 
-#: ../libgaim/protocols/msn/error.c:213
+#: ../libpurple/protocols/msn/error.c:237
 msgid "Kids Passport without parental consent"
 msgstr "Barn-passport utan f旦r辰lders medgivande"
 
-#: ../libgaim/protocols/msn/error.c:217
+#: ../libpurple/protocols/msn/error.c:241
 msgid "Passport account not yet verified"
 msgstr "Passkonto 辰nnu inte verifierat"
 
-#: ../libgaim/protocols/msn/error.c:220
+#: ../libpurple/protocols/msn/error.c:244
 msgid "Bad ticket"
 msgstr "Ogiltig biljett"
 
-#: ../libgaim/protocols/msn/error.c:224
+#: ../libpurple/protocols/msn/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Ok辰nd felkod %d"
 
-#: ../libgaim/protocols/msn/error.c:236
+#: ../libpurple/protocols/msn/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN-fel: %s\n"
 
-#: ../libgaim/protocols/msn/msn.c:111
+#: ../libpurple/protocols/msn/msn.c:121
 msgid "You have just sent a Nudge!"
 msgstr "Du har just s辰nt en vibb!"
 
-#: ../libgaim/protocols/msn/msn.c:136
+#: ../libpurple/protocols/msn/msn.c:146
 msgid "Your new MSN friendly name is too long."
 msgstr "Ditt nya smeknamn f旦r MSN 辰r f旦r l奪ngt."
 
-#: ../libgaim/protocols/msn/msn.c:244
+#: ../libpurple/protocols/msn/msn.c:254
 msgid "Set your friendly name."
 msgstr "Ange smeknamn."
 
-#: ../libgaim/protocols/msn/msn.c:245
+#: ../libpurple/protocols/msn/msn.c:255
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Detta 辰r det namn som andra MSN-anv辰ndare kommer att se."
 
-#: ../libgaim/protocols/msn/msn.c:261
+#: ../libpurple/protocols/msn/msn.c:273
 msgid "Set your home phone number."
 msgstr "Ange ditt hemtelefonnummer."
 
-#: ../libgaim/protocols/msn/msn.c:276
+#: ../libpurple/protocols/msn/msn.c:290
 msgid "Set your work phone number."
 msgstr "Ange ditt jobbtelefonnummer."
 
-#: ../libgaim/protocols/msn/msn.c:291
+#: ../libpurple/protocols/msn/msn.c:307
 msgid "Set your mobile phone number."
 msgstr "Ange ditt mobiltelefonnummer."
 
-#: ../libgaim/protocols/msn/msn.c:304
+#: ../libpurple/protocols/msn/msn.c:322
 msgid "Allow MSN Mobile pages?"
 msgstr "Till奪t MSN-mobils旦kning?"
 
-#: ../libgaim/protocols/msn/msn.c:305
-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 "Vill du till奪ta kompisar i din kompislista att skicka MSN-mobils旦kningar till din mobiltelefon eller annan mobil enhet?"
-
-#: ../libgaim/protocols/msn/msn.c:309
+#: ../libpurple/protocols/msn/msn.c:323
+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 ""
+"Vill du till奪ta kompisar i din kompislista att skicka MSN-mobils旦kningar "
+"till din mobiltelefon eller annan mobil enhet?"
+
+#: ../libpurple/protocols/msn/msn.c:329
 msgid "Allow"
 msgstr "Till奪t"
 
-#: ../libgaim/protocols/msn/msn.c:310
+#: ../libpurple/protocols/msn/msn.c:330
 msgid "Disallow"
 msgstr "Till奪t ej"
 
-#: ../libgaim/protocols/msn/msn.c:326
+#: ../libpurple/protocols/msn/msn.c:346
 msgid "This Hotmail account may not be active."
 msgstr "Detta Hotmail-konto 辰r kanske inte aktivt."
 
-#: ../libgaim/protocols/msn/msn.c:352
+#: ../libpurple/protocols/msn/msn.c:372
 msgid "Send a mobile message."
 msgstr "Skicka ett mobilmeddelande."
 
-#: ../libgaim/protocols/msn/msn.c:354
+#: ../libpurple/protocols/msn/msn.c:374
 msgid "Page"
 msgstr "S旦k"
 
-#: ../libgaim/protocols/msn/msn.c:551
+#: ../libpurple/protocols/msn/msn.c:521
 msgid "Has you"
 msgstr "Har dig"
 
-#: ../libgaim/protocols/msn/msn.c:581
-#: ../libgaim/protocols/msn/state.c:33
-#: ../libgaim/protocols/yahoo/yahoo.c:2856
-#: ../libgaim/protocols/yahoo/yahoo.c:3460
+#: ../libpurple/protocols/msn/msn.c:551 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:2895
+#: ../libpurple/protocols/yahoo/yahoo.c:3504
 msgid "Be Right Back"
 msgstr "Strax tillbaka"
 
-#: ../libgaim/protocols/msn/msn.c:585
-#: ../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:555 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2822
+#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/silc/buddy.c:1480
+#: ../libpurple/protocols/silc/silc.c:56
+#: ../libpurple/protocols/silc10/buddy.c:1480
+#: ../libpurple/protocols/silc10/silc.c:47
+#: ../libpurple/protocols/yahoo/yahoo.c:2897
+#: ../libpurple/protocols/yahoo/yahoo.c:3507
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../libgaim/protocols/msn/msn.c:589
-#: ../libgaim/protocols/yahoo/yahoo.c:2866
-#: ../libgaim/protocols/yahoo/yahoo.c:3475
+#: ../libpurple/protocols/msn/msn.c:559
+#: ../libpurple/protocols/yahoo/yahoo.c:2905
+#: ../libpurple/protocols/yahoo/yahoo.c:3519
 msgid "On the Phone"
 msgstr "Pratar i telefon"
 
-#: ../libgaim/protocols/msn/msn.c:593
-#: ../libgaim/protocols/yahoo/yahoo.c:2870
-#: ../libgaim/protocols/yahoo/yahoo.c:3481
+#: ../libpurple/protocols/msn/msn.c:563
+#: ../libpurple/protocols/yahoo/yahoo.c:2909
+#: ../libpurple/protocols/yahoo/yahoo.c:3525
 msgid "Out to Lunch"
 msgstr "P奪 lunch"
 
-#: ../libgaim/protocols/msn/msn.c:617
+#: ../libpurple/protocols/msn/msn.c:591
 msgid "Set Friendly Name..."
 msgstr "Ange smeknamn..."
 
-#: ../libgaim/protocols/msn/msn.c:622
+#: ../libpurple/protocols/msn/msn.c:596
 msgid "Set Home Phone Number..."
 msgstr "Ange hemtelefonnummer..."
 
-#: ../libgaim/protocols/msn/msn.c:626
+#: ../libpurple/protocols/msn/msn.c:600
 msgid "Set Work Phone Number..."
 msgstr "Ange jobbtelefonnummer..."
 
-#: ../libgaim/protocols/msn/msn.c:630
+#: ../libpurple/protocols/msn/msn.c:604
 msgid "Set Mobile Phone Number..."
 msgstr "Ange mobilnummer..."
 
-#: ../libgaim/protocols/msn/msn.c:636
+#: ../libpurple/protocols/msn/msn.c:610
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Aktivera/Avaktivera mobila enheter..."
 
-#: ../libgaim/protocols/msn/msn.c:641
+#: ../libpurple/protocols/msn/msn.c:615
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Till奪t/Hindra mobils旦kningar..."
 
-#: ../libgaim/protocols/msn/msn.c:651
+#: ../libpurple/protocols/msn/msn.c:626
 msgid "Open Hotmail Inbox"
 msgstr "�ppna Hotmail Inkorg"
 
-#: ../libgaim/protocols/msn/msn.c:675
+#: ../libpurple/protocols/msn/msn.c:650
 msgid "Send to Mobile"
 msgstr "Skicka till mobil"
 
-#: ../libgaim/protocols/msn/msn.c:685
-#: ../libgaim/protocols/novell/novell.c:3443
+#: ../libpurple/protocols/msn/msn.c:660
+#: ../libpurple/protocols/novell/novell.c:3408
 msgid "Initiate _Chat"
 msgstr "Starta _chatt"
 
-#: ../libgaim/protocols/msn/msn.c:723
-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 "SSL-st旦d kr辰vs f旦r att anv辰nda MSN. Installera ett SSL-bibliotek som st旦ds av Gaim. Se http://gaim.sf.net/faq-ssl.php f旦r mer information (p奪 engelska)."
-
-#: ../libgaim/protocols/msn/msn.c:750
+#: ../libpurple/protocols/msn/msn.c:698
+msgid "SSL support is needed for MSN. Please install a supported SSL library."
+msgstr ""
+"SSL-st旦d kr辰vs f旦r att anv辰nda MSN. Installera ett SSL-bibliotek som st旦ds."
+
+#: ../libpurple/protocols/msn/msn.c:723
 msgid "Failed to connect to server."
 msgstr "Kunde inte ansluta till servern."
 
-#: ../libgaim/protocols/msn/msn.c:1459
-#: ../libgaim/protocols/msn/msn.c:1804
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:784
+#: ../libpurple/protocols/msn/msn.c:1479 ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Fel vid h辰mtninga av profil"
 
-#: ../libgaim/protocols/msn/msn.c:1537
-#: ../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:1550 ../pidgin/plugins/convcolors.c:309
+#: ../pidgin/plugins/pidginrc.c:366
+msgid "General"
+msgstr "Allm辰nt"
+
+#: ../libpurple/protocols/msn/msn.c:1557
+#: ../libpurple/protocols/oscar/oscar.c:3764
+#: ../libpurple/protocols/qq/buddy_info.c:45
+#: ../libpurple/protocols/qq/qq.c:219
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "�lder"
 
-#: ../libgaim/protocols/msn/msn.c:1539
-#: ../libgaim/protocols/qq/buddy_info.c:51
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1072
+#: ../libpurple/protocols/msn/msn.c:1559
+#: ../libpurple/protocols/qq/buddy_info.c:51
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Syssels辰ttning"
 
-#: ../libgaim/protocols/msn/msn.c:1540
-#: ../libgaim/protocols/novell/novell.c:1478
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1052
-#: ../libgaim/protocols/zephyr/zephyr.c:799
-#: ../libgaim/protocols/zephyr/zephyr.c:1220
+#: ../libpurple/protocols/msn/msn.c:1560
+#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
+#: ../libpurple/protocols/zephyr/zephyr.c:798
+#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Plats"
 
-#: ../libgaim/protocols/msn/msn.c:1545
-#: ../libgaim/protocols/msn/msn.c:1737
-#: ../libgaim/protocols/msn/msn.c:1743
-#: ../libgaim/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1565 ../libpurple/protocols/msn/msn.c:1757
+#: ../libpurple/protocols/msn/msn.c:1763 ../libpurple/protocols/msn/msn.c:1770
 msgid "Hobbies and Interests"
 msgstr "Hobbies och intressen"
 
-#: ../libgaim/protocols/msn/msn.c:1551
-#: ../libgaim/protocols/msn/msn.c:1671
-#: ../libgaim/protocols/msn/msn.c:1677
-#: ../libgaim/protocols/msn/msn.c:1684
-#: ../libgaim/protocols/msn/msn.c:1692
-#: ../libgaim/protocols/msn/msn.c:1699
+#: ../libpurple/protocols/msn/msn.c:1571 ../libpurple/protocols/msn/msn.c:1691
+#: ../libpurple/protocols/msn/msn.c:1697 ../libpurple/protocols/msn/msn.c:1704
+#: ../libpurple/protocols/msn/msn.c:1712 ../libpurple/protocols/msn/msn.c:1719
 msgid "A Little About Me"
 msgstr "Lite om mig"
 
-#: ../libgaim/protocols/msn/msn.c:1568
+#: ../libpurple/protocols/msn/msn.c:1588
 msgid "Social"
 msgstr "Social"
 
-#: ../libgaim/protocols/msn/msn.c:1570
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1062
+#: ../libpurple/protocols/msn/msn.c:1590
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Civilst奪nd"
 
-#: ../libgaim/protocols/msn/msn.c:1571
+#: ../libpurple/protocols/msn/msn.c:1591
 msgid "Interests"
 msgstr "Intressen"
 
-#: ../libgaim/protocols/msn/msn.c:1572
+#: ../libpurple/protocols/msn/msn.c:1592
 msgid "Pets"
 msgstr "Husdjur"
 
-#: ../libgaim/protocols/msn/msn.c:1573
+#: ../libpurple/protocols/msn/msn.c:1593
 msgid "Hometown"
 msgstr "Hemstad"
 
-#: ../libgaim/protocols/msn/msn.c:1574
+#: ../libpurple/protocols/msn/msn.c:1594
 msgid "Places Lived"
 msgstr "Tidigare boplatser"
 
-#: ../libgaim/protocols/msn/msn.c:1575
+#: ../libpurple/protocols/msn/msn.c:1595
 msgid "Fashion"
 msgstr "Mode"
 
-#: ../libgaim/protocols/msn/msn.c:1576
+#: ../libpurple/protocols/msn/msn.c:1596
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libgaim/protocols/msn/msn.c:1577
+#: ../libpurple/protocols/msn/msn.c:1597
 msgid "Music"
 msgstr "Musik"
 
-#: ../libgaim/protocols/msn/msn.c:1578
-#: ../libgaim/protocols/msn/msn.c:1759
-#: ../libgaim/protocols/msn/msn.c:1765
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1114
+#: ../libpurple/protocols/msn/msn.c:1598 ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1785
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Favoritcitat"
 
-#: ../libgaim/protocols/msn/msn.c:1595
+#: ../libpurple/protocols/msn/msn.c:1615
 msgid "Contact Info"
 msgstr "Kontaktinformation"
 
 # Os辰ker
-#: ../libgaim/protocols/msn/msn.c:1596
+#: ../libpurple/protocols/msn/msn.c:1616
 msgid "Personal"
 msgstr "Personligt"
 
-#: ../libgaim/protocols/msn/msn.c:1599
+#: ../libpurple/protocols/msn/msn.c:1619
 msgid "Significant Other"
 msgstr "Make/Maka"
 
-#: ../libgaim/protocols/msn/msn.c:1600
+#: ../libpurple/protocols/msn/msn.c:1620
 msgid "Home Phone"
 msgstr "Hemtelefon"
 
-#: ../libgaim/protocols/msn/msn.c:1601
+#: ../libpurple/protocols/msn/msn.c:1621
 msgid "Home Phone 2"
 msgstr "Hemtelefon 2"
 
-#: ../libgaim/protocols/msn/msn.c:1602
-#: ../libgaim/protocols/oscar/oscar.c:3768
+#: ../libpurple/protocols/msn/msn.c:1622
+#: ../libpurple/protocols/oscar/oscar.c:3802
 msgid "Home Address"
 msgstr "Hemadress"
 
-#: ../libgaim/protocols/msn/msn.c:1603
+#: ../libpurple/protocols/msn/msn.c:1623
 msgid "Personal Mobile"
 msgstr "Personlig mobil"
 
-#: ../libgaim/protocols/msn/msn.c:1604
+#: ../libpurple/protocols/msn/msn.c:1624
 msgid "Home Fax"
 msgstr "Hemfax"
 
-#: ../libgaim/protocols/msn/msn.c:1605
+#: ../libpurple/protocols/msn/msn.c:1625
 msgid "Personal E-Mail"
 msgstr "Personlig E-Post"
 
-#: ../libgaim/protocols/msn/msn.c:1606
+#: ../libpurple/protocols/msn/msn.c:1626
 msgid "Personal IM"
 msgstr "Personlig IM"
 
-#: ../libgaim/protocols/msn/msn.c:1608
+#: ../libpurple/protocols/msn/msn.c:1628
 msgid "Anniversary"
 msgstr "H旦gtid"
 
-#: ../libgaim/protocols/msn/msn.c:1609
-#: ../libgaim/protocols/msn/msn.c:1639
-msgid "Notes"
-msgstr "Notering"
-
 #. Business
-#: ../libgaim/protocols/msn/msn.c:1624
+#: ../libpurple/protocols/msn/msn.c:1644
 msgid "Work"
 msgstr "Arbete"
 
-#: ../libgaim/protocols/msn/msn.c:1626
-#: ../libgaim/protocols/silc/ops.c:1044
+#: ../libpurple/protocols/msn/msn.c:1646
+#: ../libpurple/protocols/silc/ops.c:1010
+#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Jobbtitel"
 
-#: ../libgaim/protocols/msn/msn.c:1627
-#: ../libgaim/protocols/oscar/oscar.c:3789
+#: ../libpurple/protocols/msn/msn.c:1647
+#: ../libpurple/protocols/oscar/oscar.c:3823
 msgid "Company"
 msgstr "F旦retag"
 
-#: ../libgaim/protocols/msn/msn.c:1628
-#: ../libgaim/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/msn/msn.c:1648
+#: ../libpurple/protocols/novell/novell.c:1480
 msgid "Department"
 msgstr "Avdelning"
 
-#: ../libgaim/protocols/msn/msn.c:1629
+#: ../libpurple/protocols/msn/msn.c:1649
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../libgaim/protocols/msn/msn.c:1630
+#: ../libpurple/protocols/msn/msn.c:1650
 msgid "Work Phone"
 msgstr "Arbetselefon"
 
-#: ../libgaim/protocols/msn/msn.c:1631
+#: ../libpurple/protocols/msn/msn.c:1651
 msgid "Work Phone 2"
 msgstr "Arbetselefon 2"
 
-#: ../libgaim/protocols/msn/msn.c:1632
-#: ../libgaim/protocols/oscar/oscar.c:3781
+#: ../libpurple/protocols/msn/msn.c:1652
+#: ../libpurple/protocols/oscar/oscar.c:3815
 msgid "Work Address"
 msgstr "Jobbadress"
 
-#: ../libgaim/protocols/msn/msn.c:1633
+#: ../libpurple/protocols/msn/msn.c:1653
 msgid "Work Mobile"
 msgstr "Arbetsmobil"
 
-#: ../libgaim/protocols/msn/msn.c:1634
+#: ../libpurple/protocols/msn/msn.c:1654
 msgid "Work Pager"
 msgstr "Arbetss旦kare"
 
-#: ../libgaim/protocols/msn/msn.c:1635
+#: ../libpurple/protocols/msn/msn.c:1655
 msgid "Work Fax"
 msgstr "Arbete Fax"
 
-#: ../libgaim/protocols/msn/msn.c:1636
+#: ../libpurple/protocols/msn/msn.c:1656
 msgid "Work E-Mail"
 msgstr "Arbete E-post"
 
-#: ../libgaim/protocols/msn/msn.c:1637
+#: ../libpurple/protocols/msn/msn.c:1657
 msgid "Work IM"
 msgstr "Arbete IM"
 
-#: ../libgaim/protocols/msn/msn.c:1638
+#: ../libpurple/protocols/msn/msn.c:1658
 msgid "Start Date"
 msgstr "Start datum"
 
-#: ../libgaim/protocols/msn/msn.c:1708
-#: ../libgaim/protocols/msn/msn.c:1714
-#: ../libgaim/protocols/msn/msn.c:1721
-#: ../libgaim/protocols/msn/msn.c:1728
+#: ../libpurple/protocols/msn/msn.c:1728 ../libpurple/protocols/msn/msn.c:1734
+#: ../libpurple/protocols/msn/msn.c:1741 ../libpurple/protocols/msn/msn.c:1748
 msgid "Favorite Things"
 msgstr "Favoritsaker"
 
-#: ../libgaim/protocols/msn/msn.c:1773
+#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Last Updated"
 msgstr "Senast uppdaterad"
 
-#: ../libgaim/protocols/msn/msn.c:1784
-#: ../libgaim/protocols/qq/buddy_info.c:60
-#: ../libgaim/protocols/silc/ops.c:1060
+#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/qq/buddy_info.c:60
+#: ../libpurple/protocols/silc/ops.c:1026
+#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Hemsida"
 
-#: ../libgaim/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msn/msn.c:1828
 msgid "The user has not created a public profile."
 msgstr "Anv辰ndaren har inte skapat en publik profil."
 
-#: ../libgaim/protocols/msn/msn.c:1806
-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 "MSN rapporterar att det inte kan hitta anv辰ndarens profil. Detta inneb辰r att anv辰ndaren inte finns eller att anv辰ndaren inte skapat en publik profil."
-
-#: ../libgaim/protocols/msn/msn.c:1810
-msgid "Gaim could not find any information in the user's profile. The user most likely does not exist."
-msgstr "Gaim kunde inte hitta n奪gon information i anv辰ndarens profil. Anv辰ndaren existerar antagligen inte."
-
-#: ../libgaim/protocols/msn/msn.c:1818
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1216
+#: ../libpurple/protocols/msn/msn.c:1829
+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 ""
+"MSN rapporterar att det inte kan hitta anv辰ndarens profil. Detta inneb辰r att "
+"anv辰ndaren inte finns eller att anv辰ndaren inte skapat en publik profil."
+
+#: ../libpurple/protocols/msn/msn.c:1833
+msgid ""
+"Could not find any information in the user's profile. The user most likely "
+"does not exist."
+msgstr ""
+"Kunde inte hitta n奪gon information i anv辰ndarens profil. Anv辰ndaren "
+"existerar troligen inte."
+
+#: ../libpurple/protocols/msn/msn.c:1841
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profil-URL"
 
@@ -9365,124 +5874,133 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/msn/msn.c:2033
-#: ../libgaim/protocols/msn/msn.c:2035
+#: ../libpurple/protocols/msn/msn.c:2127 ../libpurple/protocols/msn/msn.c:2129
 msgid "MSN Protocol Plugin"
 msgstr "Insticksmodul f旦r MSN-Protokollet"
 
-#: ../libgaim/protocols/msn/msn.c:2063
+#: ../libpurple/protocols/msn/msn.c:2163
 msgid "Use HTTP Method"
 msgstr "Anv辰nd HTTP-metod"
 
-#: ../libgaim/protocols/msn/msn.c:2068
+#: ../libpurple/protocols/msn/msn.c:2168
 msgid "Show custom smileys"
 msgstr "Visa egna smileys"
 
-#: ../libgaim/protocols/msn/msn.c:2076
+#: ../libpurple/protocols/msn/msn.c:2176
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Knuffa till en kontakt f旦r att f奪 dennes uppm辰rksamhet"
 
-#: ../libgaim/protocols/msn/nexus.c:146
-#: ../libgaim/protocols/msn/servconn.c:133
-#: ../libgaim/protocols/qq/qq_proxy.c:243
-#: ../libgaim/protocols/qq/qq_proxy.c:322
-#: ../libgaim/protocols/qq/qq_proxy.c:367
-#: ../libgaim/protocols/qq/qq_proxy.c:400
-#: ../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:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Unable to connect"
 msgstr "Kan inte ansluta"
 
-#: ../libgaim/protocols/msn/notification.c:178
+#: ../libpurple/protocols/msn/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s 辰r inte en giltig grupp."
 
-#: ../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:330
 msgid "Unknown error."
 msgstr "Ok辰nt fel."
 
-#: ../libgaim/protocols/msn/notification.c:187
+#: ../libpurple/protocols/msn/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s p奪 %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 "Kan inte l辰gga till anv辰ndare p奪 %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 "Kan inte blockera anv辰ndaren p奪 %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 "Kan inte till奪ta anv辰ndaren p奪 %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 kunde inte l辰ggas till eftersom din kompislista 辰r full."
 
-#: ../libgaim/protocols/msn/notification.c:523
+#: ../libpurple/protocols/msn/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s 辰r inte ett giltigt passport-konto."
 
-#: ../libgaim/protocols/msn/notification.c:528
+#: ../libpurple/protocols/msn/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Tj辰nst tillf辰lligt on奪bar."
 
-#: ../libgaim/protocols/msn/notification.c:823
+#: ../libpurple/protocols/msn/notification.c:851
 msgid "Unable to rename group"
 msgstr "Kan inte byta namn p奪 grupp"
 
-#: ../libgaim/protocols/msn/notification.c:878
+#: ../libpurple/protocols/msn/notification.c:906
 msgid "Unable to delete group"
 msgstr "Kan inte ta bort grupp"
 
-#: ../libgaim/protocols/msn/notification.c:1314
-#, c-format
-msgid ""
-"The MSN server will shut down for maintenance in %d minute. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+#: ../libpurple/protocols/msn/notification.c:1325
+#, c-format
+msgid ""
+"The MSN server will shut down for maintenance in %d minute. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgid_plural ""
-"The MSN server will shut down for maintenance in %d minutes. You will automatically be signed out at that time.  Please finish any conversations in progress.\n"
+"The MSN server will shut down for maintenance in %d minutes. You will "
+"automatically be signed out at that time.  Please finish any conversations "
+"in progress.\n"
 "\n"
-"After the maintenance has been completed, you will be able to successfully sign in."
+"After the maintenance has been completed, you will be able to successfully "
+"sign in."
 msgstr[0] ""
-"MSN-servern kommer att st辰ngas av f旦r underh奪ll om %d minut, d奪 kommer du automatiskt att loggas ut. Passa p奪 att avsluta dina konversationer innan tiden l旦per ut.\n"
+"MSN-servern kommer att st辰ngas av f旦r underh奪ll om %d minut, d奪 kommer du "
+"automatiskt att loggas ut. Passa p奪 att avsluta dina konversationer innan "
+"tiden l旦per ut.\n"
 "\n"
 "Efter underh奪llet 辰r slutf旦rt kommer du kunna ansluta till MSN som vanligt."
 msgstr[1] ""
-"MSN-servern kommer att st辰ngas av f旦r underh奪ll om %d minuter, d奪 kommer du automatiskt att loggas ut. Passa p奪 att avsluta dina konversationer innan tiden l旦per ut.\n"
+"MSN-servern kommer att st辰ngas av f旦r underh奪ll om %d minuter, d奪 kommer du "
+"automatiskt att loggas ut. Passa p奪 att avsluta dina konversationer innan "
+"tiden l旦per ut.\n"
 "\n"
 "Efter underh奪llet 辰r slutf旦rt kommer du kunna ansluta till MSN som vanligt."
 
-#: ../libgaim/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msn/servconn.c:135
 msgid "Writing error"
 msgstr "Skrivfel"
 
-#: ../libgaim/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msn/servconn.c:137
 msgid "Reading error"
 msgstr "L辰sfel"
 
-#: ../libgaim/protocols/msn/servconn.c:144
+#: ../libpurple/protocols/msn/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -9491,394 +6009,421 @@
 "Anslutningsfel fr奪n %s servern:\n"
 "%s"
 
-#: ../libgaim/protocols/msn/session.c:299
+#: ../libpurple/protocols/msn/session.c:299
 msgid "Our protocol is not supported by the server."
 msgstr "V奪rt protokoll st旦ds inte av servern."
 
-#: ../libgaim/protocols/msn/session.c:303
+#: ../libpurple/protocols/msn/session.c:303
 msgid "Error parsing HTTP."
 msgstr "Fel vid avkodning av HTTP."
 
-#: ../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/flap_connection.c:384
+#: ../libpurple/protocols/yahoo/yahoo.c:202
 msgid "You have signed on from another location."
 msgstr "Du har loggat in fr奪n en annan plats."
 
-#: ../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 "MSN-sernvern 辰r tempor辰rt otillg辰nglig. Var god  f旦rs旦k igen senare."
 
-#: ../libgaim/protocols/msn/session.c:315
+#: ../libpurple/protocols/msn/session.c:315
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN-servern g奪r ner tempor辰rt."
 
-#: ../libgaim/protocols/msn/session.c:319
+#: ../libpurple/protocols/msn/session.c:320
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Kan inte autentisera: %s"
 
-#: ../libgaim/protocols/msn/session.c:324
-msgid "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr "Din MSN-kompislista 辰r otillg辰nglig tempor辰rt. Var god  f旦rs旦k igen senare."
-
-#: ../libgaim/protocols/msn/session.c:345
-#: ../libgaim/protocols/msn/session.c:347
+#: ../libpurple/protocols/msn/session.c:325
+msgid ""
+"Your MSN buddy list is temporarily unavailable. Please wait and try again."
+msgstr ""
+"Din MSN-kompislista 辰r otillg辰nglig tempor辰rt. Var god  f旦rs旦k igen senare."
+
+#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:348
 msgid "Handshaking"
 msgstr "Handskakning"
 
-#: ../libgaim/protocols/msn/session.c:346
-msgid "Transferring"
-msgstr "�verf旦r"
-
-#: ../libgaim/protocols/msn/session.c:348
+#: ../libpurple/protocols/msn/session.c:349
 msgid "Starting authentication"
 msgstr "Starta autentisering"
 
-#: ../libgaim/protocols/msn/session.c:349
+#: ../libpurple/protocols/msn/session.c:350
 msgid "Getting cookie"
 msgstr "H辰mtar kaka"
 
-#: ../libgaim/protocols/msn/session.c:351
+#: ../libpurple/protocols/msn/session.c:352
 msgid "Sending cookie"
 msgstr "Skickar kaka"
 
-#: ../libgaim/protocols/msn/session.c:352
+#: ../libpurple/protocols/msn/session.c:353
 msgid "Retrieving buddy list"
 msgstr "Tar emot kompislista"
 
-#: ../libgaim/protocols/msn/state.c:34
+#: ../libpurple/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Inte vid datorn"
 
-#: ../libgaim/protocols/msn/state.c:35
+#: ../libpurple/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "Pratar i telefon"
 
-#: ../libgaim/protocols/msn/state.c:36
+#: ../libpurple/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "P奪 lunch"
 
-#: ../libgaim/protocols/msn/switchboard.c:400
+#: ../libpurple/protocols/msn/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Meddelandet kanske inte skickades eftersom v辰ntetiden tog slut:"
 
-#: ../libgaim/protocols/msn/switchboard.c:408
+#: ../libpurple/protocols/msn/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Meddelandet kunde inte skickas, inte till奪tet som osynlig:"
 
-#: ../libgaim/protocols/msn/switchboard.c:412
+#: ../libpurple/protocols/msn/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
 msgstr "Meddelandet kunde inte skickas eftersom anv辰ndaren 辰r fr奪nkopplad:"
 
-#: ../libgaim/protocols/msn/switchboard.c:416
+#: ../libpurple/protocols/msn/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Meddelandet kunde inte skickas eftersom ett anslutningsfel uppstod:"
 
-#: ../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 "Meddelandet kunde inte skickas eftersom skickade f旦r snabbt:"
 
-#: ../libgaim/protocols/msn/switchboard.c:424
-msgid "Message could not be sent because an error with the switchboard occurred:"
-msgstr "Meddelandet kunde inte skickas eftersom ett fel med v辰xlingsbordet uppstod:"
-
-#: ../libgaim/protocols/msn/switchboard.c:432
+#: ../libpurple/protocols/msn/switchboard.c:424
+msgid ""
+"Message could not be sent because we were unable to establish a session with "
+"the server. This is likely a server problem, try again in a few minutes:"
+msgstr ""
+"Meddelandet kunde inte skickas eftersom vi inte kunda skapa en anslutning "
+"till servern. Detta 辰r troligen ett serverfel, f旦rs旦k igen om n奪gra minuter:"
+
+#: ../libpurple/protocols/msn/switchboard.c:431
+msgid ""
+"Message could not be sent because an error with the switchboard occurred:"
+msgstr ""
+"Meddelandet kunde inte skickas eftersom ett fel med v辰xlingsbordet uppstod:"
+
+#: ../libpurple/protocols/msn/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "Meddelandet kunde kanske inte skickas p奪 grund av att ett ok辰nt fel uppstod:"
-
-#: ../libgaim/protocols/msn/switchboard.c:952
+msgstr ""
+"Meddelandet kunde kanske inte skickas p奪 grund av att ett ok辰nt fel uppstod:"
+
+#: ../libpurple/protocols/msn/switchboard.c:963
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s skickade just en vibb!"
 
-#: ../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 har lagt till dig till sin kompislista."
 
-#: ../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 har tagit bort dig fr奪n sin kontaktlista."
 
-#: ../libgaim/protocols/msn/userlist.c:641
+#: ../libpurple/protocols/msn/userlist.c:641
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Kunde inte l辰gga till \"%s\"."
 
-#: ../libgaim/protocols/msn/userlist.c:643
+#: ../libpurple/protocols/msn/userlist.c:643
 msgid "The screen name specified is invalid."
 msgstr "Det angivna sk辰rmnamnet 辰r felaktigt."
 
-#: ../libgaim/protocols/novell/nmuser.c:1879
+#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "N旦dv辰ndiga parametrar passade inte in"
 
-#: ../libgaim/protocols/novell/nmuser.c:1882
+#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Kan inte skriva till n辰tverk"
 
-#: ../libgaim/protocols/novell/nmuser.c:1885
+#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Kan inte l辰sa fr奪n n辰tverk"
 
-#: ../libgaim/protocols/novell/nmuser.c:1888
+#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Fel vid kommunikation med servern"
 
-#: ../libgaim/protocols/novell/nmuser.c:1892
+#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "Konferensen inte funnen"
 
-#: ../libgaim/protocols/novell/nmuser.c:1895
+#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "Konferensen finns inte"
 
-#: ../libgaim/protocols/novell/nmuser.c:1899
+#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "En katalog med det namnet finn redan"
 
-#: ../libgaim/protocols/novell/nmuser.c:1902
+#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "Ej st旦dd"
 
-#: ../libgaim/protocols/novell/nmuser.c:1906
+#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "L旦senord har g奪tt ut"
 
-#: ../libgaim/protocols/novell/nmuser.c:1909
+#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Felaktigt l旦senord"
 
-#: ../libgaim/protocols/novell/nmuser.c:1912
+#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "Anv辰ndaren hittades inte"
 
-#: ../libgaim/protocols/novell/nmuser.c:1915
+#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "Kontot har blivit avaktiverat"
 
-#: ../libgaim/protocols/novell/nmuser.c:1918
+#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "Servern kunde inte l辰sa katalogen"
 
-#: ../libgaim/protocols/novell/nmuser.c:1921
+#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "Din systemadministrat旦r har st辰ngt av denna operationen"
 
-#: ../libgaim/protocols/novell/nmuser.c:1924
+#: ../libpurple/protocols/novell/nmuser.c:1909
 msgid "The server is unavailable; try again later"
 msgstr "Servern g奪r inte att n奪; f旦rs旦k igen senare"
 
-#: ../libgaim/protocols/novell/nmuser.c:1927
+#: ../libpurple/protocols/novell/nmuser.c:1912
 msgid "Cannot add a contact to the same folder twice"
 msgstr "Kan inte l辰gga till en anv辰ndare till samma katalog tv奪 g奪nger"
 
-#: ../libgaim/protocols/novell/nmuser.c:1930
+#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "Kan inte l辰gga till dig sj辰lv"
 
-#: ../libgaim/protocols/novell/nmuser.c:1933
+#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Huvudarkiv 辰r felkonfigurerat"
 
-#: ../libgaim/protocols/novell/nmuser.c:1937
+#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "Felaktigt sk辰rmnamn eller l旦senord"
 
-#: ../libgaim/protocols/novell/nmuser.c:1940
+#: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
 msgstr "Kan inte k辰nna igen v辰rden f旦r sk辰rmnamnet du angav"
 
-#: ../libgaim/protocols/novell/nmuser.c:1943
-msgid "Your account has been disabled because too many incorrect passwords were entered"
-msgstr "Ditt konto har blivit avst辰ngt eftersom l旦senordet var felaktigt inskrivet f旦r m奪nga g奪nger"
-
-#: ../libgaim/protocols/novell/nmuser.c:1946
+#: ../libpurple/protocols/novell/nmuser.c:1928
+msgid ""
+"Your account has been disabled because too many incorrect passwords were "
+"entered"
+msgstr ""
+"Ditt konto har blivit avst辰ngt eftersom l旦senordet var felaktigt inskrivet "
+"f旦r m奪nga g奪nger"
+
+#: ../libpurple/protocols/novell/nmuser.c:1931
 msgid "You cannot add the same person twice to a conversation"
 msgstr "Du kan inte l辰gga till samma person flera g奪nger till en konversation"
 
-#: ../libgaim/protocols/novell/nmuser.c:1950
+#: ../libpurple/protocols/novell/nmuser.c:1935
 msgid "You have reached your limit for the number of contacts allowed"
 msgstr "Du har n奪tt din gr辰ns f旦r det antal kontakter som 辰r till奪tna"
 
-#: ../libgaim/protocols/novell/nmuser.c:1953
+#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "Du har uppgett ett felaktigt sk辰rmnamn"
 
-#: ../libgaim/protocols/novell/nmuser.c:1956
+#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "Ett fel uppstod n辰r katalogen uppdaterades"
 
-#: ../libgaim/protocols/novell/nmuser.c:1959
+#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Inkompatibel protokollversion"
 
-#: ../libgaim/protocols/novell/nmuser.c:1962
+#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "Anv辰ndaren har blockerat dig"
 
-#: ../libgaim/protocols/novell/nmuser.c:1965
-msgid "This evaluation version does not allow more than ten users to log in at one time"
-msgstr "Denna utv辰rderingsversion till奪ter inte mer 辰n tio anv辰ndare att vara inloggade samtidigt"
-
-#: ../libgaim/protocols/novell/nmuser.c:1968
+#: ../libpurple/protocols/novell/nmuser.c:1950
+msgid ""
+"This evaluation version does not allow more than ten users to log in at one "
+"time"
+msgstr ""
+"Denna utv辰rderingsversion till奪ter inte mer 辰n tio anv辰ndare att vara "
+"inloggade samtidigt"
+
+#: ../libpurple/protocols/novell/nmuser.c:1953
 msgid "The user is either offline or you are blocked"
 msgstr "Anv辰ndaren 辰r antingen fr奪nkopplad eller s奪 辰r du blockerad"
 
-#: ../libgaim/protocols/novell/nmuser.c:1971
+#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Ok辰nt fel: 0x%X"
 
-#: ../libgaim/protocols/novell/novell.c:124
+#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Inloggningen misslyckades (%s)."
 
-#: ../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 "Kan inte skicka meddelandet. Kunde inte h辰mta detaljer f旦r anv辰ndaren (%s)."
-
-#: ../libgaim/protocols/novell/novell.c:396
+msgstr ""
+"Kan inte skicka meddelandet. Kunde inte h辰mta detaljer f旦r anv辰ndaren (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:396
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
 msgstr "Kunde inte l辰gga till %s till din kompislista (%s)."
 
 #. 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 "Kan inte skicka meddelandet (%s)."
 
-#: ../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 "Kan itne bjuda in anv辰ndaren (%s)."
 
-#: ../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 "Kan inte skicka meddelandet till %s. Kunde inte skapa konferensen (%s)."
-
-#: ../libgaim/protocols/novell/novell.c:537
+msgstr ""
+"Kan inte skicka meddelandet till %s. Kunde inte skapa konferensen (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:537
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Kan inte skicka meddelandet. Kunde inte skapa konferensen (%s)."
 
-#: ../libgaim/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 "Kunde inte flytta anv辰ndare %s till mappen %s p奪 serverns lista. Fel uppstod vid skapandet av mapp (%s)."
-
-#: ../libgaim/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 "Kunde inte l辰gga till %s till din kompislista. Fel vid skapandet av mapp p奪 serverlistan (%s)."
-
-#: ../libgaim/protocols/novell/novell.c:705
+#: ../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 ""
+"Kunde inte flytta anv辰ndare %s till mappen %s p奪 serverns lista. Fel uppstod "
+"vid skapandet av mapp (%s)."
+
+#: ../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 ""
+"Kunde inte l辰gga till %s till din kompislista. Fel vid skapandet av mapp p奪 "
+"serverlistan (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:705
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Kan inte h辰mta detaljer om anv辰ndaren %s (%s)."
 
-#: ../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 "Kan inte l辰gga till anv辰ndare p奪 avsk辰rmningslista (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:798
+#: ../libpurple/protocols/novell/novell.c:798
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Kunde inte l辰gga till %s till din sp辰rrlista (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:851
+#: ../libpurple/protocols/novell/novell.c:851
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Kunde inte l辰gga till %s till din till奪telse-lista (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:919
+#: ../libpurple/protocols/novell/novell.c:919
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Kunde inte ta bort %s fr奪n din privacy lista (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:942
-#: ../libgaim/protocols/novell/novell.c:1650
+#: ../libpurple/protocols/novell/novell.c:942
+#: ../libpurple/protocols/novell/novell.c:1647
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Kunde inte 辰ndra serverns avsk辰rmningsinst辰llningar (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:1012
+#: ../libpurple/protocols/novell/novell.c:1012
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Kunde inte skapa konferens (%s)."
 
-#: ../libgaim/protocols/novell/novell.c:1121
-#: ../libgaim/protocols/novell/novell.c:1695
+#: ../libpurple/protocols/novell/novell.c:1121
+#: ../libpurple/protocols/novell/novell.c:1692
 msgid "Error communicating with server. Closing connection."
 msgstr "Fel vid kommunikation med servern. St辰nger uppkopplingen."
 
-#: ../libgaim/protocols/novell/novell.c:1476
+#: ../libpurple/protocols/novell/novell.c:1476
 msgid "Telephone Number"
 msgstr "Telefonnummer"
 
-#: ../libgaim/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Personal Title"
 msgstr "Personlig titel"
 
-#: ../libgaim/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/novell/novell.c:1486
 msgid "Mailstop"
 msgstr "Brevstopp"
 
-#: ../libgaim/protocols/novell/novell.c:1505
-#: ../libgaim/protocols/sametime/sametime.c:4131
+#: ../libpurple/protocols/novell/novell.c:1502
+#: ../libpurple/protocols/sametime/sametime.c:4123
 msgid "User ID"
 msgstr "Anv辰ndarID"
 
 #. 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:1515
 msgid "Full name"
 msgstr "Fullst辰ndigt namn"
 
-#: ../libgaim/protocols/novell/novell.c:1640
+#: ../libpurple/protocols/novell/novell.c:1637
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise konferens %d"
 
-#: ../libgaim/protocols/novell/novell.c:1671
+#: ../libpurple/protocols/novell/novell.c:1668
 msgid "Unable to make SSL connection to server."
 msgstr "Kan inte skapa SSL anslutning till servern."
 
-#: ../libgaim/protocols/novell/novell.c:1723
+#: ../libpurple/protocols/novell/novell.c:1720
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
-#: ../libgaim/protocols/novell/novell.c:1735
+#: ../libpurple/protocols/novell/novell.c:1732
 msgid "Unable to connect to server."
 msgstr "Kan inte ansluta till servern."
 
-#: ../libgaim/protocols/novell/novell.c:1738
+#: ../libpurple/protocols/novell/novell.c:1735
 msgid "Waiting for response..."
 msgstr "V辰ntar p奪 svar..."
 
-#: ../libgaim/protocols/novell/novell.c:1873
+#: ../libpurple/protocols/novell/novell.c:1870
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s har blivit inbjuden till denna konversation."
 
-#: ../libgaim/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1898
 msgid "Invitation to Conversation"
 msgstr "Inbjudan till konversation"
 
-#: ../libgaim/protocols/novell/novell.c:1902
+#: ../libpurple/protocols/novell/novell.c:1899
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -9889,33 +6434,38 @@
 "\n"
 "Skickad: %s"
 
-#: ../libgaim/protocols/novell/novell.c:1904
+#: ../libpurple/protocols/novell/novell.c:1901
 msgid "Would you like to join the conversation?"
 msgstr "Vill du g奪r med i konversationen?"
 
 #. we don't want to reconnect in this case
-#: ../libgaim/protocols/novell/novell.c:2013
+#: ../libpurple/protocols/novell/novell.c:2012
 msgid "You have been logged out because you logged in at another workstation."
 msgstr "Du har blivit utloggad eftersom du loggat in fr奪n en annan dator."
 
-#: ../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:2069
+#, c-format
+msgid ""
+"%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s verkar vara fr奪nkopplad och fick inte meddelandet du just skickade."
 
 #. 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
-msgid "Unable to connect to server. Please enter the address of the server you wish to connect to."
-msgstr "Kunde inte ansluta till servern. Var god ange serveradressen som du vill ansluta till."
-
-#: ../libgaim/protocols/novell/novell.c:2196
+#: ../libpurple/protocols/novell/novell.c:2167
+msgid ""
+"Unable to connect to server. Please enter the address of the server you wish "
+"to connect to."
+msgstr ""
+"Kunde inte ansluta till servern. Var god ange serveradressen som du vill "
+"ansluta till."
+
+#: ../libpurple/protocols/novell/novell.c:2195
 msgid "Error. SSL support is not installed."
 msgstr "Fel. SSL-st旦d 辰r inte installerat."
 
-#: ../libgaim/protocols/novell/novell.c:2505
+#: ../libpurple/protocols/novell/novell.c:2504
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Denna konferens har st辰ngts. Inga fler meddelande kan bli skickade."
 
@@ -9929,39 +6479,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/novell/novell.c:3548
-#: ../libgaim/protocols/novell/novell.c:3550
+#: ../libpurple/protocols/novell/novell.c:3518
+#: ../libpurple/protocols/novell/novell.c:3520
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protokoll-insticksmodul"
 
-#: ../libgaim/protocols/novell/novell.c:3569
+#: ../libpurple/protocols/novell/novell.c:3545
 msgid "Server address"
 msgstr "Serveradress"
 
-#: ../libgaim/protocols/novell/novell.c:3573
+#: ../libpurple/protocols/novell/novell.c:3549
 msgid "Server port"
 msgstr "Serverport"
 
-#: ../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:387
+#: ../libpurple/protocols/yahoo/yahoo.c:2292
+#: ../libpurple/protocols/yahoo/yahoo.c:2459
+#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:580
+#: ../libpurple/proxy.c:1099 ../libpurple/proxy.c:1208
+#: ../libpurple/proxy.c:1308 ../libpurple/proxy.c:1436
 msgid "Server closed the connection."
 msgstr "Servern st辰ngde konversationen."
 
-#: ../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:389
+#: ../libpurple/protocols/yahoo/yahoo.c:2286
+#: ../libpurple/protocols/yahoo/yahoo.c:2453 ../libpurple/proxy.c:592
+#: ../libpurple/proxy.c:1111 ../libpurple/proxy.c:1220
+#: ../libpurple/proxy.c:1320 ../libpurple/proxy.c:1448
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -9970,281 +6514,339 @@
 "Tappade anslutningen med servern:\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:392
+#: ../libpurple/proxy.c:1128 ../libpurple/proxy.c:1233
+#: ../libpurple/proxy.c:1332 ../libpurple/proxy.c:1404
+#: ../libpurple/proxy.c:1461
 msgid "Received invalid data on connection with server."
 msgstr "Tog emot felaktig data vid anslutning till server."
 
-#: ../libgaim/protocols/oscar/flap_connection.c:386
-#, c-format
-msgid ""
-"Could not establish a connection with the server:\n"
-"%s"
-msgstr ""
-"Kunde inte skapa en anslutning med servern:\n"
-"%s"
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/oscar/libaim.c:118
+#: ../libpurple/protocols/oscar/libaim.c:120
+msgid "AIM Protocol Plugin"
+msgstr "Insticksmodul f旦r AIM-protokoll"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/oscar/libicq.c:118
+#: ../libpurple/protocols/oscar/libicq.c:120
+msgid "ICQ Protocol Plugin"
+msgstr "Insticksmodul f旦r ICQ-protokoll"
+
+#: ../libpurple/protocols/oscar/libicq.c:147
+#: ../libpurple/protocols/yahoo/yahoo.c:4111
+#: ../libpurple/protocols/zephyr/zephyr.c:2997
+msgid "Encoding"
+msgstr "Kodning"
 
 # Os辰ker (And weeei!)
-#: ../libgaim/protocols/oscar/odc.c:40
+#: ../libpurple/protocols/oscar/odc.c:40
 msgid "The remote user has closed the connection."
 msgstr "Anv辰ndaren har st辰ngt anslutningen."
 
-#: ../libgaim/protocols/oscar/odc.c:42
+#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has declined your request."
 msgstr "Anv辰ndaren har nekat din f旦rfr奪gan."
 
-#: ../libgaim/protocols/oscar/odc.c:44
+#: ../libpurple/protocols/oscar/odc.c:44
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Tappade anslutningen till anv辰ndaren: <br>%s"
 
-#: ../libgaim/protocols/oscar/odc.c:47
+#: ../libpurple/protocols/oscar/odc.c:47
 msgid "Received invalid data on connection with remote user."
 msgstr "Tog emot felaktig data 旦ver anslutningen till anv辰ndaren."
 
-#: ../libgaim/protocols/oscar/odc.c:49
+#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Could not establish a connection with the remote user."
 msgstr "Kunde inte skapa en anslutning till anv辰ndaren."
 
-#: ../libgaim/protocols/oscar/odc.c:560
+#: ../libpurple/protocols/oscar/odc.c:560
 msgid "Direct IM established"
 msgstr "Direktmeddelande har etablerats"
 
-#: ../libgaim/protocols/oscar/oft.c:520
+#: ../libpurple/protocols/oscar/oft.c:657
 #, c-format
 msgid "File %s is %s, which is larger than the maximum size of %s."
 msgstr "Filen %s 辰r %s vilket 辰r st旦rre 辰n den maximala storleken p奪 %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:114
+#: ../libpurple/protocols/oscar/oscar.c:115
 msgid "Invalid error"
 msgstr "Ogiltigt fel"
 
-#: ../libgaim/protocols/oscar/oscar.c:115
+#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid SNAC"
 msgstr "Ogiltig SNAC"
 
-#: ../libgaim/protocols/oscar/oscar.c:116
+#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Rate to host"
 msgstr "Hastighet till v辰rd"
 
-#: ../libgaim/protocols/oscar/oscar.c:117
+#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to client"
 msgstr "Hastighet till klient"
 
-#: ../libgaim/protocols/oscar/oscar.c:119
+#: ../libpurple/protocols/oscar/oscar.c:120
 msgid "Service unavailable"
 msgstr "Tj辰nsten 辰r otillg辰nglig"
 
-#: ../libgaim/protocols/oscar/oscar.c:120
+#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service not defined"
 msgstr "Tj辰nst ej definierad"
 
-#: ../libgaim/protocols/oscar/oscar.c:121
+#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Obsolete SNAC"
 msgstr "Obsolet SNAC"
 
-#: ../libgaim/protocols/oscar/oscar.c:122
+#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Not supported by host"
 msgstr "Ej st旦dd av v辰rd"
 
-#: ../libgaim/protocols/oscar/oscar.c:123
+#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by client"
 msgstr "Ej st旦dd av klient"
 
-#: ../libgaim/protocols/oscar/oscar.c:124
+#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Refused by client"
 msgstr "V辰grad av klient"
 
-#: ../libgaim/protocols/oscar/oscar.c:125
+#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Reply too big"
 msgstr "Svar f旦rstort"
 
-#: ../libgaim/protocols/oscar/oscar.c:126
+#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Responses lost"
 msgstr "Svar f旦rlorade"
 
-#: ../libgaim/protocols/oscar/oscar.c:127
+#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Request denied"
 msgstr "Beg辰ran nekad"
 
-#: ../libgaim/protocols/oscar/oscar.c:128
+#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Busted SNAC payload"
 msgstr "Spr辰ckt SNAC-last"
 
-#: ../libgaim/protocols/oscar/oscar.c:129
+#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Insufficient rights"
 msgstr "Otillr辰ckliga r辰ttigheter"
 
-#: ../libgaim/protocols/oscar/oscar.c:130
+#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "In local permit/deny"
 msgstr "I lokal till奪t/neka"
 
-#: ../libgaim/protocols/oscar/oscar.c:131
+#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "Too evil (sender)"
 msgstr "F旦r onskefull (avs辰ndare)"
 
-#: ../libgaim/protocols/oscar/oscar.c:132
+#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (receiver)"
 msgstr "F旦r onskefull (mottagare)"
 
-#: ../libgaim/protocols/oscar/oscar.c:133
+#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "User temporarily unavailable"
 msgstr "Anv辰ndare 辰r tillf辰lligt o奪tkommlig"
 
-#: ../libgaim/protocols/oscar/oscar.c:134
+#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "No match"
 msgstr "Ingen tr辰ff"
 
-#: ../libgaim/protocols/oscar/oscar.c:135
+#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "List overflow"
 msgstr "List旦verfl旦de"
 
-#: ../libgaim/protocols/oscar/oscar.c:136
+#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "Request ambiguous"
 msgstr "Beg辰ran tvetydig"
 
-#: ../libgaim/protocols/oscar/oscar.c:137
+#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Queue full"
 msgstr "K旦 full"
 
-#: ../libgaim/protocols/oscar/oscar.c:138
+#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Not while on AOL"
 msgstr "Inte p奪 AOL"
 
-#: ../libgaim/protocols/oscar/oscar.c:327
-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 encoding he is using, you can specify it in the advanced account options for your AIM/ICQ account.)"
-msgstr "(Det uppstod ett fel vid mottagandet av detta meddelandet. Kompisen du pratar med anv辰nder antagligen en annan teckenkod 辰n den f旦rv辰ntade. Om du vet vilken teckenkod han anv辰nder kan du specificera den bland de avancerade inst辰llningarna f旦r ditt AIM/ICQ-konto.)"
-
-#: ../libgaim/protocols/oscar/oscar.c:436
-#, 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 "(Det uppstod ett fel vid mottagningen av detta meddelande. Antingen har du och %s olika teckenkodningar valda eller s奪 har %s en buggig klient.)"
-
-#: ../libgaim/protocols/oscar/oscar.c:621
+#: ../libpurple/protocols/oscar/oscar.c:348
+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 "
+"encoding he is using, you can specify it in the advanced account options for "
+"your AIM/ICQ account.)"
+msgstr ""
+"(Det uppstod ett fel vid mottagandet av detta meddelandet. Kompisen du "
+"pratar med anv辰nder antagligen en annan teckenkod 辰n den f旦rv辰ntade. Om du "
+"vet vilken teckenkod han anv辰nder kan du specificera den bland de avancerade "
+"inst辰llningarna f旦r ditt AIM/ICQ-konto.)"
+
+#: ../libpurple/protocols/oscar/oscar.c:457
+#, 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 ""
+"(Det uppstod ett fel vid mottagningen av detta meddelande. Antingen har du "
+"och %s olika teckenkodningar valda eller s奪 har %s en buggig klient.)"
+
+#. Label
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2359
+#: ../pidgin/gtkutils.c:2389
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:334
+msgid "Buddy Icon"
+msgstr "Kompisikon"
+
+#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "R旦st"
 
-#: ../libgaim/protocols/oscar/oscar.c:624
+#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "AIM-direktmeddelande"
 
-#: ../libgaim/protocols/oscar/oscar.c:627
-#: ../libgaim/protocols/silc/silc.c:693
-#: ../libgaim/protocols/silc/util.c:551
+#: ../libpurple/protocols/oscar/oscar.c:648
+#: ../libpurple/protocols/silc/silc.c:768
+#: ../libpurple/protocols/silc/util.c:553
+#: ../libpurple/protocols/silc10/silc.c:679
+#: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Chatta"
 
-#: ../libgaim/protocols/oscar/oscar.c:630
-#: ../libgaim/protocols/oscar/oscar.c:5959
+#: ../libpurple/protocols/oscar/oscar.c:651
+#: ../libpurple/protocols/oscar/oscar.c:5989
 msgid "Get File"
 msgstr "H辰mta fil"
 
-#: ../libgaim/protocols/oscar/oscar.c:637
+#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "Spel"
 
-#: ../libgaim/protocols/oscar/oscar.c:640
+#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "L辰gg till"
 
-#: ../libgaim/protocols/oscar/oscar.c:643
+#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "Skicka kompislista"
 
-#: ../libgaim/protocols/oscar/oscar.c:646
+#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "ICQ-direktanslutning"
 
-#: ../libgaim/protocols/oscar/oscar.c:649
+#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "AP-anv辰ndare"
 
-#: ../libgaim/protocols/oscar/oscar.c:652
+#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "ICQ-RTF"
 
-#: ../libgaim/protocols/oscar/oscar.c:655
+#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libgaim/protocols/oscar/oscar.c:658
+#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr "ICQ-serverrelay"
 
-#: ../libgaim/protocols/oscar/oscar.c:661
+#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr "Gamla ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:664
+#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
 msgstr "Trillansk kryptering"
 
-#: ../libgaim/protocols/oscar/oscar.c:667
+#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libgaim/protocols/oscar/oscar.c:670
+#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libgaim/protocols/oscar/oscar.c:673
+#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr "S辰kerhet aktiverad"
 
-#: ../libgaim/protocols/oscar/oscar.c:676
+#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "Videochatt"
 
-#: ../libgaim/protocols/oscar/oscar.c:680
+#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libgaim/protocols/oscar/oscar.c:683
+#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "Live-video"
 
-#: ../libgaim/protocols/oscar/oscar.c:686
+#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../libgaim/protocols/oscar/oscar.c:704
-#: ../libgaim/protocols/oscar/oscar.c:5735
+#: ../libpurple/protocols/oscar/oscar.c:725
+#: ../libpurple/protocols/oscar/oscar.c:5759
 msgid "Free For Chat"
 msgstr "Tillg辰nglig f旦r chatt"
 
-#: ../libgaim/protocols/oscar/oscar.c:708
-#: ../libgaim/protocols/oscar/oscar.c:5767
+#: ../libpurple/protocols/oscar/oscar.c:729
+#: ../libpurple/protocols/oscar/oscar.c:5794
 msgid "Not Available"
 msgstr "Ej tillg辰nglig"
 
-#: ../libgaim/protocols/oscar/oscar.c:710
-#: ../libgaim/protocols/oscar/oscar.c:5753
+#: ../libpurple/protocols/oscar/oscar.c:731
+#: ../libpurple/protocols/oscar/oscar.c:5780
 msgid "Occupied"
 msgstr "Upptagen"
 
-#: ../libgaim/protocols/oscar/oscar.c:714
+#: ../libpurple/protocols/oscar/oscar.c:735
 msgid "Web Aware"
 msgstr "Webbmedveten"
 
-#: ../libgaim/protocols/oscar/oscar.c:718
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
+#: ../libpurple/protocols/yahoo/yahoo.c:2913 ../libpurple/status.c:156
+#: ../pidgin/gtkdocklet.c:446 ../pidgin/gtkstatusbox.c:1058
+msgid "Invisible"
+msgstr "Osynlig"
+
+#: ../libpurple/protocols/oscar/oscar.c:739
 msgid "Online"
 msgstr "Ansluten"
 
-#: ../libgaim/protocols/oscar/oscar.c:824
-#: ../libgaim/protocols/oscar/oscar.c:2852
+#: ../libpurple/protocols/oscar/oscar.c:838
+#: ../libpurple/protocols/oscar/oscar.c:3716
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1121
+msgid "IP Address"
+msgstr "IP-adress"
+
+#: ../libpurple/protocols/oscar/oscar.c:845
+#: ../libpurple/protocols/oscar/oscar.c:2863
 msgid "Warning Level"
 msgstr "Varningsniv奪er"
 
-#: ../libgaim/protocols/oscar/oscar.c:834
+#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "Kompiskommentar"
 
 # Os辰ker!!!
-#: ../libgaim/protocols/oscar/oscar.c:974
+#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
@@ -10253,7 +6855,7 @@
 "Kunde inte ansluta till identifieringsserver:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:982
+#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -10262,146 +6864,176 @@
 "Kunde inte ansluta till BOS-server:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:1022
+#: ../libpurple/protocols/oscar/oscar.c:1043
 msgid "Screen name sent"
 msgstr "Anv辰ndar-ID skickat"
 
-#: ../libgaim/protocols/oscar/oscar.c:1027
+#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr "Anslutning etablerad, kaka skickad"
 
 #. TODO: Don't call this with ssi
-#: ../libgaim/protocols/oscar/oscar.c:1056
+#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr "Avsluta anslutning"
 
-#: ../libgaim/protocols/oscar/oscar.c:1240
-#, c-format
-msgid "Unable to login: Could not sign on as %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr "Kan inte logga in eftersom anv辰ndar-IDt %s 辰r ogiltigt. Anv辰ndar-IDt kan endast best奪 av en bokstav f旦ljt av bokst辰ver eller siffror eller bara inneh奪lla siffror<."
-
-#: ../libgaim/protocols/oscar/oscar.c:1325
-#: ../libgaim/protocols/yahoo/yahoo.c:1900
+#: ../libpurple/protocols/oscar/oscar.c:1261
+#, c-format
+msgid ""
+"Unable to login: Could not sign on as %s because the screen name is "
+"invalid.  Screen names must be a valid email address, or start with a letter "
+"and contain only letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"Kan inte logga in: Kunde inte ansluta som %s eftersom anv辰ndarnamnet 辰r "
+"ogiltigt.  Sk辰rmnamnet m奪ste vara en epostadress, eller starta med en "
+"bokstav och endast inneh奪lla bokst辰ver, nummer och mellanslag, eller enbart "
+"inneh奪lla nummer."
+
+#: ../libpurple/protocols/oscar/oscar.c:1346
+#: ../libpurple/protocols/yahoo/yahoo.c:1934
 msgid "Invalid screen name."
 msgstr "Ogiltigt Sk辰rmnamn"
 
-#: ../libgaim/protocols/oscar/oscar.c:1332
-#: ../libgaim/protocols/qq/login_logout.c:481
-#: ../libgaim/protocols/simple/simple.c:1035
-#: ../libgaim/protocols/yahoo/yahoo.c:1923
+#: ../libpurple/protocols/oscar/oscar.c:1353
+#: ../libpurple/protocols/qq/login_logout.c:483
+#: ../libpurple/protocols/simple/simple.c:1039
+#: ../libpurple/protocols/yahoo/yahoo.c:1952
 msgid "Incorrect password."
 msgstr "Felaktigt l旦senord."
 
-#: ../libgaim/protocols/oscar/oscar.c:1337
+#: ../libpurple/protocols/oscar/oscar.c:1358
 msgid "Your account is currently suspended."
 msgstr "Ditt konto 辰r avst辰ngt f旦r tillf辰llet."
 
 #. service temporarily unavailable
-#: ../libgaim/protocols/oscar/oscar.c:1341
+#: ../libpurple/protocols/oscar/oscar.c:1362
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Tj辰nsten 辰r tillf辰lligt on奪bar."
 
-#: ../libgaim/protocols/oscar/oscar.c:1346
-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 "Du har anslutit och kopplat ifr奪n f旦r m奪nga g奪nger. V辰nta tio minuter och prova igen. Om du forts辰tter att f旦rs旦ka kommer du att f奪 v辰nta 辰nnu l辰ngre."
-
-#: ../libgaim/protocols/oscar/oscar.c:1351
+#: ../libpurple/protocols/oscar/oscar.c:1367
+#: ../libpurple/protocols/oscar/oscar.c:1378
+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 ""
+"Du har anslutit och kopplat ifr奪n f旦r m奪nga g奪nger. V辰nta tio minuter och "
+"prova igen. Om du forts辰tter att f旦rs旦ka kommer du att f奪 v辰nta 辰nnu l辰ngre."
+
+#: ../libpurple/protocols/oscar/oscar.c:1372
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Versionen av klienten du anv辰nder 辰r f旦r gammal. Uppgradera p奪 %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:1386
+#: ../libpurple/protocols/oscar/oscar.c:1411
 msgid "Could Not Connect"
 msgstr "Kunde inte ansluta"
 
-#: ../libgaim/protocols/oscar/oscar.c:1391
+#: ../libpurple/protocols/oscar/oscar.c:1415
 msgid "Received authorization"
 msgstr "Mottog auktorisering"
 
-#: ../libgaim/protocols/oscar/oscar.c:1414
+#: ../libpurple/protocols/oscar/oscar.c:1437
 msgid "The SecurID key entered is invalid."
 msgstr "SecurID-nyckeln som 辰r angiven 辰r ogiltig."
 
-#: ../libgaim/protocols/oscar/oscar.c:1428
+#: ../libpurple/protocols/oscar/oscar.c:1450
 msgid "Enter SecurID"
 msgstr "Ange SecurID"
 
-#: ../libgaim/protocols/oscar/oscar.c:1429
+#: ../libpurple/protocols/oscar/oscar.c:1451
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Sl奪 in de 6 siffrorna fr奪n den digitala sk辰rmen."
 
-#: ../libgaim/protocols/oscar/oscar.c:1469
-#: ../libgaim/protocols/oscar/oscar.c:1512
-#, c-format
-msgid "You may be disconnected shortly.  You may want to use TOC until this is fixed.  Check %s for updates."
-msgstr "Du kanske snart blir fr奪nkopplad, du kanske ska anv辰nda TOC tills detta 辰r fixat. Kolla p奪 %s efter uppdateringar."
-
-#: ../libgaim/protocols/oscar/oscar.c:1472
-#: ../libgaim/protocols/oscar/oscar.c:1515
-msgid "Gaim was unable to get a valid AIM login hash."
-msgstr "Gaim kunde inte h辰mta en giltig AIM-inloggnings-hash."
-
-#: ../libgaim/protocols/oscar/oscar.c:1601
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#.
+#: ../libpurple/protocols/oscar/oscar.c:1453
+#: ../libpurple/protocols/oscar/oscar.c:2246
+#: ../libpurple/protocols/oscar/oscar.c:2293
+#: ../libpurple/protocols/oscar/oscar.c:5864
+#: ../libpurple/protocols/oscar/oscar.c:6145 ../libpurple/request.h:1387
+msgid "_OK"
+msgstr "_OK"
+
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
+#, c-format
+msgid ""
+"You may be disconnected shortly.  You may want to use TOC until this is "
+"fixed.  Check %s for updates."
+msgstr ""
+"Du kanske snart blir fr奪nkopplad, du kanske ska anv辰nda TOC tills detta 辰r "
+"fixat. Kolla p奪 %s efter uppdateringar."
+
+#: ../libpurple/protocols/oscar/oscar.c:1495
+#: ../libpurple/protocols/oscar/oscar.c:1538
+msgid "Unable to get a valid AIM login hash."
+msgstr "Kunde inte h辰mta en giltig AIM-inloggnings-hash."
+
+#: ../libpurple/protocols/oscar/oscar.c:1623
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Du kanske snart blir fr奪nkopplad. Kolla p奪 %s efter uppdateringar."
 
-#: ../libgaim/protocols/oscar/oscar.c:1604
-msgid "Gaim was unable to get a valid login hash."
-msgstr "Gaim kunde inte h辰mta en giltig login-hash."
-
-#: ../libgaim/protocols/oscar/oscar.c:1630
+#: ../libpurple/protocols/oscar/oscar.c:1626
+msgid "Unable to get a valid login hash."
+msgstr "Kunde inte h辰mta en giltig login-hash."
+
+#: ../libpurple/protocols/oscar/oscar.c:1655
 msgid "Password sent"
 msgstr "L旦senord skickat"
 
-#: ../libgaim/protocols/oscar/oscar.c:1686
+#: ../libpurple/protocols/oscar/oscar.c:1711
 msgid "Unable to initialize connection"
 msgstr "Kan inte skapa anslutning"
 
-#: ../libgaim/protocols/oscar/oscar.c:2203
+#: ../libpurple/protocols/oscar/oscar.c:2216
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Anv辰ndaren vill l辰gga till dig i dennes kompislista."
 
-#: ../libgaim/protocols/oscar/oscar.c:2231
+#: ../libpurple/protocols/oscar/oscar.c:2244
 msgid "Authorization Request Message:"
 msgstr "Meddelande om auktoriseringsbeg辰ran:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2232
+#: ../libpurple/protocols/oscar/oscar.c:2245
 msgid "Please authorize me!"
 msgstr "Sn辰lla auktorisera mig!"
 
-#: ../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:2285
+#: ../libpurple/protocols/oscar/oscar.c:2292
+#: ../libpurple/protocols/oscar/oscar.c:2419
+#: ../libpurple/protocols/oscar/oscar.c:5242
+#: ../libpurple/protocols/yahoo/yahoo.c:987
 msgid "No reason given."
 msgstr "Ingen motivering angiven."
 
-#: ../libgaim/protocols/oscar/oscar.c:2277
+#: ../libpurple/protocols/oscar/oscar.c:2291
 msgid "Authorization Denied Message:"
 msgstr "Meddelande om auktorisering nekad:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2404
-#, c-format
-msgid ""
-"The user %u has denied your request to add them to your buddy list for the following reason:\n"
+#: ../libpurple/protocols/oscar/oscar.c:2419
+#, c-format
+msgid ""
+"The user %u has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
-"Anv辰ndaren %u har nekat dig att l辰gga till honom/henne i din kompislista av f旦ljande orsak:\n"
+"Anv辰ndaren %u har nekat dig att l辰gga till honom/henne i din kompislista av "
+"f旦ljande orsak:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2405
+#: ../libpurple/protocols/oscar/oscar.c:2420
 msgid "ICQ authorization denied."
 msgstr "ICQ-auktorisering nekades."
 
 #. Someone has granted you authorization
-#: ../libgaim/protocols/oscar/oscar.c:2412
+#: ../libpurple/protocols/oscar/oscar.c:2427
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
-msgstr "Anv辰ndaren %u har till奪tit dig att l辰gga till honom/henne i din kompislista."
-
-#: ../libgaim/protocols/oscar/oscar.c:2420
+msgstr ""
+"Anv辰ndaren %u har till奪tit dig att l辰gga till honom/henne i din kompislista."
+
+#: ../libpurple/protocols/oscar/oscar.c:2435
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -10414,7 +7046,7 @@
 "Fr奪n: %s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2428
+#: ../libpurple/protocols/oscar/oscar.c:2443
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -10427,7 +7059,7 @@
 "Fr奪n: %s [%s]\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2436
+#: ../libpurple/protocols/oscar/oscar.c:2451
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -10440,951 +7072,1045 @@
 "Meddelandet 辰r:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2457
+#: ../libpurple/protocols/oscar/oscar.c:2472
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ-anv辰ndaren %u har skickat dig en kompis:  %s (%s)"
 
-#: ../libgaim/protocols/oscar/oscar.c:2463
+#: ../libpurple/protocols/oscar/oscar.c:2478
 msgid "Do you want to add this buddy to your buddy list?"
 msgstr "Vill du l辰gga till den h辰r kompisen till din kompislista?"
 
-#: ../libgaim/protocols/oscar/oscar.c:2467
+#: ../libpurple/protocols/oscar/oscar.c:2483 ../pidgin/gtkroomlist.c:308
+msgid "_Add"
+msgstr "_L辰gg till"
+
+#: ../libpurple/protocols/oscar/oscar.c:2484
 msgid "_Decline"
 msgstr "_Neka"
 
-#: ../libgaim/protocols/oscar/oscar.c:2551
+#: ../libpurple/protocols/oscar/oscar.c:2568
 #, 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] "Du har missat %hu meddelande fr奪n %s eftersom det var ogiltigt."
 msgstr[1] "Du har missat %hu meddelanden fr奪n %s eftersom de var ogiltiga."
 
-#: ../libgaim/protocols/oscar/oscar.c:2560
+#: ../libpurple/protocols/oscar/oscar.c:2577
 #, 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] "Du missade %hu meddelande fr奪n %s eftersom det var f旦r stort."
 msgstr[1] "Du missade %hu meddelanden fr奪n %s eftersom de var f旦r stora."
 
-#: ../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."
-msgstr[0] "Du missade %hu meddelande fr奪n %s eftersom frekvensgr辰nsen har 旦verskridits."
-msgstr[1] "Du missade %hu meddelanden fr奪n %s eftersom frekvensgr辰nsen har 旦verskridits."
-
-#: ../libgaim/protocols/oscar/oscar.c:2578
+#: ../libpurple/protocols/oscar/oscar.c:2586
+#, 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] ""
+"Du missade %hu meddelande fr奪n %s eftersom frekvensgr辰nsen har 旦verskridits."
+msgstr[1] ""
+"Du missade %hu meddelanden fr奪n %s eftersom frekvensgr辰nsen har 旦verskridits."
+
+#: ../libpurple/protocols/oscar/oscar.c:2595
 #, 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] "Du missade %hu meddelande fr奪n %s eftersom hon/han var f旦r onskefull."
-msgstr[1] "Du missade %hu meddelanden fr奪n %s eftersom hon/han var f旦r onskefull."
-
-#: ../libgaim/protocols/oscar/oscar.c:2587
+msgstr[0] ""
+"Du missade %hu meddelande fr奪n %s eftersom hon/han var f旦r onskefull."
+msgstr[1] ""
+"Du missade %hu meddelanden fr奪n %s eftersom hon/han var f旦r onskefull."
+
+#: ../libpurple/protocols/oscar/oscar.c:2604
 #, 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] "Du missade %hu meddelande fr奪n %s eftersom du 辰r f旦r onskefull."
 msgstr[1] "Du missade %hu meddelanden fr奪n %s eftersom du 辰r f旦r onskefull."
 
-#: ../libgaim/protocols/oscar/oscar.c:2596
+#: ../libpurple/protocols/oscar/oscar.c:2613
 #, 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] "Du missade %hu meddelande fr奪n %s av ok辰nda orsaker."
 msgstr[1] "Du missade %hu meddelanden fr奪n %s av ok辰nda orsaker."
 
-#: ../libgaim/protocols/oscar/oscar.c:2718
-#, c-format
-msgid "SNAC threw error: %s\n"
-msgstr "SNAC gav fel: %s\n"
-
 #. Data is assumed to be the destination sn
-#: ../libgaim/protocols/oscar/oscar.c:2758
+#: ../libpurple/protocols/oscar/oscar.c:2768
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kan inte skicka meddelande: %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:2768
+#: ../libpurple/protocols/oscar/oscar.c:2773
+#: ../libpurple/protocols/oscar/oscar.c:2837
 msgid "Unknown reason."
 msgstr "Ok辰nd anledning."
 
-#: ../libgaim/protocols/oscar/oscar.c:2761
-#: ../libgaim/protocols/sametime/sametime.c:2398
+#: ../libpurple/protocols/oscar/oscar.c:2771
+#: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kan inte skicka meddelandet till %s:"
 
-#: ../libgaim/protocols/oscar/oscar.c:2825
+#: ../libpurple/protocols/oscar/oscar.c:2837
 #, c-format
 msgid "User information not available: %s"
 msgstr "Anv辰ndarinformation 辰r inte tillg辰nglig: %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:2828
-#, c-format
-msgid "User information for %s unavailable:"
-msgstr "Anv辰ndarinformation om %s 辰r inte tillg辰nglig:"
-
-#: ../libgaim/protocols/oscar/oscar.c:2857
+#: ../libpurple/protocols/oscar/oscar.c:2868
 msgid "Online Since"
 msgstr "Ansluten sedan"
 
-#: ../libgaim/protocols/oscar/oscar.c:2862
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1161
+#: ../libpurple/protocols/oscar/oscar.c:2873
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Medlem sedan"
 
-#: ../libgaim/protocols/oscar/oscar.c:2867
+#: ../libpurple/protocols/oscar/oscar.c:2878
 msgid "Capabilities"
 msgstr "St旦djer"
 
-#: ../libgaim/protocols/oscar/oscar.c:2885
+#: ../libpurple/protocols/oscar/oscar.c:2908
 msgid "Available Message"
 msgstr "Tillg辰ngliga meddelanden"
 
-#: ../libgaim/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2936
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libgaim/protocols/oscar/oscar.c:2988
+#: ../libpurple/protocols/oscar/oscar.c:3016
 msgid "Your AIM connection may be lost."
 msgstr "Din anslutning kan vara borta."
 
 #. The conversion failed!
-#: ../libgaim/protocols/oscar/oscar.c:3175
-msgid "[Unable to display a message from this user because it contained invalid characters.]"
-msgstr "[Kan inte visa meddelande fr奪n denna anv辰ndare eftersom det inneh旦ll felaktiga tecken.]"
-
-#: ../libgaim/protocols/oscar/oscar.c:3396
-msgid "Rate limiting error."
-msgstr "Frekvensgr辰nsfel."
-
-#: ../libgaim/protocols/oscar/oscar.c:3397
-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 "Det senaste meddelandet skickades inte eftersom du 辰r 旦ver frekvensgr辰nsen. V辰nta 10 sekunder och f旦rs旦k igen."
-
-#: ../libgaim/protocols/oscar/oscar.c:3469
-msgid "You have been signed off for an unknown reason."
-msgstr "Du har blivit utloggad av ok辰nd anledning."
-
-#: ../libgaim/protocols/oscar/oscar.c:3482
-#: ../libgaim/protocols/toc/toc.c:977
+#: ../libpurple/protocols/oscar/oscar.c:3204
+msgid ""
+"[Unable to display a message from this user because it contained invalid "
+"characters.]"
+msgstr ""
+"[Kan inte visa meddelande fr奪n denna anv辰ndare eftersom det inneh旦ll "
+"felaktiga tecken.]"
+
+#: ../libpurple/protocols/oscar/oscar.c:3407
+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 ""
+"Det senaste meddelandet skickades inte eftersom du 辰r 旦ver frekvensgr辰nsen. "
+"V辰nta 10 sekunder och f旦rs旦k igen."
+
+#: ../libpurple/protocols/oscar/oscar.c:3490
+#: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Du har blivit fr奪nkopplad fr奪n chattrummet %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:3723
-#: ../libgaim/protocols/silc/util.c:583
+#: ../libpurple/protocols/oscar/oscar.c:3738
+#: ../libpurple/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobilnummer"
 
-#: ../libgaim/protocols/oscar/oscar.c:3753
+#: ../libpurple/protocols/oscar/oscar.c:3768
 msgid "Personal Web Page"
 msgstr "Personlig webbsida"
 
-#: ../libgaim/protocols/oscar/oscar.c:3758
-#: ../libgaim/protocols/qq/buddy_info.c:40
+#: ../libpurple/protocols/oscar/oscar.c:3792
+#: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Extra information"
 
-#: ../libgaim/protocols/oscar/oscar.c:3766
-#: ../libgaim/protocols/oscar/oscar.c:3779
+#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3813
 msgid "Zip Code"
 msgstr "Postnummer"
 
-#: ../libgaim/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/oscar/oscar.c:3824
 msgid "Division"
 msgstr "Avdelning"
 
-#: ../libgaim/protocols/oscar/oscar.c:3791
+#: ../libpurple/protocols/oscar/oscar.c:3825
 msgid "Position"
 msgstr "Befattning"
 
-#: ../libgaim/protocols/oscar/oscar.c:3793
+#: ../libpurple/protocols/oscar/oscar.c:3827
 msgid "Web Page"
 msgstr "Webbsida"
 
-#: ../libgaim/protocols/oscar/oscar.c:3796
+#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Work Information"
 msgstr "Information om arbete"
 
-#: ../libgaim/protocols/oscar/oscar.c:3852
+#: ../libpurple/protocols/oscar/oscar.c:3886
 msgid "Pop-Up Message"
 msgstr "Popup-meddelande"
 
-#: ../libgaim/protocols/oscar/oscar.c:3892
+#: ../libpurple/protocols/oscar/oscar.c:3926
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "F旦ljande sk辰rmnamn 辰r associerat med %s"
 msgstr[1] "F旦ljande sk辰rmnamn 辰r associerat med %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:3897
+#: ../libpurple/protocols/oscar/oscar.c:3931
 msgid "Screen name"
 msgstr "Sk辰rmnamn"
 
-#: ../libgaim/protocols/oscar/oscar.c:3923
+#: ../libpurple/protocols/oscar/oscar.c:3957
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Inget resultat funnet f旦r e-postadress %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:3944
+#: ../libpurple/protocols/oscar/oscar.c:3978
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Du borde f奪 ett e-postmeddelande som ber dig bekr辰fta %s."
 
-#: ../libgaim/protocols/oscar/oscar.c:3946
+#: ../libpurple/protocols/oscar/oscar.c:3980
 msgid "Account Confirmation Requested"
 msgstr "Kontobekr辰ftelsebeg辰ran"
 
-#: ../libgaim/protocols/oscar/oscar.c:3977
+#: ../libpurple/protocols/oscar/oscar.c:4011
 msgid "Error Changing Account Info"
 msgstr "Fel vid 辰ndring av kontoinformation"
 
-#: ../libgaim/protocols/oscar/oscar.c:3980
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because the requested screen name differs from the original."
-msgstr "Fel 0x%04x: Kan inte formatera anv辰ndar-ID eftersom det beg辰rda anv辰ndar-IDt skiljer sig fr奪n orginalet."
-
-#: ../libgaim/protocols/oscar/oscar.c:3983
+#: ../libpurple/protocols/oscar/oscar.c:4014
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"differs from the original."
+msgstr ""
+"Fel 0x%04x: Kan inte formatera anv辰ndar-ID eftersom det beg辰rda anv辰ndar-IDt "
+"skiljer sig fr奪n orginalet."
+
+#: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr "Fel 0x%04x: Kan inte formatera sk辰rmnamn eftersom det 辰r ogiltigt."
 
-#: ../libgaim/protocols/oscar/oscar.c:3986
-#, c-format
-msgid "Error 0x%04x: Unable to format screen name because the requested screen name is too long."
-msgstr "Fel 0x%04x: Kan inte formatera anv辰ndar-ID eftersom det beg辰rda anv辰ndar-IDt 辰r f旦r l奪ngt."
-
-#: ../libgaim/protocols/oscar/oscar.c:3989
-#, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because there is already a request pending for this screen name."
-msgstr "Fel 0x%04x: Kan inte 辰ndra e-postadressen eftersom det redan finns en beg辰ran om 辰ndring som v辰ntar f旦r detta anv辰ndar-ID."
-
-#: ../libgaim/protocols/oscar/oscar.c:3992
-#, 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 "Fel 0x%04x: Kan inte 辰ndra e-postadress eftersom den angivna adressen har f旦r m奪nga anv辰ndar-IDn associerade med sig."
-
-#: ../libgaim/protocols/oscar/oscar.c:3995
-#, c-format
-msgid "Error 0x%04x: Unable to change e-mail address because the given address is invalid."
-msgstr "Fel 0x%04x: Kan inte 辰ndra e-postadress eftersom den angivna adressen inte 辰r giltig."
-
-#: ../libgaim/protocols/oscar/oscar.c:3998
+#: ../libpurple/protocols/oscar/oscar.c:4020
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to format screen name because the requested screen name "
+"is too long."
+msgstr ""
+"Fel 0x%04x: Kan inte formatera anv辰ndar-ID eftersom det beg辰rda anv辰ndar-IDt "
+"辰r f旦r l奪ngt."
+
+#: ../libpurple/protocols/oscar/oscar.c:4023
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because there is already a "
+"request pending for this screen name."
+msgstr ""
+"Fel 0x%04x: Kan inte 辰ndra e-postadressen eftersom det redan finns en "
+"beg辰ran om 辰ndring som v辰ntar f旦r detta anv辰ndar-ID."
+
+#: ../libpurple/protocols/oscar/oscar.c:4026
+#, 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 ""
+"Fel 0x%04x: Kan inte 辰ndra e-postadress eftersom den angivna adressen har "
+"f旦r m奪nga anv辰ndar-IDn associerade med sig."
+
+#: ../libpurple/protocols/oscar/oscar.c:4029
+#, c-format
+msgid ""
+"Error 0x%04x: Unable to change e-mail address because the given address is "
+"invalid."
+msgstr ""
+"Fel 0x%04x: Kan inte 辰ndra e-postadress eftersom den angivna adressen inte "
+"辰r giltig."
+
+#: ../libpurple/protocols/oscar/oscar.c:4032
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fel 0x%04x: Ok辰nt fel."
 
-#: ../libgaim/protocols/oscar/oscar.c:4008
-#, c-format
-msgid ""
-"Your screen name is currently formatted as follows:\n"
-"%s"
-msgstr ""
-"Ditt anv辰ndar-ID 辰r f旦r tillf辰llet formaterat som f旦ljer:\n"
-"%s"
-
-#: ../libgaim/protocols/oscar/oscar.c:4009
-#: ../libgaim/protocols/oscar/oscar.c:4016
-msgid "Account Info"
-msgstr "Kontoinformation"
-
-#: ../libgaim/protocols/oscar/oscar.c:4014
+#: ../libpurple/protocols/oscar/oscar.c:4042
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "E-postaderssen f旦r %s 辰r %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:4189
-msgid "Your IM Image was not sent. You must be Direct Connected to send IM Images."
-msgstr "Din IM-bild var inte skickad. Du m奪ste vara direktansluten f旦r att kunna skicka IM-bilder."
-
-#: ../libgaim/protocols/oscar/oscar.c:4441
+#: ../libpurple/protocols/oscar/oscar.c:4044
+msgid "Account Info"
+msgstr "Kontoinformation"
+
+#: ../libpurple/protocols/oscar/oscar.c:4216
+msgid ""
+"Your IM Image was not sent. You must be Direct Connected to send IM Images."
+msgstr ""
+"Din IM-bild var inte skickad. Du m奪ste vara direktansluten f旦r att kunna "
+"skicka IM-bilder."
+
+#: ../libpurple/protocols/oscar/oscar.c:4487
 msgid "Unable to set AIM profile."
 msgstr "Kan inte 辰ndra i AIM-profil."
 
-#: ../libgaim/protocols/oscar/oscar.c:4442
-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 "Du har antagligen beg辰rt att 辰ndra i din profil innan inloggningsprocessen slutf旦rts. Din profil 辰r of旦r辰ndrad, f旦rs旦k 辰ndra den igen n辰r du 辰r helt ansluten."
-
-#: ../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."
-msgid_plural "The maximum profile length of %d bytes has been exceeded.  Gaim has truncated it for you."
-msgstr[0] "Den maximala profill辰ngden p奪 %d byte har 旦verskridits. Gaim har trunkerat profilen 奪t dig."
-msgstr[1] "Den maximala profill辰ngden p奪 %d byte har 旦verskridits. Gaim har trunkerat profilen 奪t dig."
-
-#: ../libgaim/protocols/oscar/oscar.c:4461
+#: ../libpurple/protocols/oscar/oscar.c:4488
+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 ""
+"Du har antagligen beg辰rt att 辰ndra i din profil innan inloggningsprocessen "
+"slutf旦rts. Din profil 辰r of旦r辰ndrad, f旦rs旦k 辰ndra den igen n辰r du 辰r helt "
+"ansluten."
+
+#: ../libpurple/protocols/oscar/oscar.c:4502
+#, c-format
+msgid ""
+"The maximum profile length of %d byte has been exceeded.  It has been "
+"truncated for you."
+msgid_plural ""
+"The maximum profile length of %d bytes has been exceeded.  It has been "
+"truncated for you."
+msgstr[0] ""
+"Den maximala profill辰ngden p奪 %d byte har 旦verskridits.  Den har blivit "
+"trunkerad 奪t dig."
+msgstr[1] ""
+"Den maximala profill辰ngden p奪 %d byte har 旦verskridits.  Den har blivit "
+"trunkerad 奪t dig."
+
+#: ../libpurple/protocols/oscar/oscar.c:4507
 msgid "Profile too long."
 msgstr "Profilen 辰r f旦r l奪ng."
 
-#: ../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."
-msgid_plural "The maximum away message length of %d bytes has been exceeded.  Gaim has truncated it for you."
-msgstr[0] "Den maximala l辰ngden p奪 meddelande vid fr奪nvaro som 辰r %d byte har 旦verskridits. Gaim har trunkerat meddelandet 奪t dig."
-msgstr[1] "Den maximala l辰ngden p奪 meddelande vid fr奪nvaro som 辰r %d byte har 旦verskridits. Gaim har trunkerat meddelandet 奪t dig."
-
-#: ../libgaim/protocols/oscar/oscar.c:4510
+#: ../libpurple/protocols/oscar/oscar.c:4552
+#, 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.  It has been "
+"truncated for you."
+msgstr[0] ""
+"Den maximala l辰ngden p奪 meddelande vid fr奪nvaro som 辰r %d byte har "
+"旦verskridits.  Den har blivit trunkerad 奪t dig."
+msgstr[1] ""
+"Den maximala l辰ngden p奪 meddelande vid fr奪nvaro som 辰r %d byte har "
+"旦verskridits.  Den har blivit trunkerad 奪t dig."
+
+#: ../libpurple/protocols/oscar/oscar.c:4557
 msgid "Away message too long."
 msgstr "Fr奪nvaromeddelandet 辰r f旦r l奪ngt."
 
-#: ../libgaim/protocols/oscar/oscar.c:4579
-#, c-format
-msgid "Could not add the buddy %s because the screen name is invalid.  Screen names must either start with a letter and contain only letters, numbers and spaces, or contain only numbers."
-msgstr "Kunde inte l辰gga till kompisen %s eftersom anv辰ndar-IDt 辰r ogiltigt. Anv辰ndar-IDt m奪ste antingen b旦rja med en bokstav och endast inneh奪lla bokst辰ver, siffror och mellanslag eller bara inneh奪lla siffror."
-
-#: ../libgaim/protocols/oscar/oscar.c:4581
-#: ../libgaim/protocols/oscar/oscar.c:5004
-#: ../libgaim/protocols/oscar/oscar.c:5018
+#: ../libpurple/protocols/oscar/oscar.c:4626
+#, c-format
+msgid ""
+"Could not add the buddy %s because the screen name is invalid.  Screen names "
+"must be a valid email address, or start with a letter and contain only "
+"letters, numbers and spaces, or contain only numbers."
+msgstr ""
+"Kunde inte l辰gga till kompisen %s eftersom sk辰rmnamnet 辰r ogiltigt. "
+"Sk辰rmnamnet m奪ste antingen vara en giltig epost-adress, b旦rja med en bokstav "
+"och endast inneh奪lla bokst辰ver, siffror och mellanslag eller bara inneh奪lla "
+"siffror."
+
+#: ../libpurple/protocols/oscar/oscar.c:4628
+#: ../libpurple/protocols/oscar/oscar.c:5051
+#: ../libpurple/protocols/oscar/oscar.c:5066
 msgid "Unable To Add"
 msgstr "Kan inte l辰gga till"
 
-#: ../libgaim/protocols/oscar/oscar.c:4685
+#: ../libpurple/protocols/oscar/oscar.c:4732
 msgid "Unable To Retrieve Buddy List"
 msgstr "Kunde inte h辰mta kompislista"
 
-#: ../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 "Gaim kunde inte h辰mta din kompislista fr奪n AIM-servern. Din kompislista 辰r inte borta och kommer antagligen vara tillg辰nglig om n奪gra timmar."
-
-#: ../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:4733
+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 ""
+"AIM-servrarna kunde inte skicka din kompislista f旦r tillf辰llet. Din "
+"kompislista 辰r inte borta och kommer antagligen vara tillg辰nglig om n奪gra "
+"timmar igen."
+
+#: ../libpurple/protocols/oscar/oscar.c:4937
+#: ../libpurple/protocols/oscar/oscar.c:4938
+#: ../libpurple/protocols/oscar/oscar.c:4943
+#: ../libpurple/protocols/oscar/oscar.c:5120
+#: ../libpurple/protocols/oscar/oscar.c:5121
+#: ../libpurple/protocols/oscar/oscar.c:5126
 msgid "Orphans"
 msgstr "F旦r辰ldral旦sa"
 
-#: ../libgaim/protocols/oscar/oscar.c:5002
-#, 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 "Kunde inte l辰gga till kompisen %s eftersom du har f旦r m奪nga kompisar i din kompislista. Ta bort en och f旦rs旦k igen."
-
-#: ../libgaim/protocols/oscar/oscar.c:5002
-#: ../libgaim/protocols/oscar/oscar.c:5016
+#: ../libpurple/protocols/oscar/oscar.c:5049
+#, 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 ""
+"Kunde inte l辰gga till kompisen %s eftersom du har f旦r m奪nga kompisar i din "
+"kompislista. Ta bort en och f旦rs旦k igen."
+
+#: ../libpurple/protocols/oscar/oscar.c:5049
+#: ../libpurple/protocols/oscar/oscar.c:5064
 msgid "(no name)"
 msgstr "(inget namn)"
 
-#: ../libgaim/protocols/oscar/oscar.c:5016
-#, 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 "Kunde inte l辰gga till kompisen %s av ok辰nd anledning. Det vanligaste orsaken till detta 辰r att du har det maximalt till奪tna antalet kompisar i din kompislista."
-
-#: ../libgaim/protocols/oscar/oscar.c:5109
-#, c-format
-msgid "The user %s has given you permission to add you to their buddy list.  Do you want to add them?"
-msgstr "Anv辰ndaren %s har givit dig till奪telse att l辰gga till den till din kompislista, vill du g旦ra det?"
-
-#: ../libgaim/protocols/oscar/oscar.c:5115
+#: ../libpurple/protocols/oscar/oscar.c:5063
+#, c-format
+msgid "Could not add the buddy %s for an unknown reason."
+msgstr "Kunde inte l辰gga till kompisen %s av ok辰nd anledning."
+
+#: ../libpurple/protocols/oscar/oscar.c:5157
+#, c-format
+msgid ""
+"The user %s has given you permission to add you to their buddy list.  Do you "
+"want to add them?"
+msgstr ""
+"Anv辰ndaren %s har givit dig till奪telse att l辰gga till den till din "
+"kompislista, vill du g旦ra det?"
+
+#: ../libpurple/protocols/oscar/oscar.c:5165
 msgid "Authorization Given"
 msgstr "Auktorisering given"
 
 #. Granted
-#: ../libgaim/protocols/oscar/oscar.c:5193
+#: ../libpurple/protocols/oscar/oscar.c:5238
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "Anv辰ndaren %s har till奪tit dig att l辰gga till henne/honom till din kompislista."
-
-#: ../libgaim/protocols/oscar/oscar.c:5194
+msgstr ""
+"Anv辰ndaren %s har till奪tit dig att l辰gga till henne/honom till din "
+"kompislista."
+
+#: ../libpurple/protocols/oscar/oscar.c:5239
 msgid "Authorization Granted"
 msgstr "Auktorisering beviljades"
 
 #. Denied
-#: ../libgaim/protocols/oscar/oscar.c:5197
-#, c-format
-msgid ""
-"The user %s has denied your request to add them to your buddy list for the following reason:\n"
+#: ../libpurple/protocols/oscar/oscar.c:5242
+#, c-format
+msgid ""
+"The user %s has denied your request to add them to your buddy list for the "
+"following reason:\n"
 "%s"
 msgstr ""
-"Anv辰ndaren %s till奪ter inte att du l辰gga till henne/honom till din kompislista av f旦ljande orsak:\n"
+"Anv辰ndaren %s till奪ter inte att du l辰gga till henne/honom till din "
+"kompislista av f旦ljande orsak:\n"
 "%s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5198
+#: ../libpurple/protocols/oscar/oscar.c:5243
 msgid "Authorization Denied"
 msgstr "Auktorisering nekades"
 
-#: ../libgaim/protocols/oscar/oscar.c:5234
-#: ../libgaim/protocols/toc/toc.c:1378
+#: ../libpurple/protocols/oscar/oscar.c:5279
+#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Utbyte:"
 
-#: ../libgaim/protocols/oscar/oscar.c:5274
+#: ../libpurple/protocols/oscar/oscar.c:5319
 msgid "Invalid chat name specified."
 msgstr "Ogiltigt chattnamn angivet."
 
-#: ../libgaim/protocols/oscar/oscar.c:5344
+#: ../libpurple/protocols/oscar/oscar.c:5388
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
-msgstr "Din IM-bild skickades inte. Du kan inte skicka IM-bilder via AIM-chattar."
-
-#: ../libgaim/protocols/oscar/oscar.c:5516
-#: ../libgaim/protocols/oscar/oscar.c:5521
+msgstr ""
+"Din IM-bild skickades inte. Du kan inte skicka IM-bilder via AIM-chattar."
+
+#: ../libpurple/protocols/oscar/oscar.c:5548
+#: ../libpurple/protocols/oscar/oscar.c:5553
 msgid "Away Message"
 msgstr "Fr奪nvaromeddelande"
 
-#: ../libgaim/protocols/oscar/oscar.c:5521
+#: ../libpurple/protocols/oscar/oscar.c:5553
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(mottar)</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:5834
+#: ../libpurple/protocols/oscar/oscar.c:5753
+msgid "iTunes Music Store Link"
+msgstr "L辰nk till iTunes Musikaff辰r"
+
+#: ../libpurple/protocols/oscar/oscar.c:5861
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Kompiskommentar f旦r %s"
 
-#: ../libgaim/protocols/oscar/oscar.c:5835
+#: ../libpurple/protocols/oscar/oscar.c:5862
 msgid "Buddy Comment:"
 msgstr "Kompiskommentar:"
 
-#: ../libgaim/protocols/oscar/oscar.c:5881
+#: ../libpurple/protocols/oscar/oscar.c:5909
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
-msgstr "Du har valt att 旦ppna en direktanslutning f旦r snabbmeddelanden till %s."
-
-#: ../libgaim/protocols/oscar/oscar.c:5885
-msgid "Because this reveals your IP address, it may be considered a security risk.  Do you wish to continue?"
-msgstr "Eftersom detta avsl旦jar din IP-adress kan det ses som en s辰kerhetsrisk. Vill du forts辰tta?"
-
-#: ../libgaim/protocols/oscar/oscar.c:5889
-#: ../libgaim/protocols/oscar/peer.c:1017
-msgid "_Connect"
+msgstr ""
+"Du har valt att 旦ppna en direktanslutning f旦r snabbmeddelanden till %s."
+
+#: ../libpurple/protocols/oscar/oscar.c:5913
+msgid ""
+"Because this reveals your IP address, it may be considered a security risk.  "
+"Do you wish to continue?"
+msgstr ""
+"Eftersom detta avsl旦jar din IP-adress kan det ses som en s辰kerhetsrisk. Vill "
+"du forts辰tta?"
+
+#: ../libpurple/protocols/oscar/oscar.c:5919
+#: ../libpurple/protocols/oscar/peer.c:1022
+msgid "C_onnect"
 msgstr "_Anslut"
 
-#: ../libgaim/protocols/oscar/oscar.c:5924
+#: ../libpurple/protocols/oscar/oscar.c:5954
 msgid "Get AIM Info"
 msgstr "H辰mta AIM-info"
 
-#: ../libgaim/protocols/oscar/oscar.c:5930
+#: ../libpurple/protocols/oscar/oscar.c:5960
 msgid "Edit Buddy Comment"
 msgstr "�ndra kompiskommentar"
 
-#: ../libgaim/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:5968
 msgid "Get Status Msg"
 msgstr "H辰mta statusmeddelande"
 
-#: ../libgaim/protocols/oscar/oscar.c:5951
+#: ../libpurple/protocols/oscar/oscar.c:5981
 msgid "Direct IM"
 msgstr "Direktmeddelande"
 
-#: ../libgaim/protocols/oscar/oscar.c:5973
+#: ../libpurple/protocols/oscar/oscar.c:6003
 msgid "Re-request Authorization"
 msgstr "Beg辰r autentiserings igen"
 
-#: ../libgaim/protocols/oscar/oscar.c:6032
+#: ../libpurple/protocols/oscar/oscar.c:6062
 msgid "Require authorization"
 msgstr "Kr辰ver auktorisering"
 
-#: ../libgaim/protocols/oscar/oscar.c:6035
+#: ../libpurple/protocols/oscar/oscar.c:6065
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Webbn辰rvaro (aktivera detta inneb辰r att du kommer f奪 SPAM!)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6040
+#: ../libpurple/protocols/oscar/oscar.c:6070
 msgid "ICQ Privacy Options"
 msgstr "ICQ sekretessinst辰llningar"
 
-#: ../libgaim/protocols/oscar/oscar.c:6057
+#: ../libpurple/protocols/oscar/oscar.c:6089
 msgid "The new formatting is invalid."
 msgstr "Den nya formateringen 辰r ogiltig."
 
-#: ../libgaim/protocols/oscar/oscar.c:6058
+#: ../libpurple/protocols/oscar/oscar.c:6090
 msgid "Screen name formatting can change only capitalization and whitespace."
-msgstr "Anv辰ndar-ID formatering kan endast f旦r辰ndra stora-/sm奪bokst辰ver och mellanslag."
-
-#: ../libgaim/protocols/oscar/oscar.c:6065
-msgid "New screen name formatting:"
-msgstr "Ny formatering av anv辰ndar-ID:"
-
-#: ../libgaim/protocols/oscar/oscar.c:6121
+msgstr ""
+"Anv辰ndar-ID formatering kan endast f旦r辰ndra stora-/sm奪bokst辰ver och "
+"mellanslag."
+
+#: ../libpurple/protocols/oscar/oscar.c:6143
 msgid "Change Address To:"
 msgstr "�ndra adress till:"
 
-#: ../libgaim/protocols/oscar/oscar.c:6166
+#: ../libpurple/protocols/oscar/oscar.c:6189
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>du v辰ntar inte p奪 auktorisering</i>"
 
-#: ../libgaim/protocols/oscar/oscar.c:6169
+#: ../libpurple/protocols/oscar/oscar.c:6192
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Du v辰ntar p奪 auktorisering fr奪n f旦ljande kompisar"
 
-#: ../libgaim/protocols/oscar/oscar.c:6170
-msgid "You can re-request authorization from these buddies by right-clicking on them and selecting \"Re-request Authorization.\""
-msgstr "Du kan beg辰ra auktorisering igen fr奪n dessa kompisar genom att h旦gerkilcka p奪 dem och v辰lja \"Beg辰r auktorisering igen.\""
-
-#: ../libgaim/protocols/oscar/oscar.c:6187
+#: ../libpurple/protocols/oscar/oscar.c:6193
+msgid ""
+"You can re-request authorization from these buddies by right-clicking on "
+"them and selecting \"Re-request Authorization.\""
+msgstr ""
+"Du kan beg辰ra auktorisering igen fr奪n dessa kompisar genom att h旦gerkilcka "
+"p奪 dem och v辰lja \"Beg辰r auktorisering igen.\""
+
+#: ../libpurple/protocols/oscar/oscar.c:6210
 msgid "Find Buddy by E-Mail"
 msgstr "Hitta kompis p奪 e-postadress"
 
-#: ../libgaim/protocols/oscar/oscar.c:6188
+#: ../libpurple/protocols/oscar/oscar.c:6211
 msgid "Search for a buddy by e-mail address"
 msgstr "S旦k efter en kompis p奪 dess e-postadress"
 
-#: ../libgaim/protocols/oscar/oscar.c:6189
+#: ../libpurple/protocols/oscar/oscar.c:6212
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Skriv in e-postadressen f旦r den kompis du s旦ker efter."
 
-#: ../libgaim/protocols/oscar/oscar.c:6358
+#: ../libpurple/protocols/oscar/oscar.c:6215
+msgid "_Search"
+msgstr "_S旦k"
+
+#: ../libpurple/protocols/oscar/oscar.c:6373
 msgid "Set User Info (URL)..."
 msgstr "�ndra anv辰ndarinformation (URL)..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6369
+#: ../libpurple/protocols/oscar/oscar.c:6384
 msgid "Change Password (URL)"
 msgstr "Byt l旦senord (URL)"
 
-#: ../libgaim/protocols/oscar/oscar.c:6373
+#: ../libpurple/protocols/oscar/oscar.c:6388
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfigurera vidarebefordring av snabbmeddelanden (URL)"
 
 #. ICQ actions
-#: ../libgaim/protocols/oscar/oscar.c:6383
+#: ../libpurple/protocols/oscar/oscar.c:6398
 msgid "Set Privacy Options..."
 msgstr "Ange sekretessinst辰llningar..."
 
 #. AIM actions
-#: ../libgaim/protocols/oscar/oscar.c:6390
-msgid "Format Screen Name..."
-msgstr "Formatera anv辰ndar-ID..."
-
-#: ../libgaim/protocols/oscar/oscar.c:6394
+#: ../libpurple/protocols/oscar/oscar.c:6405
 msgid "Confirm Account"
 msgstr "Bekr辰fta konto"
 
-#: ../libgaim/protocols/oscar/oscar.c:6398
+#: ../libpurple/protocols/oscar/oscar.c:6409
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Visa f旦r tillf辰llet registrerad epost-adress"
 
-#: ../libgaim/protocols/oscar/oscar.c:6402
+#: ../libpurple/protocols/oscar/oscar.c:6413
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "�ndra f旦r tillf辰llet registrerad epost-adress..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6409
+#: ../libpurple/protocols/oscar/oscar.c:6420
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Visa kompisar som v辰ntar p奪 auktorisering"
 
-#: ../libgaim/protocols/oscar/oscar.c:6415
+#: ../libpurple/protocols/oscar/oscar.c:6426
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "S旦k efter kompis p奪 e-postadress..."
 
-#: ../libgaim/protocols/oscar/oscar.c:6420
+#: ../libpurple/protocols/oscar/oscar.c:6431
 msgid "Search for Buddy by Information"
 msgstr "S旦k efter kompis via information"
 
-#: ../libgaim/protocols/oscar/oscar.c:6488
+#: ../libpurple/protocols/oscar/oscar.c:6499
 msgid "Use recent buddies group"
 msgstr "Anv辰nd senaste kompisgruppen"
 
-#: ../libgaim/protocols/oscar/oscar.c:6491
+#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Show how long you have been idle"
 msgstr "Visar hur l辰nge du varit inaktiv"
 
-#: ../libgaim/protocols/oscar/peer.c:671
+#: ../libpurple/protocols/oscar/oscar.c:6657
+msgid ""
+"Always use ICQ proxy server for file transfers\n"
+"(slower, but does not reveal your IP address)"
+msgstr ""
+"Anv辰nda alltid ICQ proxy server f旦r fil旦verf旦ringar\n"
+"(l奪ngsammare men avsl旦jar inte ditt IP-nummer)"
+
+#: ../libpurple/protocols/oscar/peer.c:674
 #, c-format
 msgid "Asking %s to connect to us at %s:%hu for Direct IM."
 msgstr "Ber %s att ansluta till oss p奪 %s:%hu f旦r Direct IM."
 
-#: ../libgaim/protocols/oscar/peer.c:756
+#: ../libpurple/protocols/oscar/peer.c:759
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "F旦rs旦ker ansluta till %s: %hu."
 
-#: ../libgaim/protocols/oscar/peer.c:830
+#: ../libpurple/protocols/oscar/peer.c:833
 msgid "Attempting to connect via proxy server."
 msgstr "F旦rs旦ker ansluta via en proxy-server."
 
-#: ../libgaim/protocols/oscar/peer.c:1007
+#: ../libpurple/protocols/oscar/peer.c:1010
 #, c-format
 msgid "%s has just asked to directly connect to %s"
 msgstr "%s har just fr奪gat om att koppla sig direkt till %s"
 
-#: ../libgaim/protocols/oscar/peer.c:1011
-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 "Detta kr辰ver en direkt koppling mellan de tv奪 datorerna och beh旦vs f旦r att IM-bilder ska fungera. Eftersom din IP-adress kommer att avsl旦jas kan detta betraktas som en s辰kerhetsrisk."
-
-#: ../libgaim/protocols/qq/buddy_info.c:39
+#: ../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 ""
+"Detta kr辰ver en direkt koppling mellan de tv奪 datorerna och beh旦vs f旦r att "
+"IM-bilder ska fungera. Eftersom din IP-adress kommer att avsl旦jas kan detta "
+"betraktas som en s辰kerhetsrisk."
+
+#: ../libpurple/protocols/qq/buddy_info.c:39
 msgid "Primary Information"
 msgstr "Prim辰r information"
 
-#: ../libgaim/protocols/qq/buddy_info.c:41
+#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
-msgstr "Personlig introduktionPersonlig information"
-
-#: ../libgaim/protocols/qq/buddy_info.c:42
+msgstr "Personlig introduktion"
+
+#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "QQ-nummer"
 
-#: ../libgaim/protocols/qq/buddy_info.c:47
+#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "Land/Region"
 
-#: ../libgaim/protocols/qq/buddy_info.c:48
+#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "Provins/Stat"
 
-#: ../libgaim/protocols/qq/buddy_info.c:50
+#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "Horoskopstecken"
 
-#: ../libgaim/protocols/qq/buddy_info.c:52
+#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Stj辰rntecken"
 
-#: ../libgaim/protocols/qq/buddy_info.c:53
+#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Blodgrupp"
 
-#: ../libgaim/protocols/qq/buddy_info.c:54
+#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "Universitet"
 
-#: ../libgaim/protocols/qq/buddy_info.c:55
+#: ../libpurple/protocols/qq/buddy_info.c:55
 msgid "Email"
 msgstr "E-post"
 
-#: ../libgaim/protocols/qq/buddy_info.c:57
+#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Postnummer"
 
-#: ../libgaim/protocols/qq/buddy_info.c:58
+#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "Mobilnummer"
 
-#: ../libgaim/protocols/qq/buddy_info.c:59
+#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "Vattuman"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "Fiskarna"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Stenbocken"
 
-#: ../libgaim/protocols/qq/buddy_info.c:64
+#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "Oxen"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "Tvillingen"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "Kr辰ftan"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "Lejon"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Jungfrun"
 
-#: ../libgaim/protocols/qq/buddy_info.c:65
+#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "V奪gen"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Skorpionen"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Skytten"
 
-#: ../libgaim/protocols/qq/buddy_info.c:66
+#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Kr辰ftan"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "R奪tta"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "Oxen"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Tiger"
 
-#: ../libgaim/protocols/qq/buddy_info.c:71
+#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Kanin"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Drake"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Orm"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "H辰st"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Get"
 
-#: ../libgaim/protocols/qq/buddy_info.c:72
+#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Apa"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Tupp"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Hund"
 
-#: ../libgaim/protocols/qq/buddy_info.c:73
+#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Gris"
 
-#: ../libgaim/protocols/qq/buddy_info.c:78
+#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "Annan"
 
-#: ../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 "�ndra min information"
 
-#: ../libgaim/protocols/qq/buddy_info.c:483
+#: ../libpurple/protocols/qq/buddy_info.c:483
 msgid "Update my information"
 msgstr "Uppdatera min information"
 
-#: ../libgaim/protocols/qq/buddy_info.c:506
+#: ../libpurple/protocols/qq/buddy_info.c:507
 msgid "Your information has been updated"
 msgstr "Din infromation har blivit uppdaterad"
 
-#: ../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 "Du f旦rs旦ker ange ett valfritt ansikte. Gaim st旦djer f旦r tillf辰llet endast standardansikten. Var god v辰lj en bild fr奪n"
-
-#: ../libgaim/protocols/qq/buddy_info.c:577
-#: ../libgaim/protocols/qq/buddy_info.c:590
+#: ../libpurple/protocols/qq/buddy_info.c:560
+#, c-format
+msgid ""
+"Setting custom faces is not currently supported. Please choose an image from "
+"%s."
+msgstr ""
+"Att ange ett valfritt ansikte f旦r tillf辰llet. Var god v辰lj en bild fr奪n %s."
+
+#: ../libpurple/protocols/qq/buddy_info.c:577
+#: ../libpurple/protocols/qq/buddy_info.c:590
 msgid "Invalid QQ Face"
 msgstr "Ogiltigt QQ-ansikte"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:207
-#: ../libgaim/protocols/qq/group_opt.c:135
+#: ../libpurple/protocols/qq/buddy_opt.c:208
+#: ../libpurple/protocols/qq/group_opt.c:136
 #, c-format
 msgid "You rejected %d's request"
 msgstr "Du avslog %d's f旦rfr奪gan"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:208
-#: ../libgaim/protocols/qq/group_opt.c:136
+#: ../libpurple/protocols/qq/buddy_opt.c:209
+#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Input your reason:"
 msgstr "Ange din anledning"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:210
+#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Avsl奪 f旦rfr奪gan"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:211
-#: ../libgaim/protocols/qq/group_opt.c:139
+#. title
+#: ../libpurple/protocols/qq/buddy_opt.c:213
+#: ../libpurple/protocols/qq/group_opt.c:141
 msgid "Sorry, you are not my type..."
 msgstr "Tyv辰rr, du 辰r inte min typ..."
 
-#: ../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:214
+#: ../libpurple/protocols/qq/group_im.c:144
+#: ../libpurple/protocols/qq/group_opt.c:127
+#: ../libpurple/protocols/qq/sys_msg.c:91
+#: ../libpurple/protocols/qq/sys_msg.c:249
 msgid "Reject"
 msgstr "Avsl奪"
 
 # Os辰ker: (Hrm...
-#: ../libgaim/protocols/qq/buddy_opt.c:272
+#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request fails"
 msgstr "L辰gg till kompis med ogiltig authf旦rfr奪gan"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:303
+#: ../libpurple/protocols/qq/buddy_opt.c:308
 msgid "You have successfully removed a buddy"
 msgstr "Du har problemfritt tagit bort en kompis"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:331
+#: ../libpurple/protocols/qq/buddy_opt.c:336
 msgid "You have successfully removed yourself from a buddy"
 msgstr "Du har problemfritt tagit bort dig sj辰lv fr奪n en kompis"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:395
+#: ../libpurple/protocols/qq/buddy_opt.c:402
 #, c-format
 msgid "User %d needs authentication"
 msgstr "Anv辰ndaren %d beh旦ver autentisering"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:397
-#: ../libgaim/protocols/qq/group_join.c:134
+#: ../libpurple/protocols/qq/buddy_opt.c:404
+#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Inmatningsf旦rfr奪gan h辰r"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:398
-#: ../libgaim/protocols/qq/group_join.c:135
+#. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
+#: ../libpurple/protocols/qq/buddy_opt.c:405
+#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Vill du bli min v辰n?"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:399
-#: ../libgaim/protocols/qq/group_join.c:136
-#: ../libgaim/protocols/qq/group_opt.c:140
+#. multiline
+#. masked
+#. hint
+#: ../libpurple/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/group_join.c:138
+#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Skicka"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:406
+#: ../libpurple/protocols/qq/buddy_opt.c:416
 #, c-format
 msgid "You have added %d in buddy list"
 msgstr "Du har lagt till %d i din kompislista"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:503
+#: ../libpurple/protocols/qq/buddy_opt.c:513
 msgid "QQid Error"
 msgstr "QQid-fel"
 
-#: ../libgaim/protocols/qq/buddy_opt.c:504
+#: ../libpurple/protocols/qq/buddy_opt.c:514
 msgid "Invalid QQid"
 msgstr "Ogiltig 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 "Grupp ID"
 
-#: ../libgaim/protocols/qq/group.c:100
+#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Skapare"
 
-#: ../libgaim/protocols/qq/group.c:103
+#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Gruppbeskrivning"
 
-#: ../libgaim/protocols/qq/group.c:109
+#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "Auktorisera"
 
-#: ../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 "Ange externt gruppID"
 
-#: ../libgaim/protocols/qq/group.c:121
+#: ../libpurple/protocols/qq/group.c:121
 msgid "You can only search for permanent QQ groups\n"
 msgstr "Du kan enbart s旦ka efter permanenta QQ-grupper\n"
 
-#: ../libgaim/protocols/qq/group_im.c:122
+#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d applied to join group %d"
 msgstr "Anv辰ndaren %d har ans旦kt om att f奪 g奪 med i grupp %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:127
+#: ../libpurple/protocols/qq/group_im.c:181
+#: ../libpurple/protocols/qq/sys_msg.c:195
 #, c-format
 msgid "Reason: %s"
 msgstr "Anledning: %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:136
+#: ../libpurple/protocols/qq/group_im.c:183
+#: ../libpurple/protocols/qq/group_im.c:223
+#: ../libpurple/protocols/qq/group_im.c:258
+#: ../libpurple/protocols/qq/group_im.c:292
+#: ../libpurple/protocols/qq/group_join.c:233
+#: ../libpurple/protocols/qq/group_join.c:359
+#: ../libpurple/protocols/qq/group_opt.c:235
+#: ../libpurple/protocols/qq/group_opt.c:305
+#: ../libpurple/protocols/qq/group_opt.c:391
 msgid "QQ Qun Operation"
 msgstr "QQ Qun-operation"
 
-#: ../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:141
+#: ../libpurple/protocols/qq/group_opt.c:128
+#: ../libpurple/protocols/qq/sys_msg.c:92
+#: ../libpurple/protocols/qq/sys_msg.c:251
 msgid "Approve"
 msgstr "Godk辰nn"
 
-#: ../libgaim/protocols/qq/group_im.c:171
+#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "You request to join group %d has been rejected by admin %d"
 msgstr "Din f旦rfr奪gan att g奪 med i %d har blivit avslaget av moderator %d"
 
-#: ../libgaim/protocols/qq/group_im.c:212
+#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "You request to join group %d has been approved by admin %d"
 msgstr "Din f旦rfr奪gan att g奪 med i %d till辰ts av moderator %d"
 
-#: ../libgaim/protocols/qq/group_im.c:248
+#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] has exit group \"%d\""
 msgstr "Du [%d] har g奪tt ut fr奪n gruppen \"%d\""
 
-#: ../libgaim/protocols/qq/group_im.c:282
+#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] has been added by group \"%d\""
 msgstr "Du [%d] har lagts till av gruppen \"%d\""
 
-#: ../libgaim/protocols/qq/group_im.c:283
+#: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
 msgstr "Denna gruppen har lagst till i din kompislista."
 
-#: ../libgaim/protocols/qq/group_internal.c:41
+#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not member"
 msgstr "Jag 辰r inte en medlem"
 
-#: ../libgaim/protocols/qq/group_internal.c:44
+#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "Jag 辰r en medlem"
 
-#: ../libgaim/protocols/qq/group_internal.c:47
+#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "Jag s旦ker f旦r att g奪 med"
 
-#: ../libgaim/protocols/qq/group_internal.c:50
+#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "Jag 辰r moderatorn"
 
-#: ../libgaim/protocols/qq/group_internal.c:53
+#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Ok辰nd status"
 
-#: ../libgaim/protocols/qq/group_join.c:80
+#: ../libpurple/protocols/qq/group_join.c:82
 msgid "This group does not allow others to join"
 msgstr "Denna gruppen till奪ter inte andra att g奪 med"
 
-#: ../libgaim/protocols/qq/group_join.c:229
+#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully exited the group"
 msgstr "Du har problemfritt g奪tt ur gruppen"
 
-#: ../libgaim/protocols/qq/group_join.c:253
+#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "QQ Grupp-auth"
 
-#: ../libgaim/protocols/qq/group_join.c:254
+#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization operation has been accepted by the QQ server"
 msgstr "Din auktoriseringsoperation har accepterats av QQ-servern"
 
-#: ../libgaim/protocols/qq/group_join.c:325
+#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You inputted a group id outside the acceptable range"
 msgstr "Du angav ett gruppID utanf旦r det till奪tna intervallet"
 
-#: ../libgaim/protocols/qq/group_join.c:356
+#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure to exit this Qun?"
 msgstr "�r du s辰ker p奪 att du vill l辰mna denna Qun?"
 
-#: ../libgaim/protocols/qq/group_join.c:358
+#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -11392,177 +8118,176 @@
 "Notera att om du 辰r skaparen, \n"
 "denna operation kommer till slut ta bort detta Qun."
 
-#: ../libgaim/protocols/qq/group_join.c:361
+#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Go ahead"
 msgstr "Forts辰tt"
 
-#: ../libgaim/protocols/qq/group_network.c:90
+#: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Kod [0x%02X]: %s"
 
-#: ../libgaim/protocols/qq/group_network.c:91
+#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr "Gruppoperationsfel"
 
-#: ../libgaim/protocols/qq/group_opt.c:124
-#: ../libgaim/protocols/qq/sys_msg.c:84
+#. we wanna see window
+#: ../libpurple/protocols/qq/group_opt.c:124
+#: ../libpurple/protocols/qq/sys_msg.c:88
 msgid "Do you wanna approve the request?"
 msgstr "Vill du godk辰nna f旦rr奪gan?"
 
-#: ../libgaim/protocols/qq/group_opt.c:230
+#: ../libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modify Qun member"
 msgstr "Du har problemfritt 辰ndrat Qun-medlemmen"
 
-#: ../libgaim/protocols/qq/group_opt.c:300
+#: ../libpurple/protocols/qq/group_opt.c:305
 msgid "You have successfully modify Qun information"
 msgstr "Du har problemfritt 辰ndrat Wun informationen"
 
-#: ../libgaim/protocols/qq/group_opt.c:387
+#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr "Du har problemfritt skapat ett Qun"
 
-#: ../libgaim/protocols/qq/group_opt.c:389
+#: ../libpurple/protocols/qq/group_opt.c:394
 msgid "Would you like to set up the Qun details now?"
 msgstr "Vill du ange Qun-detaljerna nu?"
 
 # Os辰ker
-#: ../libgaim/protocols/qq/group_opt.c:390
+#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "Ange"
 
-#: ../libgaim/protocols/qq/im.c:423
+#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Systemmeddelande"
 
-#: ../libgaim/protocols/qq/im.c:567
+#: ../libpurple/protocols/qq/im.c:576
 msgid "Server ACK"
 msgstr "Server ACK"
 
-#: ../libgaim/protocols/qq/im.c:567
-msgid "Send IM fail\n"
-msgstr "Skicka IM misslyckades\n"
-
-#: ../libgaim/protocols/qq/keep_alive.c:86
+#: ../libpurple/protocols/qq/im.c:576
+msgid "Failed to send IM."
+msgstr "Kunde inte skicka snabbmeddelande"
+
+#: ../libpurple/protocols/qq/keep_alive.c:87
 msgid "Keep alive error, seems connection lost!"
 msgstr "H奪ll vid liv fel, verkar som om kontakten br旦ts!"
 
-#: ../libgaim/protocols/qq/login_logout.c:406
+#: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Request login token error!"
 msgstr "Fel vid f旦rfr奪gan efter inloggningsmark旦r!"
 
-#: ../libgaim/protocols/qq/login_logout.c:484
+#: ../libpurple/protocols/qq/login_logout.c:486
 msgid "Unable to login, check debug log"
 msgstr "Kan inte logga in, kolla fels旦kningsloggen"
 
 #. 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
+#: ../libpurple/protocols/qq/qq.c:139 ../libpurple/protocols/toc/toc.c:173
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:109
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:189
+#: ../libpurple/protocols/yahoo/ycht.c:549
 msgid "Unable to connect."
 msgstr "Kan inte ansluta."
 
-#: ../libgaim/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:186
 #, c-format
 msgid "Unknown-%d"
 msgstr "Ok辰nd-%d"
 
-#: ../libgaim/protocols/qq/qq.c:209
+#: ../libpurple/protocols/qq/qq.c:209
 #, c-format
 msgid "%s Address"
 msgstr "%s Adress"
 
-#: ../libgaim/protocols/qq/qq.c:240
+#: ../libpurple/protocols/qq/qq.c:240
 msgid "Level"
 msgstr "Niv奪"
 
-#: ../libgaim/protocols/qq/qq.c:294
+#: ../libpurple/protocols/qq/qq.c:278
 msgid "QQ: Available"
 msgstr "QQ: Tillg辰nglig"
 
-#: ../libgaim/protocols/qq/qq.c:298
+#: ../libpurple/protocols/qq/qq.c:282
 msgid "QQ: Away"
 msgstr "QQ: Fr奪nvarande"
 
-#: ../libgaim/protocols/qq/qq.c:302
+#: ../libpurple/protocols/qq/qq.c:286
 msgid "QQ: Invisible"
 msgstr "QQ: Osynlig"
 
-#: ../libgaim/protocols/qq/qq.c:306
+#: ../libpurple/protocols/qq/qq.c:290
 msgid "QQ: Offline"
 msgstr "QQ: Fr奪nkopplad"
 
-#: ../libgaim/protocols/qq/qq.c:383
+#: ../libpurple/protocols/qq/qq.c:371
 msgid "Invalid name"
 msgstr "Ogiltigt namn"
 
-#: ../libgaim/protocols/qq/qq.c:450
+#: ../libpurple/protocols/qq/qq.c:437
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Online just nu</b>: %d<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:438
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Senast uppdatering</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:455
+#: ../libpurple/protocols/qq/qq.c:442
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Anslutningsl辰ge</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:456
+#: ../libpurple/protocols/qq/qq.c:443
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>Server IP</b>: %s: %d<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:457
+#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Mit publika IP</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:462
+#: ../libpurple/protocols/qq/qq.c:449
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Anslutningsnamn</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:463
+#: ../libpurple/protocols/qq/qq.c:450
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Senaste login IP</b>: %s<br>\n"
 
-#: ../libgaim/protocols/qq/qq.c:464
+#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Senast login tid</b>: %s\n"
 
-#: ../libgaim/protocols/qq/qq.c:468
+#: ../libpurple/protocols/qq/qq.c:455
 msgid "Login Information"
 msgstr "Inloggningsinformation"
 
-#: ../libgaim/protocols/qq/qq.c:543
+#: ../libpurple/protocols/qq/qq.c:531
 msgid "Modify My Information"
 msgstr "�ndra min Information"
 
-#: ../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 "Byt l旦senord"
 
-#: ../libgaim/protocols/qq/qq.c:549
+#: ../libpurple/protocols/qq/qq.c:537
 msgid "Show Login Information"
 msgstr "Visa inloggningsinformation"
 
-#: ../libgaim/protocols/qq/qq.c:570
+#: ../libpurple/protocols/qq/qq.c:558
 msgid "Exit this QQ Qun"
 msgstr "G奪 ur denna QQ Qun"
 
+#: ../libpurple/protocols/qq/qq.c:582
+msgid "Block this buddy"
+msgstr "Blockera denna kompis"
+
 #. *< type
 #. *< ui_requirement
 #. *< flags
@@ -11573,387 +8298,383 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/qq/qq.c:731
-#: ../libgaim/protocols/qq/qq.c:733
+#: ../libpurple/protocols/qq/qq.c:723 ../libpurple/protocols/qq/qq.c:725
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ protokoll\tmodul"
 
-#: ../libgaim/protocols/qq/qq.c:752
+#: ../libpurple/protocols/qq/qq.c:750
 msgid "Login in TCP"
 msgstr "Logga in med TCP"
 
-#: ../libgaim/protocols/qq/qq.c:755
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Login Hidden"
 msgstr "Inloggning dold"
 
-#: ../libgaim/protocols/qq/qq_proxy.c:494
+#: ../libpurple/protocols/qq/qq_proxy.c:497
 msgid "Socket send error"
 msgstr "Uttagss辰ndningsfel"
 
-#: ../libgaim/protocols/qq/qq_proxy.c:497
+#: ../libpurple/protocols/qq/qq_proxy.c:500
 msgid "Connection refused"
 msgstr "Anslutningen nekades"
 
-#: ../libgaim/protocols/qq/recv_core.c:309
+#: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
 msgstr "Uttag-fel"
 
-#: ../libgaim/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:319
 msgid "Unable to read from socket"
 msgstr "Kan inte l辰sa fr奪n uttag"
 
-#: ../libgaim/protocols/qq/send_file.c:706
+#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d har har nekat filen %s"
 
-#: ../libgaim/protocols/qq/send_file.c:709
-#: ../libgaim/protocols/qq/send_file.c:738
+#: ../libpurple/protocols/qq/send_file.c:710
+#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "Fils辰ndning"
 
-#: ../libgaim/protocols/qq/send_file.c:735
+#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d avbr旦t 旦verf旦ringen av %s"
 
-#: ../libgaim/protocols/qq/sendqueue.c:136
-msgid "Communication timed out"
-msgstr "Kommunicationen tog f旦r l奪ng tid"
-
-#: ../libgaim/protocols/qq/sendqueue.c:137
-msgid "Try again"
-msgstr "F旦rs旦k igen"
-
-#: ../libgaim/protocols/qq/sendqueue.c:182
+#: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "Anslutningen tappades"
 
-#. cancel logging progress
-#: ../libgaim/protocols/qq/sendqueue.c:190
+#. cancel login progress
+#: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "Inloggningen misslyckades, inget svar"
 
-#: ../libgaim/protocols/qq/sendqueue.c:195
-msgid "Your attempt to update your info has timed out. Send the information again?"
-msgstr "Ditt f旦rs旦k att uppdatera din information tog f旦r l奪ng tid. S辰nda informationen igen?"
-
-#: ../libgaim/protocols/qq/sendqueue.c:199
-msgid "Your attempt to view a user's info has timed out. Try again?"
-msgstr "Ditt f旦rs旦k att visa en anv辰ndares information tog f旦r l奪ng tid. F旦rs旦k igen?"
-
-#: ../libgaim/protocols/qq/sendqueue.c:203
-#: ../libgaim/protocols/qq/sendqueue.c:211
-msgid "Your attempt to add a buddy has timed out. Try again?"
-msgstr "Ditt f旦rs旦k att l辰gga till en kompis tog f旦r l奪ng tid. F旦rs旦k igen?"
-
-#: ../libgaim/protocols/qq/sendqueue.c:207
-msgid "Your attempt to remove a buddy has timed out. Try again?"
-msgstr "Ditt f旦rs旦k att ta bort en kompis tog f旦r l奪ng tid. F旦rs旦k igen?"
-
-#: ../libgaim/protocols/qq/sendqueue.c:215
-msgid "Your attempt to change your online status has timed out. Send the information again?"
-msgstr "Ditt f旦rs旦k att 辰ndra din anslutningsstatus tog f旦r l奪ng tid. Send informationen igen?"
-
-#: ../libgaim/protocols/qq/sendqueue.c:219
-msgid "Your attempt to send an IM has timed out. Send it again?"
-msgstr "Ditt f旦rs旦k att s辰nda ett meddelande tog f旦r l奪ng tid. S辰nd det igen?"
-
-#: ../libgaim/protocols/qq/sendqueue.c:223
-msgid "Your request for a file transfer key has timed out. Request it again?"
-msgstr "Din f旦rfr奪gan efter fil旦verf旦ringsnyckel tog f旦r l奪ng tid. Skicka f旦rfr奪gan p奪 nytt?"
-
-#: ../libgaim/protocols/qq/sys_msg.c:103
+#: ../libpurple/protocols/qq/sys_msg.c:112
 msgid "Do you wanna add this buddy?"
 msgstr "Vill du l辰gga till den h辰r kompisen?"
 
 #. only need to get value
-#: ../libgaim/protocols/qq/sys_msg.c:155
+#: ../libpurple/protocols/qq/sys_msg.c:168
 #, c-format
 msgid "You have been added by %s"
 msgstr "Du har lagts till av %s"
 
-#: ../libgaim/protocols/qq/sys_msg.c:158
+#: ../libpurple/protocols/qq/sys_msg.c:171
 msgid "Would like to add him?"
 msgstr "Vill du l辰gga till honom?"
 
-#: ../libgaim/protocols/qq/sys_msg.c:164
+#: ../libpurple/protocols/qq/sys_msg.c:178
 #, c-format
 msgid "%s has added you [%s]"
 msgstr "%s har lagt till dig [%s]"
 
-#: ../libgaim/protocols/qq/sys_msg.c:179
+#: ../libpurple/protocols/qq/sys_msg.c:194
 #, c-format
 msgid "User %s rejected your request"
 msgstr "Anv辰ndaren %s avslog din f旦rfr奪gan"
 
-#: ../libgaim/protocols/qq/sys_msg.c:199
+#: ../libpurple/protocols/qq/sys_msg.c:214
 #, c-format
 msgid "User %s has approved your request"
 msgstr "Anv辰ndaren %s har godk辰nt din f旦rfr奪gan"
 
-#: ../libgaim/protocols/qq/sys_msg.c:222
+#. TODO: 'wanna' is not an appropriate word for this string. Fix after string freeze
+#. TODO: this should go through purple_account_request_authorization()
+#: ../libpurple/protocols/qq/sys_msg.c:241
 #, c-format
 msgid "%s wanna add you [%s] as friends"
 msgstr "%s vill l辰gga till dig [%s] som v辰nner"
 
-#: ../libgaim/protocols/qq/sys_msg.c:223
+#: ../libpurple/protocols/qq/sys_msg.c:242
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: ../libgaim/protocols/qq/sys_msg.c:244
+#: ../libpurple/protocols/qq/sys_msg.c:264
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s finns inte p奪 din kompislista"
 
-#: ../libgaim/protocols/qq/sys_msg.c:246
+#: ../libpurple/protocols/qq/sys_msg.c:266
 msgid "Would you like to add him?"
 msgstr "Vill du l辰gga till honom?"
 
-#: ../libgaim/protocols/sametime/sametime.c:417
+#: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Anslutningen st辰ngd (skrivande)"
 
-#: ../libgaim/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1290
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Grupptitel:</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 "<b>Notes gruppID:</b> %s<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "Info for Group %s"
 msgstr "Information om gruppen %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
 msgstr "Notes adressboksinformation"
 
-#: ../libgaim/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
 msgstr "Bjud in grupp till konferensen..."
 
-#: ../libgaim/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
 msgstr "H辰mta Notes adressboksinformation"
 
-#: ../libgaim/protocols/sametime/sametime.c:1498
+#: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
 msgstr "Skickar handskakning"
 
-#: ../libgaim/protocols/sametime/sametime.c:1503
+#: ../libpurple/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "V辰ntar p奪 bekr辰ftelse av handskakning"
 
-#: ../libgaim/protocols/sametime/sametime.c:1508
+#: ../libpurple/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Handskakning bekr辰ftad, s辰nder inloggning"
 
-#: ../libgaim/protocols/sametime/sametime.c:1513
+#: ../libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
 msgstr "V辰ntar p奪 bekr辰ftelse av inloggning"
 
-#: ../libgaim/protocols/sametime/sametime.c:1518
+#: ../libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
 msgstr "Anslutningen vidarebefordrad"
 
-#: ../libgaim/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
 msgstr "Tvingar inloggning"
 
-#: ../libgaim/protocols/sametime/sametime.c:1528
+#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
 msgstr "Inloggning bekr辰ftad"
 
-#: ../libgaim/protocols/sametime/sametime.c:1533
+#: ../libpurple/protocols/sametime/sametime.c:1539
 msgid "Starting Services"
 msgstr "Startar tj辰nster"
 
-#: ../libgaim/protocols/sametime/sametime.c:1538
+#: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../libgaim/protocols/sametime/sametime.c:1636
-#, c-format
-msgid "A Sametime administrator has issued the following announcement on server %s"
-msgstr "En Sametimeadministrat旦r har placerat f旦ljande meddelande p奪 servern %s"
-
-#: ../libgaim/protocols/sametime/sametime.c:1641
+#: ../libpurple/protocols/sametime/sametime.c:1645
+#, c-format
+msgid ""
+"A Sametime administrator has issued the following announcement on server %s"
+msgstr ""
+"En Sametimeadministrat旦r har placerat f旦ljande meddelande p奪 servern %s"
+
+#: ../libpurple/protocols/sametime/sametime.c:1650
 msgid "Sametime Administrator Announcement"
 msgstr "Sametimeadministrat旦rannonsering"
 
-#: ../libgaim/protocols/sametime/sametime.c:1693
+#: ../libpurple/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
 msgstr "Anslutningen nollst辰lld"
 
-#: ../libgaim/protocols/sametime/sametime.c:1700
+#: ../libpurple/protocols/sametime/sametime.c:1709
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Fel vid l辰sning av fr奪n uttag %s"
 
 #. this is a regular connect, error out
-#: ../libgaim/protocols/sametime/sametime.c:1723
-#: ../libgaim/protocols/sametime/sametime.c:3734
+#: ../libpurple/protocols/sametime/sametime.c:1732
+#: ../libpurple/protocols/sametime/sametime.c:3727
 msgid "Unable to connect to host"
 msgstr "Kan inte ansluta till v辰rd"
 
-#: ../libgaim/protocols/sametime/sametime.c:1761
+#: ../libpurple/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
 msgstr "Utskick fr奪n %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:1935
+#: ../libpurple/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
 msgstr "Konferansen 辰r st辰ngd"
 
-#: ../libgaim/protocols/sametime/sametime.c:2392
+#: ../libpurple/protocols/sametime/sametime.c:2403
 msgid "Unable to send message: "
 msgstr "Kan inte skicka meddelande: "
 
-#: ../libgaim/protocols/sametime/sametime.c:2949
+#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "Platsen 辰r st辰ngd"
 
-#: ../libgaim/protocols/sametime/sametime.c:3240
+#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../libgaim/protocols/sametime/sametime.c:3241
+#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Speakers"
 msgstr "H旦gtalare"
 
-#: ../libgaim/protocols/sametime/sametime.c:3242
+#: ../libpurple/protocols/sametime/sametime.c:3232
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libgaim/protocols/sametime/sametime.c:3246
+#: ../libpurple/protocols/sametime/sametime.c:3236
 msgid "File Transfer"
 msgstr "Fil旦verf旦ringar"
 
-#: ../libgaim/protocols/sametime/sametime.c:3280
-#: ../libgaim/protocols/sametime/sametime.c:4154
+#: ../libpurple/protocols/sametime/sametime.c:3270
+#: ../libpurple/protocols/sametime/sametime.c:4146
 msgid "Supports"
 msgstr "St旦djer"
 
-#: ../libgaim/protocols/sametime/sametime.c:3285
-#: ../libgaim/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/sametime/sametime.c:3275
+#: ../libpurple/protocols/sametime/sametime.c:4120
 msgid "External User"
 msgstr "Extern anv辰ndare"
 
-#: ../libgaim/protocols/sametime/sametime.c:3391
+#: ../libpurple/protocols/sametime/sametime.c:3381
 msgid "Create conference with user"
 msgstr "Skapa konferens med anv辰ndare"
 
-#: ../libgaim/protocols/sametime/sametime.c:3392
-#, c-format
-msgid "Please enter a topic for the new conference, and an invitation message to be sent to %s"
-msgstr "Var god ange ett nytt 辰mne f旦r den nya konferensen, och en inbjudan att skicka till %s"
-
-#: ../libgaim/protocols/sametime/sametime.c:3396
+#: ../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 ""
+"Var god ange ett nytt 辰mne f旦r den nya konferensen, och en inbjudan att "
+"skicka till %s"
+
+#: ../libpurple/protocols/sametime/sametime.c:3386
 msgid "New Conference"
 msgstr "Ny konferens"
 
-#: ../libgaim/protocols/sametime/sametime.c:3398
+#: ../libpurple/protocols/sametime/sametime.c:3388
 msgid "Create"
 msgstr "Skapa"
 
-#: ../libgaim/protocols/sametime/sametime.c:3462
+#: ../libpurple/protocols/sametime/sametime.c:3453
 msgid "Available Conferences"
 msgstr "Tillg辰ngliga konferenser"
 
-#: ../libgaim/protocols/sametime/sametime.c:3468
+#: ../libpurple/protocols/sametime/sametime.c:3459
 msgid "Create New Conference..."
 msgstr "Skapa ny konferens..."
 
-#: ../libgaim/protocols/sametime/sametime.c:3475
+#: ../libpurple/protocols/sametime/sametime.c:3466
 msgid "Invite user to a conference"
 msgstr "Bjud in anv辰ndaren till en konferens"
 
-#: ../libgaim/protocols/sametime/sametime.c:3476
-#, c-format
-msgid "Select a conference from the list below to send an invite to user %s. Select \"Create New Conference\" if you'd like to create a new conference to invite this user to."
-msgstr "V辰lj en konferens fr奪n listan h辰r under f旦r att skicka en inbjudan till anv辰ndaren %s. V辰lj \"Skapa ny konferens\" om du vill skapa en ny konferens att bjuda in anv辰ndaren till."
-
-#: ../libgaim/protocols/sametime/sametime.c:3481
+#: ../libpurple/protocols/sametime/sametime.c:3467
+#, c-format
+msgid ""
+"Select a conference from the list below to send an invite to user %s. Select "
+"\"Create New Conference\" if you'd like to create a new conference to invite "
+"this user to."
+msgstr ""
+"V辰lj en konferens fr奪n listan h辰r under f旦r att skicka en inbjudan till "
+"anv辰ndaren %s. V辰lj \"Skapa ny konferens\" om du vill skapa en ny konferens "
+"att bjuda in anv辰ndaren till."
+
+#: ../libpurple/protocols/sametime/sametime.c:3472
 msgid "Invite to Conference"
 msgstr "Bjud in till konferens"
 
-#: ../libgaim/protocols/sametime/sametime.c:3571
+#: ../libpurple/protocols/sametime/sametime.c:3563
 msgid "Invite to Conference..."
 msgstr "Bjud in till konferens..."
 
-#: ../libgaim/protocols/sametime/sametime.c:3576
+#: ../libpurple/protocols/sametime/sametime.c:3568
 msgid "Send TEST Announcement"
 msgstr "Skicka TEST-annonsering"
 
-#: ../libgaim/protocols/sametime/sametime.c:3623
+#: ../libpurple/protocols/sametime/sametime.c:3587 ../pidgin/gtkconv.c:4286
+msgid "Topic:"
+msgstr "�mne:"
+
+#: ../libpurple/protocols/sametime/sametime.c:3615
 msgid "No Sametime Community Server specified"
 msgstr "Ingen Sametime communityserver specificerad"
 
-#: ../libgaim/protocols/sametime/sametime.c:3645
-#, 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 "Ingen v辰rd eller IP har konfigurerats f旦r ditt Meanwhile-konto %s. Var god ange en nedan f旦r att forts辰tta inloggningen."
-
-#: ../libgaim/protocols/sametime/sametime.c:3650
+#: ../libpurple/protocols/sametime/sametime.c:3637
+#, 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 ""
+"Ingen v辰rd eller IP har konfigurerats f旦r ditt Meanwhile-konto %s. Var god "
+"ange en nedan f旦r att forts辰tta inloggningen."
+
+#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile anslutningsinst辰llningar"
 
-#: ../libgaim/protocols/sametime/sametime.c:3651
+#: ../libpurple/protocols/sametime/sametime.c:3643
 msgid "No Sametime Community Server Specified"
 msgstr "Ingen Sametime communityserver specificerad"
 
-#: ../libgaim/protocols/sametime/sametime.c:4144
+#: ../libpurple/protocols/sametime/sametime.c:3645 ../pidgin/gtkblist.c:4015
+msgid "Connect"
+msgstr "Anslut"
+
+#: ../libpurple/protocols/sametime/sametime.c:4136
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Ok辰nd (0x%04x)<br>"
 
-#: ../libgaim/protocols/sametime/sametime.c:4146
+#: ../libpurple/protocols/sametime/sametime.c:4138
 msgid "Last Known Client"
 msgstr "Senast k辰nda klient"
 
-#: ../libgaim/protocols/sametime/sametime.c:4310
-#: ../libgaim/protocols/sametime/sametime.c:5502
+#: ../libpurple/protocols/sametime/sametime.c:4302
+#: ../libpurple/protocols/sametime/sametime.c:5507
 msgid "User Name"
 msgstr "Anv辰ndarnamn"
 
-#: ../libgaim/protocols/sametime/sametime.c:4313
-#: ../libgaim/protocols/sametime/sametime.c:5505
+#: ../libpurple/protocols/sametime/sametime.c:4305
+#: ../libpurple/protocols/sametime/sametime.c:5510
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libgaim/protocols/sametime/sametime.c:4337
+#: ../libpurple/protocols/sametime/sametime.c:4329
 msgid "An ambiguous user ID was entered"
 msgstr "Ett sv奪rf旦rst奪ligt anv辰ndarid angavs"
 
-#: ../libgaim/protocols/sametime/sametime.c:4338
-#, 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 "Identifieraren '%s' kan referera till f旦ljande anv辰ndare. Var god v辰lj r辰tt anv辰ndare f旦r att l辰gga till dem p奪 din kompislista."
-
-#: ../libgaim/protocols/sametime/sametime.c:4343
+#: ../libpurple/protocols/sametime/sametime.c:4330
+#, 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 ""
+"Identifieraren '%s' kan referera till f旦ljande anv辰ndare. Var god v辰lj r辰tt "
+"anv辰ndare f旦r att l辰gga till dem p奪 din kompislista."
+
+#: ../libpurple/protocols/sametime/sametime.c:4335
 msgid "Select User"
 msgstr "V辰lj anv辰ndare"
 
-#: ../libgaim/protocols/sametime/sametime.c:4427
+#: ../libpurple/protocols/sametime/sametime.c:4419
 msgid "Unable to add user: user not found"
 msgstr "Kan inte l辰gga till anv辰ndaren: anv辰ndaren ej funnen"
 
-#: ../libgaim/protocols/sametime/sametime.c:4429
-#, 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 "Identifieraren '%s' matchar inte n奪gon i din Sametime community. DDDDenna post har blivit borttagen fr奪n din kompislista."
-
-#: ../libgaim/protocols/sametime/sametime.c:4434
+#: ../libpurple/protocols/sametime/sametime.c:4421
+#, 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 ""
+"Identifieraren '%s' matchar inte n奪gon i din Sametime community. DDDDenna "
+"post har blivit borttagen fr奪n din kompislista."
+
+#: ../libpurple/protocols/sametime/sametime.c:4426
 msgid "Unable to add user"
 msgstr "Kan inte l辰gga till anv辰ndaren"
 
-#: ../libgaim/protocols/sametime/sametime.c:5020
+#: ../libpurple/protocols/sametime/sametime.c:5012
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -11962,208 +8683,267 @@
 "Fel vid l辰sning av %s:\n"
 "%s.\n"
 
-#: ../libgaim/protocols/sametime/sametime.c:5152
+#: ../libpurple/protocols/sametime/sametime.c:5147
 msgid "Remotely Stored Buddy List"
 msgstr "Fj辰rrlagrad kompislista"
 
-#: ../libgaim/protocols/sametime/sametime.c:5157
+#: ../libpurple/protocols/sametime/sametime.c:5152
 msgid "Buddy List Storage Mode"
 msgstr "Lagringsl辰ge f旦r kompislista"
 
-#: ../libgaim/protocols/sametime/sametime.c:5160
+#: ../libpurple/protocols/sametime/sametime.c:5155
 msgid "Local Buddy List Only"
 msgstr "Lokal kompislista enbart"
 
-#: ../libgaim/protocols/sametime/sametime.c:5162
+#: ../libpurple/protocols/sametime/sametime.c:5157
 msgid "Merge List from Server"
 msgstr "Sl奪 ihop lista fr奪n server"
 
-#: ../libgaim/protocols/sametime/sametime.c:5164
+#: ../libpurple/protocols/sametime/sametime.c:5159
 msgid "Merge and Save List to Server"
 msgstr "Sl奪 ihop och lagra listan p奪 server"
 
-#: ../libgaim/protocols/sametime/sametime.c:5166
+#: ../libpurple/protocols/sametime/sametime.c:5161
 msgid "Synchronize List with Server"
 msgstr "Synkronizera listan med servern"
 
-#: ../libgaim/protocols/sametime/sametime.c:5215
+#: ../libpurple/protocols/sametime/sametime.c:5216
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importera Sametimelista f旦r kontot %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:5254
+#: ../libpurple/protocols/sametime/sametime.c:5256
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportera Sametimelista f旦r kontot %s"
 
-#: ../libgaim/protocols/sametime/sametime.c:5307
+#: ../libpurple/protocols/sametime/sametime.c:5310
 msgid "Unable to add group: group exists"
 msgstr "Kunde inte l辰gga till gruppen: gruppen existerar redan"
 
-#: ../libgaim/protocols/sametime/sametime.c:5308
+#: ../libpurple/protocols/sametime/sametime.c:5311
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "En grupp vid namn '%s' finns redan i din kompislista."
 
-#: ../libgaim/protocols/sametime/sametime.c:5311
-#: ../libgaim/protocols/sametime/sametime.c:5440
+#: ../libpurple/protocols/sametime/sametime.c:5314
+#: ../libpurple/protocols/sametime/sametime.c:5444
 msgid "Unable to add group"
 msgstr "Kan inte l辰gga till grupp"
 
-#: ../libgaim/protocols/sametime/sametime.c:5370
+#: ../libpurple/protocols/sametime/sametime.c:5373
 msgid "Possible Matches"
 msgstr "M旦jliga matchningar"
 
-#: ../libgaim/protocols/sametime/sametime.c:5386
+#: ../libpurple/protocols/sametime/sametime.c:5389
 msgid "Notes Address Book group results"
 msgstr "Notes adressboksgruppresultat"
 
-#: ../libgaim/protocols/sametime/sametime.c:5387
-#, c-format
-msgid "The identifier '%s' may possibly refer to any of the following Notes Address Book groups. Please select the correct group from the list below to add it to your buddy list."
-msgstr "Identifieraren '%s' kan m旦jligen referera till n奪gon av f旦ljande Notes adressb旦cksgrupper. Var god v辰lj den korrekta gruppen fr奪n listan h辰r nedan f旦r att l辰gga till den till din kompislista."
-
-#: ../libgaim/protocols/sametime/sametime.c:5392
+#: ../libpurple/protocols/sametime/sametime.c:5390
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following Notes Address "
+"Book groups. Please select the correct group from the list below to add it "
+"to your buddy list."
+msgstr ""
+"Identifieraren '%s' kan m旦jligen referera till n奪gon av f旦ljande Notes "
+"adressb旦cksgrupper. Var god v辰lj den korrekta gruppen fr奪n listan h辰r nedan "
+"f旦r att l辰gga till den till din kompislista."
+
+#: ../libpurple/protocols/sametime/sametime.c:5395
 msgid "Select Notes Address Book"
 msgstr "V辰lj Notes adressbok"
 
-#: ../libgaim/protocols/sametime/sametime.c:5434
+#: ../libpurple/protocols/sametime/sametime.c:5438
 msgid "Unable to add group: group not found"
 msgstr "Kunde inte l辰gga till grupp: gruppen ej funnen"
 
-#: ../libgaim/protocols/sametime/sametime.c:5436
-#, c-format
-msgid "The identifier '%s' did not match any Notes Address Book groups in your Sametime community."
-msgstr "Identidieraren '%s' matchade inte n奪gon Notes adressb旦cksgrupper i din Sametime-community."
-
-#: ../libgaim/protocols/sametime/sametime.c:5477
+#: ../libpurple/protocols/sametime/sametime.c:5440
+#, c-format
+msgid ""
+"The identifier '%s' did not match any Notes Address Book groups in your "
+"Sametime community."
+msgstr ""
+"Identidieraren '%s' matchade inte n奪gon Notes adressb旦cksgrupper i din "
+"Sametime-community."
+
+#: ../libpurple/protocols/sametime/sametime.c:5481
 msgid "Notes Address Book Group"
 msgstr "Notes adressboksgrupp"
 
-#: ../libgaim/protocols/sametime/sametime.c:5478
-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 "Ange namnet p奪 en Notes adressboksgrupp i f辰ltet nedan f旦r att l辰gga till gruppen och dess medlemmar till din kompislista."
-
-#: ../libgaim/protocols/sametime/sametime.c:5526
+#: ../libpurple/protocols/sametime/sametime.c:5482
+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 ""
+"Ange namnet p奪 en Notes adressboksgrupp i f辰ltet nedan f旦r att l辰gga till "
+"gruppen och dess medlemmar till din kompislista."
+
+#: ../libpurple/protocols/sametime/sametime.c:5531
 #, c-format
 msgid "Search results for '%s'"
 msgstr "S旦kresultat f旦r '%s'"
 
-#: ../libgaim/protocols/sametime/sametime.c:5527
-#, c-format
-msgid "The identifier '%s' may possibly refer to any of the following users. You may add these users to your buddy list or send them messages with the action buttons below."
-msgstr "Identifieraren '%s' kan referera till f旦ljande anv辰ndare. Du kan l辰gga till dessa anv辰ndare till din kompislista eller skicka meddelande till dem med hj辰lp av knapparna h辰r nedanf旦r."
-
-#: ../libgaim/protocols/sametime/sametime.c:5559
+#: ../libpurple/protocols/sametime/sametime.c:5532
+#, c-format
+msgid ""
+"The identifier '%s' may possibly refer to any of the following users. You "
+"may add these users to your buddy list or send them messages with the action "
+"buttons below."
+msgstr ""
+"Identifieraren '%s' kan referera till f旦ljande anv辰ndare. Du kan l辰gga till "
+"dessa anv辰ndare till din kompislista eller skicka meddelande till dem med "
+"hj辰lp av knapparna h辰r nedanf旦r."
+
+#. Create the window
+#: ../libpurple/protocols/sametime/sametime.c:5539 ../pidgin/gtknotify.c:718
+msgid "Search Results"
+msgstr "S旦kresultat"
+
+#: ../libpurple/protocols/sametime/sametime.c:5564
 msgid "No matches"
 msgstr "Ingen tr辰ff"
 
-#: ../libgaim/protocols/sametime/sametime.c:5560
+#: ../libpurple/protocols/sametime/sametime.c:5565
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "Identifieraren '%s' matchar inte n奪gon i din Sametime community."
 
-#: ../libgaim/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5569
 msgid "No Matches"
 msgstr "Ingen tr辰ff"
 
-#: ../libgaim/protocols/sametime/sametime.c:5601
+#: ../libpurple/protocols/sametime/sametime.c:5606
 msgid "Search for a user"
 msgstr "S旦k efter en anv辰ndare"
 
-#: ../libgaim/protocols/sametime/sametime.c:5602
-msgid "Enter a name or partial ID in the field below to search for matching users in your Sametime community."
-msgstr "Ange ett namn eller del av ID i f辰ltet nedan f旦r att s旦ka efter matchande anv辰ndare i sin Sametime-community."
-
-#: ../libgaim/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5607
+msgid ""
+"Enter a name or partial ID in the field below to search for matching users "
+"in your Sametime community."
+msgstr ""
+"Ange ett namn eller del av ID i f辰ltet nedan f旦r att s旦ka efter matchande "
+"anv辰ndare i sin Sametime-community."
+
+#: ../libpurple/protocols/sametime/sametime.c:5610
 msgid "User Search"
 msgstr "Anv辰ndars旦kning"
 
-#: ../libgaim/protocols/sametime/sametime.c:5617
+#: ../libpurple/protocols/sametime/sametime.c:5623
 msgid "Import Sametime List..."
 msgstr "Importera Sametime lista..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5621
+#: ../libpurple/protocols/sametime/sametime.c:5627
 msgid "Export Sametime List..."
 msgstr "Exportera Sametime lista..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5625
+#: ../libpurple/protocols/sametime/sametime.c:5631
 msgid "Add Notes Address Book Group..."
 msgstr "L辰gg till Notes adressboksgrupp..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5629
+#: ../libpurple/protocols/sametime/sametime.c:5635
 msgid "User Search..."
 msgstr "Anv辰ndars旦kning..."
 
-#: ../libgaim/protocols/sametime/sametime.c:5726
+#: ../libpurple/protocols/sametime/sametime.c:5741
 msgid "Force login (ignore server redirects)"
 msgstr "Tvinga inloggning (ignorera server-vidarebefodringar)"
 
 #. pretend to be Sametime Connect
-#: ../libgaim/protocols/sametime/sametime.c:5736
+#: ../libpurple/protocols/sametime/sametime.c:5751
 msgid "Hide client identity"
 msgstr "G旦m klientidentitet"
 
-#: ../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:410
+#: ../libpurple/protocols/silc/buddy.c:538
+#: ../libpurple/protocols/silc/buddy.c:700
+#: ../libpurple/protocols/silc/ft.c:423
+#: ../libpurple/protocols/silc10/buddy.c:52
+#: ../libpurple/protocols/silc10/buddy.c:421
+#: ../libpurple/protocols/silc10/buddy.c:546
+#: ../libpurple/protocols/silc10/buddy.c:712
+#: ../libpurple/protocols/silc10/ft.c:338
 #, c-format
 msgid "User %s is not present in the network"
 msgstr "Anv辰ndare %s finns inte p奪 n辰tverket"
 
-#: ../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:110
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc/buddy.c:119
+#: ../libpurple/protocols/silc/buddy.c:124
+#: ../libpurple/protocols/silc/buddy.c:129
+#: ../libpurple/protocols/silc/buddy.c:134
+#: ../libpurple/protocols/silc/buddy.c:254
+#: ../libpurple/protocols/silc10/buddy.c:53
+#: ../libpurple/protocols/silc10/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:124
+#: ../libpurple/protocols/silc10/buddy.c:129
+#: ../libpurple/protocols/silc10/buddy.c:134
+#: ../libpurple/protocols/silc10/buddy.c:139
+#: ../libpurple/protocols/silc10/buddy.c:257
 msgid "Key Agreement"
 msgstr "Nyckel旦verenskommelse"
 
-#: ../libgaim/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc/buddy.c:54
+#: ../libpurple/protocols/silc10/buddy.c:54
 msgid "Cannot perform the key agreement"
 msgstr "Kan inte utf旦ra nyckel旦verenskommelse"
 
-#: ../libgaim/protocols/silc/buddy.c:116
+#: ../libpurple/protocols/silc/buddy.c:111
+#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Fel uppstod under nyckel旦verenskommelse"
 
-#: ../libgaim/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc/buddy.c:115
+#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Nyckel旦verenskommelsen misslyckades"
 
-#: ../libgaim/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc/buddy.c:120
+#: ../libpurple/protocols/silc10/buddy.c:125
 msgid "Timeout during key agreement"
 msgstr "Tiden tog slut f旦r nyckel旦verenskommelse"
 
-#: ../libgaim/protocols/silc/buddy.c:130
+#: ../libpurple/protocols/silc/buddy.c:125
+#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Nyckel旦verenskommelsen var avbruten"
 
-#: ../libgaim/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc/buddy.c:130
+#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Nyckel旦verenskommelse har redan startats"
 
-#: ../libgaim/protocols/silc/buddy.c:140
+#: ../libpurple/protocols/silc/buddy.c:135
+#: ../libpurple/protocols/silc10/buddy.c:140
 msgid "Key agreement cannot be started with yourself"
 msgstr "Du kan inte starta en nyckel旦verenskommelse med dig sj辰lv"
 
-#: ../libgaim/protocols/silc/buddy.c:258
-#: ../libgaim/protocols/silc/buddy.c:388
-#: ../libgaim/protocols/silc/buddy.c:513
+#: ../libpurple/protocols/silc/buddy.c:255
+#: ../libpurple/protocols/silc/buddy.c:383
+#: ../libpurple/protocols/silc/buddy.c:497
+#: ../libpurple/protocols/silc/buddy.c:508
+#: ../libpurple/protocols/silc10/buddy.c:258
+#: ../libpurple/protocols/silc10/buddy.c:389
+#: ../libpurple/protocols/silc10/buddy.c:514
 msgid "The remote user is not present in the network any more"
 msgstr "Fj辰rranv辰ndaren 辰r inte tillg辰nglig p奪 n辰tverket l辰ngre"
 
-#: ../libgaim/protocols/silc/buddy.c:294
-#, c-format
-msgid "Key agreement request received from %s. Would you like to perform the key agreement?"
-msgstr "Nyckel旦verenskommelse mottagen fr奪n %s. Vill du utf旦ra en nyckel旦verenskommelse?"
-
-#: ../libgaim/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc/buddy.c:298
+#: ../libpurple/protocols/silc10/buddy.c:295
+#, c-format
+msgid ""
+"Key agreement request received from %s. Would you like to perform the key "
+"agreement?"
+msgstr ""
+"Nyckel旦verenskommelse mottagen fr奪n %s. Vill du utf旦ra en "
+"nyckel旦verenskommelse?"
+
+#: ../libpurple/protocols/silc/buddy.c:302
+#: ../libpurple/protocols/silc10/buddy.c:299
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -12174,671 +8954,923 @@
 "Fj辰rrdator: %s\n"
 "Fj辰rrport: %d"
 
-#: ../libgaim/protocols/silc/buddy.c:311
+#: ../libpurple/protocols/silc/buddy.c:315
+#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Nyckel旦verenskommelsef旦rfr奪gan"
 
-#: ../libgaim/protocols/silc/buddy.c:387
-#: ../libgaim/protocols/silc/buddy.c:422
-#: ../libgaim/protocols/silc/buddy.c:464
+#: ../libpurple/protocols/silc/buddy.c:382
+#: ../libpurple/protocols/silc/buddy.c:412
+#: ../libpurple/protocols/silc/buddy.c:452
+#: ../libpurple/protocols/silc10/buddy.c:388
+#: ../libpurple/protocols/silc10/buddy.c:423
+#: ../libpurple/protocols/silc10/buddy.c:465
 msgid "IM With Password"
 msgstr "IM med l旦senord"
 
-#: ../libgaim/protocols/silc/buddy.c:423
+#: ../libpurple/protocols/silc/buddy.c:413
+#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Kan inte s辰tta IM-nyckel"
 
-#: ../libgaim/protocols/silc/buddy.c:465
+#: ../libpurple/protocols/silc/buddy.c:453
+#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "S辰tt IM-l旦senord"
 
-#: ../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:496
+#: ../libpurple/protocols/silc/buddy.c:507
+#: ../libpurple/protocols/silc/buddy.c:540
+#: ../libpurple/protocols/silc/ops.c:1499
+#: ../libpurple/protocols/silc/ops.c:1510
+#: ../libpurple/protocols/silc10/buddy.c:513
+#: ../libpurple/protocols/silc10/buddy.c:548
+#: ../libpurple/protocols/silc10/ops.c:1494
+#: ../libpurple/protocols/silc10/ops.c:1505
 msgid "Get Public Key"
 msgstr "H辰mta publik nyckel"
 
-#: ../libgaim/protocols/silc/buddy.c:548
-#: ../libgaim/protocols/silc/ops.c:1495
-#: ../libgaim/protocols/silc/ops.c:1506
+#: ../libpurple/protocols/silc/buddy.c:541
+#: ../libpurple/protocols/silc/ops.c:1500
+#: ../libpurple/protocols/silc/ops.c:1511
+#: ../libpurple/protocols/silc10/buddy.c:549
+#: ../libpurple/protocols/silc10/ops.c:1495
+#: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
 msgstr "Kan inte h辰mta den publika nyckeln"
 
-#: ../libgaim/protocols/silc/buddy.c:634
-#: ../libgaim/protocols/silc/buddy.c:1647
+#: ../libpurple/protocols/silc/buddy.c:622
+#: ../libpurple/protocols/silc/buddy.c:1655
+#: ../libpurple/protocols/silc10/buddy.c:635
+#: ../libpurple/protocols/silc10/buddy.c:1654
 msgid "Show Public Key"
 msgstr "Visa publik nyckel"
 
-#: ../libgaim/protocols/silc/buddy.c:635
-#: ../libgaim/protocols/silc/buddy.c:1030
-#: ../libgaim/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc/buddy.c:623
+#: ../libpurple/protocols/silc/buddy.c:1027
+#: ../libpurple/protocols/silc/chat.c:237
+#: ../libpurple/protocols/silc10/buddy.c:636
+#: ../libpurple/protocols/silc10/buddy.c:1033
+#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Kunde inte ladda publik nyckel"
 
-#: ../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:701
+#: ../libpurple/protocols/silc/ops.c:1053
+#: ../libpurple/protocols/silc/ops.c:1168
+#: ../libpurple/protocols/silc/ops.c:1288
+#: ../libpurple/protocols/silc/ops.c:1289
+#: ../libpurple/protocols/silc/ops.c:1307
+#: ../libpurple/protocols/silc10/buddy.c:713
+#: ../libpurple/protocols/silc10/ops.c:1087
+#: ../libpurple/protocols/silc10/ops.c:1159
+#: ../libpurple/protocols/silc10/ops.c:1294
+#: ../libpurple/protocols/silc10/ops.c:1295
+#: ../libpurple/protocols/silc10/ops.c:1313
 msgid "User Information"
 msgstr "Anv辰ndarinformation"
 
-#: ../libgaim/protocols/silc/buddy.c:713
-#: ../libgaim/protocols/silc/ops.c:1160
-#: ../libgaim/protocols/silc/ops.c:1314
+#: ../libpurple/protocols/silc/buddy.c:702
+#: ../libpurple/protocols/silc/ops.c:1169
+#: ../libpurple/protocols/silc/ops.c:1308
+#: ../libpurple/protocols/silc10/buddy.c:714
+#: ../libpurple/protocols/silc10/ops.c:1160
+#: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
 msgstr "Kan inte h辰mta anv辰ndarinformationen"
 
-#: ../libgaim/protocols/silc/buddy.c:734
+#: ../libpurple/protocols/silc/buddy.c:723
+#: ../libpurple/protocols/silc10/buddy.c:735
 #, c-format
 msgid "The %s buddy is not trusted"
 msgstr "Kompisen %s 辰r inte tillitsfull"
 
-#: ../libgaim/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 "Du kan inte ta emot kompisnotifiering f旦rr辰n du har importerat dennes publika nyckel. Du kan anv辰nda \"H辰mta publik nyckel\"-kommandot f旦r att f奪 den."
+#: ../libpurple/protocols/silc/buddy.c:726
+#: ../libpurple/protocols/silc10/buddy.c:738
+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 ""
+"Du kan inte ta emot kompisnotifiering f旦rr辰n du har importerat dennes "
+"publika nyckel. Du kan anv辰nda \"H辰mta publik nyckel\"-kommandot f旦r att f奪 "
+"den."
 
 #. Open file selector to select the public key.
-#: ../libgaim/protocols/silc/buddy.c:1064
+#: ../libpurple/protocols/silc/buddy.c:1059
+#: ../libpurple/protocols/silc10/buddy.c:1067
 msgid "Open..."
 msgstr "�ppna..."
 
-#: ../libgaim/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc/buddy.c:1070
+#: ../libpurple/protocols/silc10/buddy.c:1078
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "%s kompisen辰r inte tillg辰nglig p奪 n辰tverket"
 
-#: ../libgaim/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 "F旦r att l辰gga till kompisen m奪ste du importera dennes publika nyckel. Tryck p奪 \"importera\" f旦r att importera publik nyckel."
-
-#: ../libgaim/protocols/silc/buddy.c:1079
+#: ../libpurple/protocols/silc/buddy.c:1073
+#: ../libpurple/protocols/silc10/buddy.c:1081
+msgid ""
+"To add the buddy you must import his/her public key. Press Import to import "
+"a public key."
+msgstr ""
+"F旦r att l辰gga till kompisen m奪ste du importera dennes publika nyckel. Tryck "
+"p奪 \"importera\" f旦r att importera publik nyckel."
+
+#: ../libpurple/protocols/silc/buddy.c:1077
+#: ../libpurple/protocols/silc10/buddy.c:1085
 msgid "_Import..."
 msgstr "_Importera..."
 
-#: ../libgaim/protocols/silc/buddy.c:1175
+#: ../libpurple/protocols/silc/buddy.c:1183
+#: ../libpurple/protocols/silc10/buddy.c:1181
 msgid "Select correct user"
 msgstr "V辰lj r辰tt anv辰ndare"
 
-#: ../libgaim/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 "Mer 辰n en anv辰ndare hittades med samma publika nyckel. V辰lj r辰tt anv辰ndare fr奪n listan f旦r att l辰gga till denne till kompislistan."
-
-#: ../libgaim/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 "Mer 辰n en anv辰ndare hittades med samma namn. V辰lj r辰tt anv辰ndare fr奪n listan f旦r att l辰gga till denne till kompislistan."
-
-#: ../libgaim/protocols/silc/buddy.c:1467
+#: ../libpurple/protocols/silc/buddy.c:1185
+#: ../libpurple/protocols/silc10/buddy.c:1183
+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 ""
+"Mer 辰n en anv辰ndare hittades med samma publika nyckel. V辰lj r辰tt anv辰ndare "
+"fr奪n listan f旦r att l辰gga till denne till kompislistan."
+
+#: ../libpurple/protocols/silc/buddy.c:1187
+#: ../libpurple/protocols/silc10/buddy.c:1185
+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 ""
+"Mer 辰n en anv辰ndare hittades med samma namn. V辰lj r辰tt anv辰ndare fr奪n listan "
+"f旦r att l辰gga till denne till kompislistan."
+
+#: ../libpurple/protocols/silc/buddy.c:1474
+#: ../libpurple/protocols/silc10/buddy.c:1474
 msgid "Detached"
 msgstr "Fr奪nskild"
 
-#: ../libgaim/protocols/silc/buddy.c:1471
-#: ../libgaim/protocols/silc/silc.c:55
+#: ../libpurple/protocols/silc/buddy.c:1478
+#: ../libpurple/protocols/silc/silc.c:58
+#: ../libpurple/protocols/silc10/buddy.c:1478
+#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Otillg辰nglig"
 
-#: ../libgaim/protocols/silc/buddy.c:1475
-#: ../libgaim/protocols/silc/silc.c:57
+#: ../libpurple/protocols/silc/buddy.c:1482
+#: ../libpurple/protocols/silc/silc.c:60
+#: ../libpurple/protocols/silc10/buddy.c:1482
+#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "V辰ck mig"
 
-#: ../libgaim/protocols/silc/buddy.c:1477
-#: ../libgaim/protocols/silc/silc.c:49
+#: ../libpurple/protocols/silc/buddy.c:1484
+#: ../libpurple/protocols/silc/silc.c:52
+#: ../libpurple/protocols/silc10/buddy.c:1484
+#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hyperaktiv"
 
-#: ../libgaim/protocols/silc/buddy.c:1479
+#: ../libpurple/protocols/silc/buddy.c:1486
+#: ../libpurple/protocols/silc10/buddy.c:1486
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libgaim/protocols/silc/buddy.c:1486
-#: ../libgaim/protocols/silc/silc.c:668
-#: ../libgaim/protocols/silc/util.c:514
+#: ../libpurple/protocols/silc/buddy.c:1493
+#: ../libpurple/protocols/silc/silc.c:743
+#: ../libpurple/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc10/buddy.c:1493
+#: ../libpurple/protocols/silc10/silc.c:654
+#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Glad"
 
-#: ../libgaim/protocols/silc/buddy.c:1488
-#: ../libgaim/protocols/silc/silc.c:670
-#: ../libgaim/protocols/silc/util.c:516
+#: ../libpurple/protocols/silc/buddy.c:1495
+#: ../libpurple/protocols/silc/silc.c:745
+#: ../libpurple/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc10/buddy.c:1495
+#: ../libpurple/protocols/silc10/silc.c:656
+#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Ledsen"
 
-#: ../libgaim/protocols/silc/buddy.c:1490
-#: ../libgaim/protocols/silc/silc.c:672
-#: ../libgaim/protocols/silc/util.c:518
+#: ../libpurple/protocols/silc/buddy.c:1497
+#: ../libpurple/protocols/silc/silc.c:747
+#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc10/buddy.c:1497
+#: ../libpurple/protocols/silc10/silc.c:658
+#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Arg"
 
-#: ../libgaim/protocols/silc/buddy.c:1492
-#: ../libgaim/protocols/silc/silc.c:674
-#: ../libgaim/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/buddy.c:1499
+#: ../libpurple/protocols/silc/silc.c:749
+#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc10/buddy.c:1499
+#: ../libpurple/protocols/silc10/silc.c:660
+#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Avundsjuk"
 
-#: ../libgaim/protocols/silc/buddy.c:1494
-#: ../libgaim/protocols/silc/silc.c:676
-#: ../libgaim/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/buddy.c:1501
+#: ../libpurple/protocols/silc/silc.c:751
+#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc10/buddy.c:1501
+#: ../libpurple/protocols/silc10/silc.c:662
+#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Sk辰ms"
 
-#: ../libgaim/protocols/silc/buddy.c:1496
-#: ../libgaim/protocols/silc/silc.c:678
-#: ../libgaim/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/buddy.c:1503
+#: ../libpurple/protocols/silc/silc.c:753
+#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc10/buddy.c:1503
+#: ../libpurple/protocols/silc10/silc.c:664
+#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Os奪rbar"
 
-#: ../libgaim/protocols/silc/buddy.c:1498
-#: ../libgaim/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/buddy.c:1505
+#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc10/buddy.c:1505
+#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "K辰r"
 
-#: ../libgaim/protocols/silc/buddy.c:1500
-#: ../libgaim/protocols/silc/silc.c:682
-#: ../libgaim/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/buddy.c:1507
+#: ../libpurple/protocols/silc/silc.c:757
+#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc10/buddy.c:1507
+#: ../libpurple/protocols/silc10/silc.c:668
+#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "S旦mnig"
 
-#: ../libgaim/protocols/silc/buddy.c:1502
-#: ../libgaim/protocols/silc/silc.c:684
-#: ../libgaim/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/buddy.c:1509
+#: ../libpurple/protocols/silc/silc.c:759
+#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc10/buddy.c:1509
+#: ../libpurple/protocols/silc10/silc.c:670
+#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Uttr奪kad"
 
-#: ../libgaim/protocols/silc/buddy.c:1504
-#: ../libgaim/protocols/silc/silc.c:686
-#: ../libgaim/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/buddy.c:1511
+#: ../libpurple/protocols/silc/silc.c:761
+#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc10/buddy.c:1511
+#: ../libpurple/protocols/silc10/silc.c:672
+#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Upphetsad"
 
-#: ../libgaim/protocols/silc/buddy.c:1506
-#: ../libgaim/protocols/silc/silc.c:688
-#: ../libgaim/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc/buddy.c:1513
+#: ../libpurple/protocols/silc/silc.c:763
+#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc10/buddy.c:1513
+#: ../libpurple/protocols/silc10/silc.c:674
+#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Orolig"
 
-#: ../libgaim/protocols/silc/buddy.c:1538
-#: ../libgaim/protocols/silc/ops.c:1202
+#: ../libpurple/protocols/silc/buddy.c:1545
+#: ../libpurple/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc10/buddy.c:1545
+#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Anv辰ndarl辰gen"
 
-#: ../libgaim/protocols/silc/buddy.c:1550
-#: ../libgaim/protocols/silc/ops.c:1207
+#: ../libpurple/protocols/silc/buddy.c:1557
+#: ../libpurple/protocols/silc/ops.c:1212
+#: ../libpurple/protocols/silc10/buddy.c:1557
+#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "St辰mning"
 
-#: ../libgaim/protocols/silc/buddy.c:1555
-#: ../libgaim/protocols/silc/ops.c:1219
+#: ../libpurple/protocols/silc/buddy.c:1562
+#: ../libpurple/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc10/buddy.c:1562
+#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "F旦redragen kontakt"
 
-#: ../libgaim/protocols/silc/buddy.c:1560
-#: ../libgaim/protocols/silc/ops.c:1224
+#: ../libpurple/protocols/silc/buddy.c:1567
+#: ../libpurple/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc10/buddy.c:1567
+#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "F旦redraget spr奪k"
 
-#: ../libgaim/protocols/silc/buddy.c:1565
-#: ../libgaim/protocols/silc/ops.c:1229
+#: ../libpurple/protocols/silc/buddy.c:1572
+#: ../libpurple/protocols/silc/ops.c:1234
+#: ../libpurple/protocols/silc10/buddy.c:1572
+#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Enhet"
 
-#: ../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:1577
+#: ../libpurple/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc10/buddy.c:1577
+#: ../libpurple/protocols/silc10/ops.c:1234
+#: ../libpurple/protocols/silc10/silc.c:722
+#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Tidszon"
 
-#: ../libgaim/protocols/silc/buddy.c:1575
-#: ../libgaim/protocols/silc/ops.c:1239
+#: ../libpurple/protocols/silc/buddy.c:1582
+#: ../libpurple/protocols/silc/ops.c:1244
+#: ../libpurple/protocols/silc10/buddy.c:1582
+#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Geografisk plats"
 
-#: ../libgaim/protocols/silc/buddy.c:1629
+#: ../libpurple/protocols/silc/buddy.c:1638
+#: ../libpurple/protocols/silc10/buddy.c:1636
 msgid "Reset IM Key"
 msgstr "Nollst辰ll IM-nyckel"
 
-#: ../libgaim/protocols/silc/buddy.c:1635
+#: ../libpurple/protocols/silc/buddy.c:1643
+#: ../libpurple/protocols/silc10/buddy.c:1642
 msgid "IM with Key Exchange"
 msgstr "IM med nyckelutbyte"
 
-#: ../libgaim/protocols/silc/buddy.c:1640
+#: ../libpurple/protocols/silc/buddy.c:1648
+#: ../libpurple/protocols/silc10/buddy.c:1647
 msgid "IM with Password"
 msgstr "IM med l旦senord"
 
-#: ../libgaim/protocols/silc/buddy.c:1653
+#: ../libpurple/protocols/silc/buddy.c:1661
+#: ../libpurple/protocols/silc10/buddy.c:1660
 msgid "Get Public Key..."
 msgstr "H辰mta publik nyckel..."
 
-#: ../libgaim/protocols/silc/buddy.c:1660
-#: ../libgaim/protocols/silc/ops.c:1624
+#: ../libpurple/protocols/silc/buddy.c:1668
+#: ../libpurple/protocols/silc/ops.c:1608
+#: ../libpurple/protocols/silc10/buddy.c:1667
+#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "D旦da anv辰ndare"
 
-#: ../libgaim/protocols/silc/buddy.c:1670
-#: ../libgaim/protocols/silc/chat.c:972
+#: ../libpurple/protocols/silc/buddy.c:1678
+#: ../libpurple/protocols/silc/chat.c:993
+#: ../libpurple/protocols/silc10/buddy.c:1677
+#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Rita p奪 whiteboard"
 
-#: ../libgaim/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc/chat.c:39
+#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_L旦senord:"
 
-#: ../libgaim/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc/chat.c:80
+#: ../libpurple/protocols/silc10/chat.c:80
 #, c-format
 msgid "Channel %s does not exist in the network"
 msgstr "Kanalen %s existerar inte p奪 n辰tverket"
 
-#: ../libgaim/protocols/silc/chat.c:81
-#: ../libgaim/protocols/silc/chat.c:174
+#: ../libpurple/protocols/silc/chat.c:81
+#: ../libpurple/protocols/silc/chat.c:175
+#: ../libpurple/protocols/silc10/chat.c:81
+#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Kanalinformation"
 
-#: ../libgaim/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc/chat.c:82
+#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Kan inte h辰mta kanalinformation"
 
-#: ../libgaim/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc/chat.c:119
+#: ../libpurple/protocols/silc10/chat.c:119
 #, c-format
 msgid "<b>Channel Name:</b> %s"
 msgstr "<b>Kanalnamn:</b> %s"
 
-#: ../libgaim/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc/chat.c:122
+#: ../libpurple/protocols/silc10/chat.c:122
 #, c-format
 msgid "<br><b>User Count:</b> %d"
 msgstr "<br><b>Anv辰ndarantal:</b> %d"
 
-#: ../libgaim/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc/chat.c:129
+#: ../libpurple/protocols/silc10/chat.c:129
 #, c-format
 msgid "<br><b>Channel Founder:</b> %s"
 msgstr "<br><b>Kanalskapare:</b> %s"
 
-#: ../libgaim/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc/chat.c:138
+#: ../libpurple/protocols/silc10/chat.c:138
 #, c-format
 msgid "<br><b>Channel Cipher:</b> %s"
 msgstr "<br><b>Kanalchiffer:</b> %s"
 
 #. Definition of HMAC: http://en.wikipedia.org/wiki/HMAC
-#: ../libgaim/protocols/silc/chat.c:142
+#: ../libpurple/protocols/silc/chat.c:143
+#: ../libpurple/protocols/silc10/chat.c:142
 #, c-format
 msgid "<br><b>Channel HMAC:</b> %s"
 msgstr "<br><b>Kanalens HMAC:</b> %s"
 
-#: ../libgaim/protocols/silc/chat.c:147
+#: ../libpurple/protocols/silc/chat.c:148
+#: ../libpurple/protocols/silc10/chat.c:147
 #, c-format
 msgid "<br><b>Channel Topic:</b><br>%s"
 msgstr "<br><b>Kanalens 辰mne:</b><br>%s"
 
-#: ../libgaim/protocols/silc/chat.c:152
+#: ../libpurple/protocols/silc/chat.c:153
+#: ../libpurple/protocols/silc10/chat.c:152
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanall辰gen:</b> "
 
-#: ../libgaim/protocols/silc/chat.c:165
+#: ../libpurple/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc10/chat.c:165
 #, c-format
 msgid "<br><b>Founder Key Fingerprint:</b><br>%s"
 msgstr "<br><b>Skaparnyckelns fingeravtryck:</b><br>%s"
 
-#: ../libgaim/protocols/silc/chat.c:166
+#: ../libpurple/protocols/silc/chat.c:167
+#: ../libpurple/protocols/silc10/chat.c:166
 #, c-format
 msgid "<br><b>Founder Key Babbleprint:</b><br>%s"
 msgstr "<br><b>Skaparnyckelns pladderavtryck:</b><br>%s"
 
-#: ../libgaim/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc/chat.c:236
+#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "L辰gg till kanalpublik nyckel"
 
 #. Add new public key
-#: ../libgaim/protocols/silc/chat.c:291
+#: ../libpurple/protocols/silc/chat.c:304
+#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "�ppna publik nyckel..."
 
-#: ../libgaim/protocols/silc/chat.c:400
+#: ../libpurple/protocols/silc/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Kanalens l旦senord"
 
-#: ../libgaim/protocols/silc/chat.c:407
+#: ../libpurple/protocols/silc/chat.c:430
+#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Kanalpublik nyckellista"
 
-#: ../libgaim/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 signatures. If passphrase is set, it is required to be able to join. If channel public keys are set then only users whose public keys are listed are able to join."
-msgstr "Kanal autentisering anv辰nds f旦r att s辰kra kanalen fr奪n obeh旦rigt tilltr辰de. Autentiseringen kan vara baserad p奪 ett l旦senord eller en digital signatur. Om ett l旦senord 辰r valt, d奪 辰r det n旦dv辰ndigt f旦r att kunna ansluta. Om kanalpublika nycklar 辰r valt kan enbart anv辰ndare vars publika nycklar 辰r listade ansluta."
-
-#: ../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:435
+#: ../libpurple/protocols/silc10/chat.c:413
+msgid ""
+"Channel authentication is used to secure the channel from unauthorized "
+"access. The authentication may be based on passphrase and digital "
+"signatures. If passphrase is set, it is required to be able to join. If "
+"channel public keys are set then only users whose public keys are listed are "
+"able to join."
+msgstr ""
+"Kanal autentisering anv辰nds f旦r att s辰kra kanalen fr奪n obeh旦rigt tilltr辰de. "
+"Autentiseringen kan vara baserad p奪 ett l旦senord eller en digital signatur. "
+"Om ett l旦senord 辰r valt, d奪 辰r det n旦dv辰ndigt f旦r att kunna ansluta. Om "
+"kanalpublika nycklar 辰r valt kan enbart anv辰ndare vars publika nycklar 辰r "
+"listade ansluta."
+
+#: ../libpurple/protocols/silc/chat.c:444
+#: ../libpurple/protocols/silc/chat.c:445
+#: ../libpurple/protocols/silc/chat.c:479
+#: ../libpurple/protocols/silc/chat.c:480
+#: ../libpurple/protocols/silc/chat.c:927
+#: ../libpurple/protocols/silc10/chat.c:422
+#: ../libpurple/protocols/silc10/chat.c:423
+#: ../libpurple/protocols/silc10/chat.c:461
+#: ../libpurple/protocols/silc10/chat.c:462
+#: ../libpurple/protocols/silc10/chat.c:911
 msgid "Channel Authentication"
 msgstr "Kanalautentisering"
 
-#: ../libgaim/protocols/silc/chat.c:423
-#: ../libgaim/protocols/silc/chat.c:461
+#: ../libpurple/protocols/silc/chat.c:446
+#: ../libpurple/protocols/silc/chat.c:481
+#: ../libpurple/protocols/silc10/chat.c:424
+#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "L辰gg till/Ta bort"
 
-#: ../libgaim/protocols/silc/chat.c:578
+#: ../libpurple/protocols/silc/chat.c:597
+#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Gruppnamn"
 
-#: ../libgaim/protocols/silc/chat.c:582
-#: ../libgaim/protocols/silc/ops.c:1909
-#: ../libgaim/protocols/silc/silc.c:944
+#: ../libpurple/protocols/silc/chat.c:601
+#: ../libpurple/protocols/silc/ops.c:1813
+#: ../libpurple/protocols/silc/silc.c:1020
+#: ../libpurple/protocols/silc10/chat.c:585
+#: ../libpurple/protocols/silc10/ops.c:1901
+#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "L旦senord"
 
-#: ../libgaim/protocols/silc/chat.c:593
+#: ../libpurple/protocols/silc/chat.c:612
+#: ../libpurple/protocols/silc10/chat.c:596
 #, c-format
 msgid "Please enter the %s channel private group name and passphrase."
 msgstr "Ange kanalen %s privata gruppnamn och l旦senord."
 
-#: ../libgaim/protocols/silc/chat.c:595
+#: ../libpurple/protocols/silc/chat.c:614
+#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "L辰gg till kanal-privat grupp"
 
-#: ../libgaim/protocols/silc/chat.c:722
+#: ../libpurple/protocols/silc/chat.c:742
+#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Anv辰ndargr辰ns"
 
-#: ../libgaim/protocols/silc/chat.c:723
+#: ../libpurple/protocols/silc/chat.c:743
+#: ../libpurple/protocols/silc10/chat.c:727
 msgid "Set user limit on channel. Set to zero to reset user limit."
-msgstr "Antalet anv辰ndare begr辰nsat p奪 kanal. S辰tt till noll f旦r att nollst辰lla anv辰ndargr辰ns."
-
-#: ../libgaim/protocols/silc/chat.c:886
+msgstr ""
+"Antalet anv辰ndare begr辰nsat p奪 kanal. S辰tt till noll f旦r att nollst辰lla "
+"anv辰ndargr辰ns."
+
+#: ../libpurple/protocols/silc/chat.c:907
+#: ../libpurple/protocols/silc10/chat.c:891
 msgid "Invite List"
 msgstr "G辰stlista"
 
-#: ../libgaim/protocols/silc/chat.c:891
+#: ../libpurple/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Sp辰rrlista"
 
-#: ../libgaim/protocols/silc/chat.c:899
+#: ../libpurple/protocols/silc/chat.c:920
+#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "L辰gg till privat grupp"
 
-#: ../libgaim/protocols/silc/chat.c:912
+#: ../libpurple/protocols/silc/chat.c:933
+#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Nollst辰ll Permanent"
 
-#: ../libgaim/protocols/silc/chat.c:917
+#: ../libpurple/protocols/silc/chat.c:938
+#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "S辰tt permanent"
 
-#: ../libgaim/protocols/silc/chat.c:925
+#: ../libpurple/protocols/silc/chat.c:946
+#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "S辰tt anv辰ndarbegr辰nsning"
 
-#: ../libgaim/protocols/silc/chat.c:931
+#: ../libpurple/protocols/silc/chat.c:952
+#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Nollst辰ll 辰mnesrestriktioner"
 
-#: ../libgaim/protocols/silc/chat.c:936
+#: ../libpurple/protocols/silc/chat.c:957
+#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "S辰tt �mnesestriktioner"
 
-#: ../libgaim/protocols/silc/chat.c:943
+#: ../libpurple/protocols/silc/chat.c:964
+#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Nollst辰ll Privat Kanal"
 
-#: ../libgaim/protocols/silc/chat.c:948
+#: ../libpurple/protocols/silc/chat.c:969
+#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "S辰tt Privat Kanal"
 
-#: ../libgaim/protocols/silc/chat.c:955
+#: ../libpurple/protocols/silc/chat.c:976
+#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Nollst辰ll Hemlig Kanal"
 
-#: ../libgaim/protocols/silc/chat.c:960
+#: ../libpurple/protocols/silc/chat.c:981
+#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "S辰tt Hemlig Kanal"
 
-#: ../libgaim/protocols/silc/chat.c:1034
+#: ../libpurple/protocols/silc/chat.c:1045
+#: ../libpurple/protocols/silc10/chat.c:1102
+#, c-format
+msgid ""
+"You have to join the %s channel before you are able to join the private group"
+msgstr ""
+"Du m奪ste ansluta till kanalen %s f旦re du kan ansluta till den privata gruppen"
+
+#: ../libpurple/protocols/silc/chat.c:1047
+#: ../libpurple/protocols/silc10/chat.c:1104
+msgid "Join Private Group"
+msgstr "Anslut till privat grupp"
+
+#: ../libpurple/protocols/silc/chat.c:1048
+#: ../libpurple/protocols/silc10/chat.c:1105
+msgid "Cannot join private group"
+msgstr "Kunde inte ansluta till privat grupp"
+
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1217
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
+msgid "Call Command"
+msgstr "Uppringningskommando"
+
+#: ../libpurple/protocols/silc/chat.c:1260
+#: ../libpurple/protocols/silc/silc.c:1218
+#: ../libpurple/protocols/silc10/chat.c:1299
+#: ../libpurple/protocols/silc10/silc.c:1137
+msgid "Cannot call command"
+msgstr "Kan inte utf旦ra kommando"
+
+#: ../libpurple/protocols/silc/chat.c:1261
+#: ../libpurple/protocols/silc/silc.c:1219
+#: ../libpurple/protocols/silc10/chat.c:1300
+#: ../libpurple/protocols/silc10/silc.c:1138
+msgid "Unknown command"
+msgstr "Ok辰nt kommando"
+
+#: ../libpurple/protocols/silc/ft.c:85 ../libpurple/protocols/silc/ft.c:101
+#: ../libpurple/protocols/silc/ft.c:104 ../libpurple/protocols/silc/ft.c:108
+#: ../libpurple/protocols/silc/ft.c:112 ../libpurple/protocols/silc/ft.c:116
+#: ../libpurple/protocols/silc/ft.c:120 ../libpurple/protocols/silc/ft.c:272
+#: ../libpurple/protocols/silc/ft.c:277 ../libpurple/protocols/silc/ft.c:282
+#: ../libpurple/protocols/silc/ft.c:288 ../libpurple/protocols/silc/ft.c:425
+#: ../libpurple/protocols/silc10/ft.c:89 ../libpurple/protocols/silc10/ft.c:92
+#: ../libpurple/protocols/silc10/ft.c:96
+#: ../libpurple/protocols/silc10/ft.c:100
+#: ../libpurple/protocols/silc10/ft.c:104
+#: ../libpurple/protocols/silc10/ft.c:205
+#: ../libpurple/protocols/silc10/ft.c:210
+#: ../libpurple/protocols/silc10/ft.c:215
+#: ../libpurple/protocols/silc10/ft.c:221
+#: ../libpurple/protocols/silc10/ft.c:340
+msgid "Secure File Transfer"
+msgstr "S辰ker fil旦verf旦ringar"
+
+#: ../libpurple/protocols/silc/ft.c:86 ../libpurple/protocols/silc/ft.c:102
+#: ../libpurple/protocols/silc/ft.c:105 ../libpurple/protocols/silc/ft.c:109
+#: ../libpurple/protocols/silc/ft.c:113 ../libpurple/protocols/silc/ft.c:117
+#: ../libpurple/protocols/silc/ft.c:121 ../libpurple/protocols/silc10/ft.c:90
+#: ../libpurple/protocols/silc10/ft.c:93 ../libpurple/protocols/silc10/ft.c:97
+#: ../libpurple/protocols/silc10/ft.c:101
+#: ../libpurple/protocols/silc10/ft.c:105
+msgid "Error during file transfer"
+msgstr "Fel vid fil旦verf旦ring"
+
+#: ../libpurple/protocols/silc/ft.c:87
+msgid "Remote disconnected"
+msgstr "Fj辰rrdatorn kopplade ifr奪n"
+
+#: ../libpurple/protocols/silc/ft.c:106 ../libpurple/protocols/silc10/ft.c:94
+msgid "Permission denied"
+msgstr "Tillst奪nd nekat"
+
+#: ../libpurple/protocols/silc/ft.c:110 ../libpurple/protocols/silc10/ft.c:98
+msgid "Key agreement failed"
+msgstr "Nyckel旦verenskommelse misslyckades"
+
+#: ../libpurple/protocols/silc/ft.c:114
+msgid "Connection timed out"
+msgstr "Anslutningen 旦verskred en tidsgr辰ns och tappades"
+
+#: ../libpurple/protocols/silc/ft.c:118
+msgid "Creating connection failed"
+msgstr "Skapandet av anslutning misslyckad"
+
+#: ../libpurple/protocols/silc/ft.c:122 ../libpurple/protocols/silc10/ft.c:102
+msgid "File transfer session does not exist"
+msgstr "Fil旦verf旦ringssession finns inte"
+
+#: ../libpurple/protocols/silc/ft.c:273 ../libpurple/protocols/silc10/ft.c:206
+msgid "No file transfer session active"
+msgstr "Ingen aktiv fil旦verf旦ring"
+
+#: ../libpurple/protocols/silc/ft.c:278 ../libpurple/protocols/silc10/ft.c:211
+msgid "File transfer already started"
+msgstr "Fil旦verf旦ringen 辰r redan p奪b旦rjad"
+
+#: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
+msgid "Could not perform key agreement for file transfer"
+msgstr "Kunde inte utf旦ra nyckel旦verenskommelse f旦r fil旦verf旦ring"
+
+#: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
+msgid "Could not start the file transfer"
+msgstr "Kunde inte starta fil旦verf旦ring"
+
+#: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
+msgid "Cannot send file"
+msgstr "Kan inte skicka fil"
+
+#: ../libpurple/protocols/silc/ops.c:57
+msgid "Error occurred"
+msgstr "Ett fel uppstod"
+
+#: ../libpurple/protocols/silc/ops.c:533 ../libpurple/protocols/silc/ops.c:542
+#: ../libpurple/protocols/silc/ops.c:551
+#: ../libpurple/protocols/silc10/ops.c:554
+#: ../libpurple/protocols/silc10/ops.c:563
+#: ../libpurple/protocols/silc10/ops.c:572
+#, c-format
+msgid "%s has changed the topic of <I>%s</I> to: %s"
+msgstr "%s har bytt 辰mne f旦r <I>%s</I> till: %s"
+
+#: ../libpurple/protocols/silc/ops.c:617
+#: ../libpurple/protocols/silc10/ops.c:638
+#, c-format
+msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
+msgstr "<I>%s</I> angav kanalens <I>%ss</I> l辰gen till: %s"
+
+#: ../libpurple/protocols/silc/ops.c:621
+#: ../libpurple/protocols/silc10/ops.c:642
+#, c-format
+msgid "<I>%s</I> removed all channel <I>%s</I> modes"
+msgstr "<I>%s</I> tog bort alla kanall辰gen f旦r <I>%s</I>"
+
+#: ../libpurple/protocols/silc/ops.c:654
+#: ../libpurple/protocols/silc10/ops.c:675
+#, c-format
+msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
+msgstr "<I>%s</I> s辰tt <I>%ss</I> l辰gen till: %s"
+
+#: ../libpurple/protocols/silc/ops.c:662
+#: ../libpurple/protocols/silc10/ops.c:683
+#, c-format
+msgid "<I>%s</I> removed all <I>%s's</I> modes"
+msgstr "<I>%s</I> tog bort alla <I>%ss</I> l辰gen"
+
+#: ../libpurple/protocols/silc/ops.c:691
+#: ../libpurple/protocols/silc10/ops.c:712
+#, c-format
+msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
+msgstr "Du har sparkats ut ur <I>%s</I> av <I>%s</I> (%s)"
+
+#: ../libpurple/protocols/silc/ops.c:718 ../libpurple/protocols/silc/ops.c:723
+#: ../libpurple/protocols/silc/ops.c:728
+#: ../libpurple/protocols/silc10/ops.c:742
+#: ../libpurple/protocols/silc10/ops.c:747
+#: ../libpurple/protocols/silc10/ops.c:752
+#, c-format
+msgid "You have been killed by %s (%s)"
+msgstr "Du har d旦dats av %s (%s)"
+
+#: ../libpurple/protocols/silc/ops.c:749 ../libpurple/protocols/silc/ops.c:754
+#: ../libpurple/protocols/silc/ops.c:759
+#: ../libpurple/protocols/silc10/ops.c:773
+#: ../libpurple/protocols/silc10/ops.c:778
+#: ../libpurple/protocols/silc10/ops.c:783
+#, c-format
+msgid "Killed by %s (%s)"
+msgstr "D旦dad av %s (%s)"
+
+#: ../libpurple/protocols/silc/ops.c:796
+#: ../libpurple/protocols/silc10/ops.c:829
+msgid "Server signoff"
+msgstr "Serverfr奪nkoppling"
+
+#: ../libpurple/protocols/silc/ops.c:983
+#: ../libpurple/protocols/silc10/ops.c:1017
+msgid "Personal Information"
+msgstr "Personlig information"
+
+#: ../libpurple/protocols/silc/ops.c:1006
+#: ../libpurple/protocols/silc10/ops.c:1040
+msgid "Birth Day"
+msgstr "F旦delsedag"
+
+#: ../libpurple/protocols/silc/ops.c:1014
+#: ../libpurple/protocols/silc10/ops.c:1048
+msgid "Job Role"
+msgstr "Jobbroll"
+
+#: ../libpurple/protocols/silc/ops.c:1018
+#: ../libpurple/protocols/silc/silc.c:1013
+#: ../libpurple/protocols/silc10/ops.c:1052
+#: ../libpurple/protocols/silc10/silc.c:924
+msgid "Organization"
+msgstr "Organisation"
+
+#: ../libpurple/protocols/silc/ops.c:1022
+#: ../libpurple/protocols/silc10/ops.c:1056
+msgid "Unit"
+msgstr "Enhet"
+
+#: ../libpurple/protocols/silc/ops.c:1046
+#: ../libpurple/protocols/silc10/ops.c:1080
+msgid "Note"
+msgstr "Notering"
+
+#: ../libpurple/protocols/silc/ops.c:1093
+#: ../libpurple/protocols/silc10/ops.c:1128
+msgid "Join Chat"
+msgstr "Anslut till chatt"
+
+#: ../libpurple/protocols/silc/ops.c:1127
+#: ../libpurple/protocols/silc10/chat.c:1039
 #, c-format
 msgid "You are channel founder on <I>%s</I>"
 msgstr "Du 辰r kanalskapare i <I>%s</I>"
 
-#: ../libgaim/protocols/silc/chat.c:1038
+#: ../libpurple/protocols/silc/ops.c:1131
+#: ../libpurple/protocols/silc10/chat.c:1043
 #, c-format
 msgid "Channel founder on <I>%s</I> is <I>%s</I>"
 msgstr "Kanalskaparen f旦r <I>%s</I> 辰r <I>%s</I>"
 
-#: ../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 "Du m奪ste ansluta till kanalen %s f旦re du kan ansluta till den privata gruppen"
-
-#: ../libgaim/protocols/silc/chat.c:1099
-msgid "Join Private Group"
-msgstr "Anslut till privat grupp"
-
-#: ../libgaim/protocols/silc/chat.c:1100
-msgid "Cannot join private group"
-msgstr "Kunde inte ansluta till privat grupp"
-
-#: ../libgaim/protocols/silc/chat.c:1294
-#: ../libgaim/protocols/silc/silc.c:1152
-msgid "Call Command"
-msgstr "Uppringningskommando"
-
-#: ../libgaim/protocols/silc/chat.c:1294
-#: ../libgaim/protocols/silc/silc.c:1152
-msgid "Cannot call command"
-msgstr "Kan inte utf旦ra kommando"
-
-#: ../libgaim/protocols/silc/chat.c:1295
-#: ../libgaim/protocols/silc/silc.c:1153
-msgid "Unknown command"
-msgstr "Ok辰nt kommando"
-
-#: ../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
-msgid "Secure File Transfer"
-msgstr "S辰ker fil旦verf旦ringar"
-
-#: ../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
-msgid "Error during file transfer"
-msgstr "Fel vid fil旦verf旦ring"
-
-#: ../libgaim/protocols/silc/ft.c:94
-msgid "Permission denied"
-msgstr "Tillst奪nd nekat"
-
-#: ../libgaim/protocols/silc/ft.c:98
-msgid "Key agreement failed"
-msgstr "Nyckel旦verenskommelse misslyckades"
-
-#: ../libgaim/protocols/silc/ft.c:102
-msgid "File transfer session does not exist"
-msgstr "Fil旦verf旦ringssession finns inte"
-
-#: ../libgaim/protocols/silc/ft.c:206
-msgid "No file transfer session active"
-msgstr "Ingen aktiv fil旦verf旦ring"
-
-#: ../libgaim/protocols/silc/ft.c:211
-msgid "File transfer already started"
-msgstr "Fil旦verf旦ringen 辰r redan p奪b旦rjad"
-
-#: ../libgaim/protocols/silc/ft.c:216
-msgid "Could not perform key agreement for file transfer"
-msgstr "Kunde inte utf旦ra nyckel旦verenskommelse f旦r fil旦verf旦ring"
-
-#: ../libgaim/protocols/silc/ft.c:222
-msgid "Could not start the file transfer"
-msgstr "Kunde inte starta fil旦verf旦ring"
-
-#: ../libgaim/protocols/silc/ft.c:341
-msgid "Cannot send file"
-msgstr "Kan inte skicka fil"
-
-#: ../libgaim/protocols/silc/ops.c:554
-#: ../libgaim/protocols/silc/ops.c:563
-#: ../libgaim/protocols/silc/ops.c:572
-#, c-format
-msgid "%s has changed the topic of <I>%s</I> to: %s"
-msgstr "%s har bytt 辰mne f旦r <I>%s</I> till: %s"
-
-#: ../libgaim/protocols/silc/ops.c:638
-#, c-format
-msgid "<I>%s</I> set channel <I>%s</I> modes to: %s"
-msgstr "<I>%s</I> angav kanalens <I>%ss</I> l辰gen till: %s"
-
-#: ../libgaim/protocols/silc/ops.c:642
-#, c-format
-msgid "<I>%s</I> removed all channel <I>%s</I> modes"
-msgstr "<I>%s</I> tog bort alla kanall辰gen f旦r <I>%s</I>"
-
-#: ../libgaim/protocols/silc/ops.c:675
-#, c-format
-msgid "<I>%s</I> set <I>%s's</I> modes to: %s"
-msgstr "<I>%s</I> s辰tt <I>%ss</I> l辰gen till: %s"
-
-#: ../libgaim/protocols/silc/ops.c:683
-#, c-format
-msgid "<I>%s</I> removed all <I>%s's</I> modes"
-msgstr "<I>%s</I> tog bort alla <I>%ss</I> l辰gen"
-
-#: ../libgaim/protocols/silc/ops.c:712
-#, c-format
-msgid "You have been kicked off <I>%s</I> by <I>%s</I> (%s)"
-msgstr "Du har sparkats ut ur <I>%s</I> av <I>%s</I> (%s)"
-
-#: ../libgaim/protocols/silc/ops.c:742
-#: ../libgaim/protocols/silc/ops.c:747
-#: ../libgaim/protocols/silc/ops.c:752
-#, c-format
-msgid "You have been killed by %s (%s)"
-msgstr "Du har d旦dats av %s (%s)"
-
-#: ../libgaim/protocols/silc/ops.c:773
-#: ../libgaim/protocols/silc/ops.c:778
-#: ../libgaim/protocols/silc/ops.c:783
-#, c-format
-msgid "Killed by %s (%s)"
-msgstr "D旦dad av %s (%s)"
-
-#: ../libgaim/protocols/silc/ops.c:829
-msgid "Server signoff"
-msgstr "Serverfr奪nkoppling"
-
-#: ../libgaim/protocols/silc/ops.c:1017
-msgid "Personal Information"
-msgstr "Personlig information"
-
-#: ../libgaim/protocols/silc/ops.c:1040
-msgid "Birth Day"
-msgstr "F旦delsedag"
-
-#: ../libgaim/protocols/silc/ops.c:1048
-msgid "Job Role"
-msgstr "Jobbroll"
-
-#: ../libgaim/protocols/silc/ops.c:1052
-#: ../libgaim/protocols/silc/silc.c:937
-msgid "Organization"
-msgstr "Organisation"
-
-#: ../libgaim/protocols/silc/ops.c:1056
-msgid "Unit"
-msgstr "Enhet"
-
-#: ../libgaim/protocols/silc/ops.c:1080
-msgid "Note"
-msgstr "Notering"
-
-#: ../libgaim/protocols/silc/ops.c:1128
-msgid "Join Chat"
-msgstr "Anslut till chatt"
-
-#: ../libgaim/protocols/silc/ops.c:1183
-#: ../libgaim/protocols/silc/ops.c:1332
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1047
+#: ../libpurple/protocols/silc/ops.c:1190
+#: ../libpurple/protocols/silc/ops.c:1326
+#: ../libpurple/protocols/silc10/ops.c:1183
+#: ../libpurple/protocols/silc10/ops.c:1332
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1071
 msgid "Real Name"
 msgstr "Fullst辰ndigt namn"
 
-#: ../libgaim/protocols/silc/ops.c:1213
+#: ../libpurple/protocols/silc/ops.c:1218
+#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Statustext"
 
-#: ../libgaim/protocols/silc/ops.c:1285
-#: ../libgaim/protocols/silc/ops.c:1357
+#: ../libpurple/protocols/silc/ops.c:1279
+#: ../libpurple/protocols/silc/ops.c:1351
+#: ../libpurple/protocols/silc10/ops.c:1285
+#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Publik nyckelfingeravtryck"
 
-#: ../libgaim/protocols/silc/ops.c:1286
-#: ../libgaim/protocols/silc/ops.c:1358
+#: ../libpurple/protocols/silc/ops.c:1280
+#: ../libpurple/protocols/silc/ops.c:1352
+#: ../libpurple/protocols/silc10/ops.c:1286
+#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Publik nyckelpladderavtryck"
 
-#: ../libgaim/protocols/silc/ops.c:1298
+#: ../libpurple/protocols/silc/ops.c:1292
+#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Mer..."
 
-#: ../libgaim/protocols/silc/ops.c:1371
-#: ../libgaim/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc/silc.c:1077
+#: ../libpurple/protocols/silc10/ops.c:1371
+#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "Fr奪nskilj fr奪n server"
 
-#: ../libgaim/protocols/silc/ops.c:1371
+#: ../libpurple/protocols/silc/ops.c:1369
+#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Kan inte skilja"
 
-#: ../libgaim/protocols/silc/ops.c:1382
+#: ../libpurple/protocols/silc/ops.c:1389
+#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Kan inte ange kanal辰mne"
 
-#: ../libgaim/protocols/silc/ops.c:1414
+#: ../libpurple/protocols/silc/ops.c:1418
+#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Kunde inte byta nick"
 
-#: ../libgaim/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Rumlista"
 
-#: ../libgaim/protocols/silc/ops.c:1462
+#: ../libpurple/protocols/silc/ops.c:1467
+#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Kan inte h辰mta rumlista"
 
-#: ../libgaim/protocols/silc/ops.c:1507
+#: ../libpurple/protocols/silc/ops.c:1468
+msgid "Network is empty"
+msgstr "N辰tverket 辰r tomt"
+
+#: ../libpurple/protocols/silc/ops.c:1512
+#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Ingen publik nyckel var mottagen"
 
-#: ../libgaim/protocols/silc/ops.c:1519
-#: ../libgaim/protocols/silc/ops.c:1532
+#: ../libpurple/protocols/silc/ops.c:1524
+#: ../libpurple/protocols/silc/ops.c:1537
+#: ../libpurple/protocols/silc10/ops.c:1519
+#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Serverinformation"
 
-#: ../libgaim/protocols/silc/ops.c:1520
+#: ../libpurple/protocols/silc/ops.c:1525
+#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Kan inte h辰mta serverinformation"
 
-#: ../libgaim/protocols/silc/ops.c:1549
-#: ../libgaim/protocols/silc/ops.c:1558
+#: ../libpurple/protocols/silc/ops.c:1548
+#: ../libpurple/protocols/silc10/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Serverstatestik"
 
-#: ../libgaim/protocols/silc/ops.c:1550
+#: ../libpurple/protocols/silc/ops.c:1549
+#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Kan inte h辰mta serverstatestik"
 
-#: ../libgaim/protocols/silc/ops.c:1559
-msgid "No server statistics available"
-msgstr "Ingen serverstatestik tillg辰nglig"
-
-#: ../libgaim/protocols/silc/ops.c:1581
+#: ../libpurple/protocols/silc/ops.c:1556
+#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -12873,112 +9905,80 @@
 "Totala serveroperat旦rer: %d\n"
 "Totala routeroperat旦rer: %d\n"
 
-#: ../libgaim/protocols/silc/ops.c:1604
+#: ../libpurple/protocols/silc/ops.c:1588
+#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "N辰tverksstatestik"
 
-#: ../libgaim/protocols/silc/ops.c:1612
-#: ../libgaim/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1612
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libgaim/protocols/silc/ops.c:1612
+#: ../libpurple/protocols/silc/ops.c:1596
+#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping misslyckades"
 
-#: ../libgaim/protocols/silc/ops.c:1617
+#: ../libpurple/protocols/silc/ops.c:1601
+#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Svar p奪 Ping mottagen fr奪n server"
 
-#: ../libgaim/protocols/silc/ops.c:1625
+#: ../libpurple/protocols/silc/ops.c:1609
+#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Kunde inte d旦da anv辰ndare"
 
-#: ../libgaim/protocols/silc/ops.c:1709
-msgid "Error during connecting to SILC Server"
-msgstr "Fel vid anslutning till SILC-server"
-
-#: ../libgaim/protocols/silc/ops.c:1714
-msgid "Key Exchange failed"
-msgstr "Nyckelutbytet misslyckades"
-
-#: ../libgaim/protocols/silc/ops.c:1723
-msgid "Resuming detached session failed. Press Reconnect to create new connection."
-msgstr "Misslyckades med att 奪teruppta fr奪nskild session. Tryck \"�teranslut\" f旦r at skapa en ny uppkoppling."
-
-#: ../libgaim/protocols/silc/ops.c:1758
-msgid "Disconnected by server"
-msgstr "Fr奪nkopplad av server"
-
-#: ../libgaim/protocols/silc/ops.c:1820
-#: ../libgaim/protocols/silc/ops.c:1867
-#: ../libgaim/protocols/silc/silc.c:188
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "WATCH"
+msgstr "TITTA"
+
+#: ../libpurple/protocols/silc/ops.c:1648
+msgid "Cannot watch user"
+msgstr "Kan inte f旦lja anv辰ndaren"
+
+#: ../libpurple/protocols/silc/ops.c:1724
+#: ../libpurple/protocols/silc/ops.c:1775
+#: ../libpurple/protocols/silc/silc.c:277
+#: ../libpurple/protocols/silc10/ops.c:1811
+#: ../libpurple/protocols/silc10/ops.c:1858
+#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "�terupptar session"
 
-#: ../libgaim/protocols/silc/ops.c:1822
+#: ../libpurple/protocols/silc/ops.c:1726
+#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Autentiserar uppkoppling"
 
-#: ../libgaim/protocols/silc/ops.c:1869
+#: ../libpurple/protocols/silc/ops.c:1777
+#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Verifierar publik servernyckel"
 
-#: ../libgaim/protocols/silc/ops.c:1910
+#: ../libpurple/protocols/silc/ops.c:1814
+#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "L旦senord kr辰vs"
 
-#: ../libgaim/protocols/silc/ops.c:1939
-msgid "Failure: Version mismatch, upgrade your client"
-msgstr "Misslyckande: Versionerna matchar inte, upgradera din klient"
-
-#: ../libgaim/protocols/silc/ops.c:1942
-msgid "Failure: Remote does not trust/support your public key"
-msgstr "Misslyckande: Fj辰rrdatorn litar inte p奪/st旦djer inte din publika nyckel"
-
-#: ../libgaim/protocols/silc/ops.c:1945
-msgid "Failure: Remote does not support proposed KE group"
-msgstr "Misslyckande: Fj辰rrdatorn st旦djer inte f旦reslagen KE-grupp"
-
-#: ../libgaim/protocols/silc/ops.c:1948
-msgid "Failure: Remote does not support proposed cipher"
-msgstr "Misslyckande: Fj辰rrdator st旦djer inte f旦reslaget chiffer"
-
-#: ../libgaim/protocols/silc/ops.c:1951
-msgid "Failure: Remote does not support proposed PKCS"
-msgstr "Misslyckande: Fj辰rrdatorn st旦djer inte f旦reslagen PKCS"
-
-#: ../libgaim/protocols/silc/ops.c:1954
-msgid "Failure: Remote does not support proposed hash function"
-msgstr "Misslyckande: Fj辰rrdatorn st旦djer inte f旦reslagen hash-funktion"
-
-#: ../libgaim/protocols/silc/ops.c:1957
-msgid "Failure: Remote does not support proposed HMAC"
-msgstr "Misslyckande: Fj辰rrdatorn st旦djer inte f旦reslagen HMAC"
-
-#: ../libgaim/protocols/silc/ops.c:1959
-msgid "Failure: Incorrect signature"
-msgstr "Misslyckande: Felaktig signatur"
-
-#: ../libgaim/protocols/silc/ops.c:1961
-msgid "Failure: Invalid cookie"
-msgstr "Misslyckande: Felaktig cookie"
-
-#: ../libgaim/protocols/silc/ops.c:1972
-msgid "Failure: Authentication failed"
-msgstr "Misslyckande: Autentisering misslyckades"
-
-#: ../libgaim/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 "Mottog %ss publika nyckel. Din lokala kopia st辰mmer inte 旦verens med denna. Vill du fortfarande acceptera denna publika nyckel?"
-
-#: ../libgaim/protocols/silc/pk.c:108
+#: ../libpurple/protocols/silc/pk.c:98 ../libpurple/protocols/silc10/pk.c:104
+#, 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 ""
+"Mottog %ss publika nyckel. Din lokala kopia st辰mmer inte 旦verens med denna. "
+"Vill du fortfarande acceptera denna publika nyckel?"
+
+#: ../libpurple/protocols/silc/pk.c:103 ../libpurple/protocols/silc10/pk.c:109
 #, c-format
 msgid "Received %s's public key. Would you like to accept this public key?"
 msgstr "Mottog %ss publika nyckel. Vill du acceptera denna publika nyckel?"
 
-#: ../libgaim/protocols/silc/pk.c:112
+#: ../libpurple/protocols/silc/pk.c:107 ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -12991,66 +9991,100 @@
 "%s\n"
 "%s\n"
 
-#: ../libgaim/protocols/silc/pk.c:115
-#: ../libgaim/protocols/silc/pk.c:140
+#: ../libpurple/protocols/silc/pk.c:110 ../libpurple/protocols/silc/pk.c:139
+#: ../libpurple/protocols/silc10/pk.c:116
+#: ../libpurple/protocols/silc10/pk.c:142
 msgid "Verify Public Key"
 msgstr "Verifiera publik nyckel"
 
-#: ../libgaim/protocols/silc/pk.c:119
+#: ../libpurple/protocols/silc/pk.c:115 ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Visa..."
 
-#: ../libgaim/protocols/silc/pk.c:141
+#: ../libpurple/protocols/silc/pk.c:140 ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Ej st旦dd  publik nyckeltyp"
 
-#: ../libgaim/protocols/silc/silc.c:159
+#: ../libpurple/protocols/silc/silc.c:217
+#: ../libpurple/protocols/silc10/ops.c:1749
+msgid "Disconnected by server"
+msgstr "Fr奪nkopplad av server"
+
+#: ../libpurple/protocols/silc/silc.c:224
+#: ../libpurple/protocols/silc10/ops.c:1700
+msgid "Error during connecting to SILC Server"
+msgstr "Fel vid anslutning till SILC-server"
+
+#: ../libpurple/protocols/silc/silc.c:229
+#: ../libpurple/protocols/silc10/ops.c:1705
+msgid "Key Exchange failed"
+msgstr "Nyckelutbytet misslyckades"
+
+#: ../libpurple/protocols/silc/silc.c:238
+#: ../libpurple/protocols/silc10/ops.c:1714
+msgid ""
+"Resuming detached session failed. Press Reconnect to create new connection."
+msgstr ""
+"Misslyckades med att 奪teruppta fr奪nskild session. Tryck \"�teranslut\" f旦r "
+"at skapa en ny uppkoppling."
+
+#: ../libpurple/protocols/silc/silc.c:265
+#: ../libpurple/protocols/silc/silc.c:311
+#: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Anslutning misslyckad"
 
-#: ../libgaim/protocols/silc/silc.c:180
-msgid "Cannot initialize SILC Client connection"
-msgstr "Kan inte inleda SILC-klientanslutning"
-
-#: ../libgaim/protocols/silc/silc.c:191
+#: ../libpurple/protocols/silc/silc.c:280
+#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Utf旦r nyckelutbyte"
 
-#: ../libgaim/protocols/silc/silc.c:277
+#. Progress
+#: ../libpurple/protocols/silc/silc.c:343
+#: ../libpurple/protocols/silc10/silc.c:325
+msgid "Connecting to SILC Server"
+msgstr "Ansluter till SILC-server"
+
+#: ../libpurple/protocols/silc/silc.c:352
+msgid "Could not load SILC key pair"
+msgstr "Kunde inte ladda SILC nyckelpar"
+
+#: ../libpurple/protocols/silc/silc.c:366
+#: ../libpurple/protocols/silc10/silc.c:355
+msgid "Unable to create connection"
+msgstr "Kan inte skapa anslutning"
+
+#: ../libpurple/protocols/silc/silc.c:395
+#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Slut p奪 minne"
 
-#: ../libgaim/protocols/silc/silc.c:323
+#: ../libpurple/protocols/silc/silc.c:438
+#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Kan inte inleda SILC-klientanslutning"
 
-#: ../libgaim/protocols/silc/silc.c:330
-msgid "Cannot find/access ~/.silc directory"
-msgstr "Kan inte hitta/l辰sa katalogen ~/.silc"
-
-#. Progress
-#: ../libgaim/protocols/silc/silc.c:335
-msgid "Connecting to SILC Server"
-msgstr "Ansluter till SILC-server"
-
-#: ../libgaim/protocols/silc/silc.c:344
-#, c-format
-msgid "Could not load SILC key pair: %s"
-msgstr "Kunde inte ladda SILC nyckelpar: %s"
-
-#: ../libgaim/protocols/silc/silc.c:365
-msgid "Unable to create connection"
-msgstr "Kan inte skapa anslutning"
-
-#: ../libgaim/protocols/silc/silc.c:664
+#: ../libpurple/protocols/silc/silc.c:445
+msgid "Error loading SILC key pair"
+msgstr "Fel vid inl辰sning av SILC-nyckelpar"
+
+#: ../libpurple/protocols/silc/silc.c:739
+#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Ditt nuvarande hum旦r"
 
-#: ../libgaim/protocols/silc/silc.c:680
+#: ../libpurple/protocols/silc/silc.c:741
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1636
+msgid "Normal"
+msgstr "Normal"
+
+#: ../libpurple/protocols/silc/silc.c:755
+#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "K辰r"
 
-#: ../libgaim/protocols/silc/silc.c:691
+#: ../libpurple/protocols/silc/silc.c:766
+#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -13058,261 +10092,363 @@
 "\n"
 "Dina f旦redragna kontakmetoder"
 
-#: ../libgaim/protocols/silc/silc.c:699
-#: ../libgaim/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/silc.c:774
+#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc10/silc.c:685
+#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libgaim/protocols/silc/silc.c:701
-#: ../libgaim/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:776
+#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc10/silc.c:687
+#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libgaim/protocols/silc/silc.c:703
+#: ../libpurple/protocols/silc/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Videokonferens"
 
-#: ../libgaim/protocols/silc/silc.c:708
+#: ../libpurple/protocols/silc/silc.c:783
+#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Din nuvarande status"
 
-#: ../libgaim/protocols/silc/silc.c:715
+#: ../libpurple/protocols/silc/silc.c:790
+#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Anslutningstj辰nster"
 
-#: ../libgaim/protocols/silc/silc.c:718
+#: ../libpurple/protocols/silc/silc.c:793
+#: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "L奪t andra se vilka tj辰nster du anv辰nder"
 
-#: ../libgaim/protocols/silc/silc.c:724
+#: ../libpurple/protocols/silc/silc.c:799
+#: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "L奪t andra se vilken dator du anv辰nder"
 
-#: ../libgaim/protocols/silc/silc.c:731
+#: ../libpurple/protocols/silc/silc.c:806
+#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Din VCard-fil"
 
-#: ../libgaim/protocols/silc/silc.c:743
-#: ../libgaim/protocols/silc/silc.c:744
+#: ../libpurple/protocols/silc/silc.c:812
+msgid "Timezone (UTC)"
+msgstr "Tidszon (UTC)"
+
+#: ../libpurple/protocols/silc/silc.c:816
+#: ../libpurple/protocols/silc/silc.c:817
+#: ../libpurple/protocols/silc10/silc.c:729
+#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Anv辰ndarens anslutningsstatusattribut"
 
-#: ../libgaim/protocols/silc/silc.c:745
-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 "Du kan l奪ta andra anv辰ndare se din anslutningsstatusinformation och din personliga information. Var god fyll i informationen du vill att andra ska kunna se om dig."
-
-#: ../libgaim/protocols/silc/silc.c:785
-#: ../libgaim/protocols/silc/silc.c:791
-#: ../libgaim/protocols/silc/silc.c:1430
+#: ../libpurple/protocols/silc/silc.c:818
+#: ../libpurple/protocols/silc10/silc.c:731
+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 ""
+"Du kan l奪ta andra anv辰ndare se din anslutningsstatusinformation och din "
+"personliga information. Var god fyll i informationen du vill att andra ska "
+"kunna se om dig."
+
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc/silc.c:865
+#: ../libpurple/protocols/silc/silc.c:1486
+#: ../libpurple/protocols/silc10/silc.c:772
+#: ../libpurple/protocols/silc10/silc.c:778
+#: ../libpurple/protocols/silc10/silc.c:1415
 msgid "Message of the Day"
 msgstr "Meddelande f旦r dagen"
 
-#: ../libgaim/protocols/silc/silc.c:785
+#: ../libpurple/protocols/silc/silc.c:859
+#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Inget dagligt meddelande tillg辰nglig"
 
-#: ../libgaim/protocols/silc/silc.c:786
-#: ../libgaim/protocols/silc/silc.c:1425
+#: ../libpurple/protocols/silc/silc.c:860
+#: ../libpurple/protocols/silc/silc.c:1481
+#: ../libpurple/protocols/silc10/silc.c:773
+#: ../libpurple/protocols/silc10/silc.c:1410
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Det finns inget dagligt meddelande associerat med denna anslutning"
 
-#: ../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:911
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc/silc.c:1028
+#: ../libpurple/protocols/silc/silc.c:1029
+#: ../libpurple/protocols/silc10/silc.c:824
+#: ../libpurple/protocols/silc10/silc.c:868
+#: ../libpurple/protocols/silc10/silc.c:939
+#: ../libpurple/protocols/silc10/silc.c:940
 msgid "Create New SILC Key Pair"
 msgstr "Skapa nytt SILC-nyckelpar"
 
-#: ../libgaim/protocols/silc/silc.c:837
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "L旦senorden st辰mmer inte 旦verens"
 
-#: ../libgaim/protocols/silc/silc.c:881
+#: ../libpurple/protocols/silc/silc.c:957
+#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Genrerering av nyckelpar misslyckades"
 
-#: ../libgaim/protocols/silc/silc.c:920
+#: ../libpurple/protocols/silc/silc.c:996
+#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Nyckell辰ngd"
 
-#: ../libgaim/protocols/silc/silc.c:922
+#: ../libpurple/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Publik nyckelfil"
 
-#: ../libgaim/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/silc.c:1000
+#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Privat nyckelfil"
 
-#: ../libgaim/protocols/silc/silc.c:947
+#: ../libpurple/protocols/silc/silc.c:1023
+#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "L旦senord (upprepa)"
 
-#: ../libgaim/protocols/silc/silc.c:954
+#: ../libpurple/protocols/silc/silc.c:1030
+#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Generera nyckelpar"
 
-#: ../libgaim/protocols/silc/silc.c:998
+#: ../libpurple/protocols/silc/silc.c:1073
+#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Anslutningsstatus"
 
-#: ../libgaim/protocols/silc/silc.c:1007
+#: ../libpurple/protocols/silc/silc.c:1081
+#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "Visa Meddelande f旦r dagen"
 
-#: ../libgaim/protocols/silc/silc.c:1011
+#: ../libpurple/protocols/silc/silc.c:1085
+#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "Skapa SILC-nyckelpar..."
 
-#: ../libgaim/protocols/silc/silc.c:1110
+#: ../libpurple/protocols/silc/silc.c:1177
+#: ../libpurple/protocols/silc10/silc.c:1095
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Anv辰ndaren <I>%s</> 辰r inte tillg辰nglig p奪 n辰tverket"
 
-#: ../libgaim/protocols/silc/silc.c:1301
+#: ../libpurple/protocols/silc/silc.c:1357
+#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "�mnet 辰r f旦r l奪ngt"
 
-#: ../libgaim/protocols/silc/silc.c:1382
+#: ../libpurple/protocols/silc/silc.c:1438
+#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "Du m奪ste ange ett alias"
 
-#: ../libgaim/protocols/silc/silc.c:1484
+#: ../libpurple/protocols/silc/silc.c:1540
+#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "kanal %s kunde inte hittas"
 
-#: ../libgaim/protocols/silc/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1545
+#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanall辰gen f旦r %s: %s"
 
-#: ../libgaim/protocols/silc/silc.c:1491
+#: ../libpurple/protocols/silc/silc.c:1547
+#: ../libpurple/protocols/silc10/silc.c:1476
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "inga kanall辰gen 辰r angivna f旦r %s"
 
-#: ../libgaim/protocols/silc/silc.c:1504
+#: ../libpurple/protocols/silc/silc.c:1560
+#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Misslyckades med att ange cmodes f旦r %s"
 
-#: ../libgaim/protocols/silc/silc.c:1534
-#, c-format
-msgid "Unknown command: %s, (may be a Gaim bug)"
-msgstr "Ok辰nt kommando: %s, (kan vara ett Gaim-bugg)"
-
-#: ../libgaim/protocols/silc/silc.c:1597
+#: ../libpurple/protocols/silc/silc.c:1590
+#: ../libpurple/protocols/silc10/silc.c:1519
+#, c-format
+msgid "Unknown command: %s, (may be a client bug)"
+msgstr "Ok辰nt kommando: %s, (kan vara ett fel i klienten)"
+
+#: ../libpurple/protocols/silc/silc.c:1653
+#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanal]: L辰mna chatten"
 
-#: ../libgaim/protocols/silc/silc.c:1601
+#: ../libpurple/protocols/silc/silc.c:1657
+#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanal]: L辰mna chatten"
 
-#: ../libgaim/protocols/silc/silc.c:1605
+#: ../libpurple/protocols/silc/silc.c:1661
+#: ../libpurple/protocols/silc10/silc.c:1590
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;nytt 辰mne&gt;]:  Visa eller 辰ndra 辰mnet"
 
-#: ../libgaim/protocols/silc/silc.c:1610
+#: ../libpurple/protocols/silc/silc.c:1666
+#: ../libpurple/protocols/silc10/silc.c:1595
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
-msgstr "join &lt;kanal&gt; [&lt;l旦senord&gt;]:  Anslut till enn chatt p奪 detta n辰tverk"
-
-#: ../libgaim/protocols/silc/silc.c:1614
+msgstr ""
+"join &lt;kanal&gt; [&lt;l旦senord&gt;]:  Anslut till enn chatt p奪 detta "
+"n辰tverk"
+
+#: ../libpurple/protocols/silc/silc.c:1670
+#: ../libpurple/protocols/silc10/silc.c:1599
 msgid "list:  List channels on this network"
 msgstr "list: Listar  kanalerna p奪 detta n辰tverk"
 
-#: ../libgaim/protocols/silc/silc.c:1618
+#: ../libpurple/protocols/silc/silc.c:1674
+#: ../libpurple/protocols/silc10/silc.c:1603
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nick&gt;:  Visar information f旦r nick"
 
-#: ../libgaim/protocols/silc/silc.c:1622
-#: ../libgaim/protocols/zephyr/zephyr.c:2690
+#: ../libpurple/protocols/silc/silc.c:1678
+#: ../libpurple/protocols/silc10/silc.c:1607
+#: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
-msgstr "msg &lt;nick&gt; &lt;meddelande&gt;:  Skicka ett privat meddelande till en anv辰ndare"
-
-#: ../libgaim/protocols/silc/silc.c:1626
+msgstr ""
+"msg &lt;nick&gt; &lt;meddelande&gt;:  Skicka ett privat meddelande till en "
+"anv辰ndare"
+
+#: ../libpurple/protocols/silc/silc.c:1682
+#: ../libpurple/protocols/silc10/silc.c:1611
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
-msgstr "query &lt;nick&gt; [&lt;meddelande&gt;]:  Skicka ett privat meddelande till en anv辰ndare"
-
-#: ../libgaim/protocols/silc/silc.c:1630
+msgstr ""
+"query &lt;nick&gt; [&lt;meddelande&gt;]:  Skicka ett privat meddelande till "
+"en anv辰ndare"
+
+#: ../libpurple/protocols/silc/silc.c:1686
+#: ../libpurple/protocols/silc10/silc.c:1615
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Visar serverns Dagliga meddelande (MOTD)"
 
-#: ../libgaim/protocols/silc/silc.c:1634
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:  Fr奪nskilj denna session"
 
-#: ../libgaim/protocols/silc/silc.c:1638
+#: ../libpurple/protocols/silc/silc.c:1694
+#: ../libpurple/protocols/silc10/silc.c:1623
 msgid "quit [message]:  Disconnect from the server, with an optional message"
 msgstr "quit [meddelande]: koppla fr奪n servern med ett till辰ggsmeddelande"
 
-#: ../libgaim/protocols/silc/silc.c:1642
+#: ../libpurple/protocols/silc/silc.c:1698
+#: ../libpurple/protocols/silc10/silc.c:1627
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;kommando&gt;:  Utf旦r ett SILC-kommando"
 
-#: ../libgaim/protocols/silc/silc.c:1648
+#: ../libpurple/protocols/silc/silc.c:1704
+#: ../libpurple/protocols/silc10/silc.c:1633
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  D旦da nick"
 
-#: ../libgaim/protocols/silc/silc.c:1652
+#: ../libpurple/protocols/silc/silc.c:1708
+#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nyttalias&gt;:  �ndrar ditt alias"
 
-#: ../libgaim/protocols/silc/silc.c:1656
+#: ../libpurple/protocols/silc/silc.c:1712
+#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nick&gt;:  Visa information om nick"
 
-#: ../libgaim/protocols/silc/silc.c:1660
-msgid "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display channel modes"
-msgstr "cmode &lt;kanal&gt; [+|-&lt;l辰gen&gt;] [argument]:  �ndra eller visa kanall辰gen"
-
-#: ../libgaim/protocols/silc/silc.c:1664
-msgid "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes on channel"
-msgstr "cumode &lt;kanal&gt; +|-&lt;l辰gen&gt; &lt;nick&gt;:  �ndra l辰gen f旦r nick p奪 kanal"
-
-#: ../libgaim/protocols/silc/silc.c:1668
+#: ../libpurple/protocols/silc/silc.c:1716
+#: ../libpurple/protocols/silc10/silc.c:1645
+msgid ""
+"cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
+"channel modes"
+msgstr ""
+"cmode &lt;kanal&gt; [+|-&lt;l辰gen&gt;] [argument]:  �ndra eller visa "
+"kanall辰gen"
+
+#: ../libpurple/protocols/silc/silc.c:1720
+#: ../libpurple/protocols/silc10/silc.c:1649
+msgid ""
+"cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
+"on channel"
+msgstr ""
+"cumode &lt;kanal&gt; +|-&lt;l辰gen&gt; &lt;nick&gt;:  �ndra l辰gen f旦r nick p奪 "
+"kanal"
+
+#: ../libpurple/protocols/silc/silc.c:1724
+#: ../libpurple/protocols/silc10/silc.c:1653
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;anv辰ndarl辰gen&gt;:  Anger dina l辰gen p奪 n辰tverket"
 
-#: ../libgaim/protocols/silc/silc.c:1672
+#: ../libpurple/protocols/silc/silc.c:1728
+#: ../libpurple/protocols/silc10/silc.c:1657
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nick&gt; [-pubkey]:  H辰mta serveroperat旦rprivilegier"
 
-#: ../libgaim/protocols/silc/silc.c:1676
-msgid "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from channel invite list"
-msgstr "invite &lt;kanal&gt; [-|+]&lt;nick&gt;:  bjud in nick eller l辰gg till/ta bort fr奪n kanalens inbjudningslista"
-
-#: ../libgaim/protocols/silc/silc.c:1680
+#: ../libpurple/protocols/silc/silc.c:1732
+#: ../libpurple/protocols/silc10/silc.c:1661
+msgid ""
+"invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
+"channel invite list"
+msgstr ""
+"invite &lt;kanal&gt; [-|+]&lt;nick&gt;:  bjud in nick eller l辰gg till/ta "
+"bort fr奪n kanalens inbjudningslista"
+
+#: ../libpurple/protocols/silc/silc.c:1736
+#: ../libpurple/protocols/silc10/silc.c:1665
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr "kick &lt;kanal&gt; &lt;nick&gt; [kommentar]:  Sparka klient fr奪n kanal"
 
-#: ../libgaim/protocols/silc/silc.c:1684
+#: ../libpurple/protocols/silc/silc.c:1740
+#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  Visa administrativa detaljer f旦r server"
 
-#: ../libgaim/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc/silc.c:1744
+#: ../libpurple/protocols/silc10/silc.c:1673
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [&lt;kanal&gt; +|-&lt;nick&gt;]:  Banna klient fr奪n kanal"
 
-#: ../libgaim/protocols/silc/silc.c:1692
+#: ../libpurple/protocols/silc/silc.c:1748
+#: ../libpurple/protocols/silc10/silc.c:1677
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
-msgstr "getkey &lt;nick|server&gt;:  H辰mta serverns eller klientens publika nyckel"
-
-#: ../libgaim/protocols/silc/silc.c:1696
+msgstr ""
+"getkey &lt;nick|server&gt;:  H辰mta serverns eller klientens publika nyckel"
+
+#: ../libpurple/protocols/silc/silc.c:1752
+#: ../libpurple/protocols/silc10/silc.c:1681
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Visa server och n辰tverksstatestik"
 
-#: ../libgaim/protocols/silc/silc.c:1700
+#: ../libpurple/protocols/silc/silc.c:1756
+#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: skicka PING till den anslutna servern"
 
-#: ../libgaim/protocols/silc/silc.c:1705
+#: ../libpurple/protocols/silc/silc.c:1761
+#: ../libpurple/protocols/silc10/silc.c:1690
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanal&gt;:  Lista anv辰ndare i kanal"
 
-#: ../libgaim/protocols/silc/silc.c:1709
-msgid "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List specific users in channel(s)"
-msgstr "names [-count|-ops|-halfops|-voices|-normal] &lt;kanal(er)&gt;:  Lista specifika anv辰ndare i kanal(er)"
+#: ../libpurple/protocols/silc/silc.c:1765
+#: ../libpurple/protocols/silc10/silc.c:1694
+msgid ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
+"specific users in channel(s)"
+msgstr ""
+"names [-count|-ops|-halfops|-voices|-normal] &lt;kanal(er)&gt;:  Lista "
+"specifika anv辰ndare i kanal(er)"
 
 #. *< type
 #. *< ui_requirement
@@ -13323,112 +10459,141 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libgaim/protocols/silc/silc.c:1820
+#: ../libpurple/protocols/silc/silc.c:1876
+#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "Insticksmodul f旦r SILC-protokoll"
 
 #. *  description
-#: ../libgaim/protocols/silc/silc.c:1822
+#: ../libpurple/protocols/silc/silc.c:1878
+#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) Protokoll"
 
-#: ../libgaim/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc/silc.c:1910
+#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2029
+msgid "Network"
+msgstr "N辰tverk"
+
+#: ../libpurple/protocols/silc/silc.c:1921
+#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "Publik nyckelfil"
 
-#: ../libgaim/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc/silc.c:1925
+#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "Privat nyckelfil"
 
-#: ../libgaim/protocols/silc/silc.c:1873
+#: ../libpurple/protocols/silc/silc.c:1935
+#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "Chiffer"
 
-#: ../libgaim/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc/silc.c:1945
+#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libgaim/protocols/silc/silc.c:1886
+#: ../libpurple/protocols/silc/silc.c:1948
+msgid "Use Perfect Forward Secrecy"
+msgstr "Anv辰nd Perfekt Vidarebefodrandesekretess"
+
+#: ../libpurple/protocols/silc/silc.c:1952
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "Publik nyckelautentisering"
 
-#: ../libgaim/protocols/silc/silc.c:1889
-msgid "Reject watching by other users"
-msgstr "Avvisa insyn fr奪n andra anv辰ndare"
-
-#: ../libgaim/protocols/silc/silc.c:1892
-msgid "Block invites"
-msgstr "Blockera inbjudningar"
-
-#: ../libgaim/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc/silc.c:1955
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Blockera snabbmeddelanden utan nyckelutbyte"
 
-#: ../libgaim/protocols/silc/silc.c:1898
-msgid "Reject online status attribute requests"
-msgstr "Avvisa f旦rfr奪gningar efter attributen f旦r anslutningsstatus"
-
-#: ../libgaim/protocols/silc/silc.c:1901
+#: ../libpurple/protocols/silc/silc.c:1958
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "Blockera meddelande till whiteboard"
 
-#: ../libgaim/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc/silc.c:1961
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "�ppna automatiskt whiteboard"
 
-#: ../libgaim/protocols/silc/silc.c:1907
+#: ../libpurple/protocols/silc/silc.c:1964
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "Signera och verifiera alla meddelanden digitalt"
 
-#: ../libgaim/protocols/silc/util.c:207
-#: ../libgaim/protocols/silc/util.c:247
+#: ../libpurple/protocols/silc/util.c:207
+#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc10/util.c:207
+#: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Skapa SILC-nyckelpar..."
 
+#: ../libpurple/protocols/silc/util.c:215
+#: ../libpurple/protocols/silc/util.c:257
+msgid "Cannot create SILC key pair\n"
+msgstr "Kunde inte skapa SILC-nyckelpar\n"
+
 #. 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:358
+#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "F旦r- och efternamn: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:357
+#: ../libpurple/protocols/silc/util.c:360
+#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Anv辰ndarnamn: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:359
+#: ../libpurple/protocols/silc/util.c:362
+#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-Post: \t\t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:361
+#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "V辰rdnamn: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:363
+#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisation: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:365
+#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Land: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritm: \t%s\n"
 
-#: ../libgaim/protocols/silc/util.c:367
+#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Nyckell辰ngd: \t%d bits\n"
 
-#: ../libgaim/protocols/silc/util.c:369
+#: ../libpurple/protocols/silc/util.c:372
+#, c-format
+msgid "Version: \t%s\n"
+msgstr "Version: \t%s\n"
+
+#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -13439,7 +10604,8 @@
 "%s\n"
 "\n"
 
-#: ../libgaim/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -13448,71 +10614,144 @@
 "Publik nyckelpladderavtryck:\n"
 "%s"
 
-#: ../libgaim/protocols/silc/util.c:374
-#: ../libgaim/protocols/silc/util.c:375
+#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:380
+#: ../libpurple/protocols/silc10/util.c:374
+#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Publik nyckelinformation"
 
-#: ../libgaim/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "S旦kare"
 
-#: ../libgaim/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videokonferens"
 
-#: ../libgaim/protocols/silc/util.c:581
+#: ../libpurple/protocols/silc/util.c:583
+#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Dator"
 
-#: ../libgaim/protocols/silc/util.c:585
+#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libgaim/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libgaim/protocols/silc/wb.c:284
+#: ../libpurple/protocols/silc/wb.c:284 ../libpurple/protocols/silc10/wb.c:284
 #, c-format
 msgid "%s sent message to whiteboard. Would you like to open the whiteboard?"
 msgstr "%s s辰nde meddelanden till whiteboard. Vill du 旦ppna whiteboarden?"
 
-#: ../libgaim/protocols/silc/wb.c:288
-#, c-format
-msgid "%s sent message to whiteboard on %s channel. Would you like to open the whiteboard?"
-msgstr "%s s辰nde ett meddelande till vita tavlan i kanal %s. Will du 旦ppna den vita tavlan?"
-
-#: ../libgaim/protocols/silc/wb.c:302
+#: ../libpurple/protocols/silc/wb.c:288 ../libpurple/protocols/silc10/wb.c:288
+#, c-format
+msgid ""
+"%s sent message to whiteboard on %s channel. Would you like to open the "
+"whiteboard?"
+msgstr ""
+"%s s辰nde ett meddelande till vita tavlan i kanal %s. Will du 旦ppna den vita "
+"tavlan?"
+
+#: ../libpurple/protocols/silc/wb.c:302 ../libpurple/protocols/silc10/wb.c:302
 msgid "Whiteboard"
 msgstr "Whiteboard"
 
+#: ../libpurple/protocols/silc10/ops.c:1559
+msgid "No server statistics available"
+msgstr "Ingen serverstatestik tillg辰nglig"
+
+#: ../libpurple/protocols/silc10/ops.c:1931
+msgid "Failure: Version mismatch, upgrade your client"
+msgstr "Misslyckande: Versionerna matchar inte, upgradera din klient"
+
+#: ../libpurple/protocols/silc10/ops.c:1934
+msgid "Failure: Remote does not trust/support your public key"
+msgstr ""
+"Misslyckande: Fj辰rrdatorn litar inte p奪/st旦djer inte din publika nyckel"
+
+#: ../libpurple/protocols/silc10/ops.c:1937
+msgid "Failure: Remote does not support proposed KE group"
+msgstr "Misslyckande: Fj辰rrdatorn st旦djer inte f旦reslagen KE-grupp"
+
+#: ../libpurple/protocols/silc10/ops.c:1940
+msgid "Failure: Remote does not support proposed cipher"
+msgstr "Misslyckande: Fj辰rrdator st旦djer inte f旦reslaget chiffer"
+
+#: ../libpurple/protocols/silc10/ops.c:1943
+msgid "Failure: Remote does not support proposed PKCS"
+msgstr "Misslyckande: Fj辰rrdatorn st旦djer inte f旦reslagen PKCS"
+
+#: ../libpurple/protocols/silc10/ops.c:1946
+msgid "Failure: Remote does not support proposed hash function"
+msgstr "Misslyckande: Fj辰rrdatorn st旦djer inte f旦reslagen hash-funktion"
+
+#: ../libpurple/protocols/silc10/ops.c:1949
+msgid "Failure: Remote does not support proposed HMAC"
+msgstr "Misslyckande: Fj辰rrdatorn st旦djer inte f旦reslagen HMAC"
+
+#: ../libpurple/protocols/silc10/ops.c:1951
+msgid "Failure: Incorrect signature"
+msgstr "Misslyckande: Felaktig signatur"
+
+#: ../libpurple/protocols/silc10/ops.c:1953
+msgid "Failure: Invalid cookie"
+msgstr "Misslyckande: Felaktig cookie"
+
+#: ../libpurple/protocols/silc10/ops.c:1964
+msgid "Failure: Authentication failed"
+msgstr "Misslyckande: Autentisering misslyckades"
+
+#: ../libpurple/protocols/silc10/silc.c:182
+msgid "Cannot initialize SILC Client connection"
+msgstr "Kan inte inleda SILC-klientanslutning"
+
+#: ../libpurple/protocols/silc10/silc.c:290
+msgid "John Noname"
+msgstr "John Namnl旦s"
+
+#: ../libpurple/protocols/silc10/silc.c:320
+msgid "Cannot find/access ~/.silc directory"
+msgstr "Kan inte hitta/l辰sa katalogen ~/.silc"
+
+#: ../libpurple/protocols/silc10/silc.c:334
+#, c-format
+msgid "Could not load SILC key pair: %s"
+msgstr "Kunde inte ladda SILC nyckelpar: %s"
+
 #. 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 "Kunde inte skriva"
 
-#: ../libgaim/protocols/simple/simple.c:438
-#: ../libgaim/protocols/simple/simple.c:1482
+#: ../libpurple/protocols/simple/simple.c:438
+#: ../libpurple/protocols/simple/simple.c:1489
 msgid "Could not connect"
 msgstr "Kunde inte ansluta"
 
-#: ../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:1523
+#: ../libpurple/protocols/simple/simple.c:1565
+#: ../libpurple/protocols/simple/simple.c:1578
+#: ../libpurple/protocols/simple/simple.c:1629
 msgid "Could not create listen socket"
 msgstr "Kunde inte skapa lyssnarsocket"
 
-#: ../libgaim/protocols/simple/simple.c:1539
+#: ../libpurple/protocols/simple/simple.c:1546
 msgid "Couldn't resolve host"
 msgstr "Kunde ej sl奪 upp v辰rden"
 
-#: ../libgaim/protocols/simple/simple.c:1630
+#: ../libpurple/protocols/simple/simple.c:1637
 msgid "Could not resolve hostname"
 msgstr "Kunde ej sl奪 upp v辰rden"
 
-#: ../libgaim/protocols/simple/simple.c:1647
+#: ../libpurple/protocols/simple/simple.c:1654
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP-sk辰rmnamn f奪r inte inneh奪lla mellanslag eller symbolen @"
 
@@ -13524,242 +10763,239 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libgaim/protocols/simple/simple.c:1816
+#: ../libpurple/protocols/simple/simple.c:1829
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Insticksmodul f旦r SIP/SIMPLE-protokollet"
 
 #. *  summary
-#: ../libgaim/protocols/simple/simple.c:1817
+#: ../libpurple/protocols/simple/simple.c:1830
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Insticksmodulen f旦r SIP/SIMPLE"
 
-#: ../libgaim/protocols/simple/simple.c:1839
+#: ../libpurple/protocols/simple/simple.c:1858
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Publicera statusen (notering: alla kan se dig)"
 
-#: ../libgaim/protocols/simple/simple.c:1845
+#: ../libpurple/protocols/simple/simple.c:1864
 msgid "Use UDP"
 msgstr "Anv辰nda UDP"
 
-#: ../libgaim/protocols/simple/simple.c:1847
+#: ../libpurple/protocols/simple/simple.c:1866
 msgid "Use proxy"
 msgstr "Anv辰nd proxy"
 
-#: ../libgaim/protocols/simple/simple.c:1849
+#: ../libpurple/protocols/simple/simple.c:1868
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libgaim/protocols/simple/simple.c:1851
+#: ../libpurple/protocols/simple/simple.c:1870
 msgid "Auth User"
 msgstr "Autentisera anv辰ndare"
 
-#: ../libgaim/protocols/simple/simple.c:1853
+#: ../libpurple/protocols/simple/simple.c:1872
 msgid "Auth Domain"
 msgstr "Autentiserad dom辰n"
 
-#: ../libgaim/protocols/toc/toc.c:139
+#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Sl奪 upp %s"
 
-#: ../libgaim/protocols/toc/toc.c:148
+#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Anslutning till %s misslyckades"
 
-#: ../libgaim/protocols/toc/toc.c:201
+#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Inloggning: %s"
 
-#: ../libgaim/protocols/toc/toc.c:488
+#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Kan inte skriva filen %s."
 
-#: ../libgaim/protocols/toc/toc.c:491
+#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Kan inte l辰sa filen %s."
 
-#: ../libgaim/protocols/toc/toc.c:494
+#: ../libpurple/protocols/toc/toc.c:494
 #, c-format
 msgid "Message too long, last %s bytes truncated."
 msgstr "Meddelandet 辰r f旦r l奪ngt, de sista %s byten klipptes bort."
 
-#: ../libgaim/protocols/toc/toc.c:497
+#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s 辰r inte inloggad f旦r tillf辰llet."
 
-#: ../libgaim/protocols/toc/toc.c:500
+#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Varning f旦r %s 辰r inte till奪ten."
 
-#: ../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 "Ett meddelande har kastats, du 旦verskrider serverns hastighetsgr辰ns."
 
-#: ../libgaim/protocols/toc/toc.c:506
+#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chatt i %s 辰r inte tillg辰nglig."
 
-#: ../libgaim/protocols/toc/toc.c:509
+#: ../libpurple/protocols/toc/toc.c:509
 #, c-format
 msgid "You are sending messages too fast to %s."
 msgstr "Du skickar meddelanden f旦r snabbt till %s."
 
-#: ../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 "Du missade ett snabbmeddelande fr奪n %s eftersom det var f旦r stort."
 
-#: ../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 "Du missade ett snabbmeddelande fr奪n %s eftersom det skickades f旦r snabbt."
-
-#: ../libgaim/protocols/toc/toc.c:518
+msgstr ""
+"Du missade ett snabbmeddelande fr奪n %s eftersom det skickades f旦r snabbt."
+
+#: ../libpurple/protocols/toc/toc.c:518
 msgid "Failure."
 msgstr "Misslyckande."
 
-#: ../libgaim/protocols/toc/toc.c:521
+#: ../libpurple/protocols/toc/toc.c:521
 msgid "Too many matches."
 msgstr "F旦r m奪nga tr辰ffar."
 
-#: ../libgaim/protocols/toc/toc.c:524
+#: ../libpurple/protocols/toc/toc.c:524
 msgid "Need more qualifiers."
 msgstr "Beh旦ver fler kvalificerare."
 
-#: ../libgaim/protocols/toc/toc.c:527
+#: ../libpurple/protocols/toc/toc.c:527
 msgid "Dir service temporarily unavailable."
 msgstr "Katalogtj辰nsten 辰r tillf辰lligt on奪bar."
 
-#: ../libgaim/protocols/toc/toc.c:530
+#: ../libpurple/protocols/toc/toc.c:530
 msgid "E-mail lookup restricted."
 msgstr "E-postuppslagning 辰r begr辰nsad."
 
-#: ../libgaim/protocols/toc/toc.c:533
+#: ../libpurple/protocols/toc/toc.c:533
 msgid "Keyword ignored."
 msgstr "Nyckelordet ignorerades."
 
-#: ../libgaim/protocols/toc/toc.c:536
+#: ../libpurple/protocols/toc/toc.c:536
 msgid "No keywords."
 msgstr "Inga nyckelord."
 
-#: ../libgaim/protocols/toc/toc.c:539
+#: ../libpurple/protocols/toc/toc.c:539
 msgid "User has no directory information."
 msgstr "Anv辰ndaren har ingen kataloginformation."
 
-#: ../libgaim/protocols/toc/toc.c:543
+#: ../libpurple/protocols/toc/toc.c:543
 msgid "Country not supported."
 msgstr "Landet st旦ds inte."
 
-#: ../libgaim/protocols/toc/toc.c:546
+#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Ok辰nt misslyckande: %s."
 
-#: ../libgaim/protocols/toc/toc.c:549
+#: ../libpurple/protocols/toc/toc.c:549
 msgid "Incorrect screen name or password."
 msgstr "Felaktigt sk辰rmnamn eller l旦senord."
 
-#: ../libgaim/protocols/toc/toc.c:552
+#: ../libpurple/protocols/toc/toc.c:552
 msgid "The service is temporarily unavailable."
 msgstr "Tj辰nsten 辰r tillf辰lligt on奪bar."
 
-#: ../libgaim/protocols/toc/toc.c:555
+#: ../libpurple/protocols/toc/toc.c:555
 msgid "Your warning level is currently too high to log in."
 msgstr "Din varningsniv奪 辰r f旦r tillf辰llet f旦r h旦g f旦r att logga in."
 
-#: ../libgaim/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 "Du har anslutit och kopplat ifr奪n f旦r m奪nga g奪nger. V辰nta tio minuter och prova igen. Om du forts辰tter att f旦rs旦ka kommer du att f奪 v辰nta 辰nnu l辰ngre."
-
-#: ../libgaim/protocols/toc/toc.c:560
+#: ../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 ""
+"Du har anslutit och kopplat ifr奪n f旦r m奪nga g奪nger. V辰nta tio minuter och "
+"prova igen. Om du forts辰tter att f旦rs旦ka kommer du att f奪 v辰nta 辰nnu l辰ngre."
+
+#: ../libpurple/protocols/toc/toc.c:560
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Ett ok辰nt inloggningsfel har intr辰ffat: %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 "Ett ok辰nt fel, %d, har intr辰ffat. Information: %s"
 
-#: ../libgaim/protocols/toc/toc.c:590
+#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Ogiltigt gruppnamn"
 
-#: ../libgaim/protocols/toc/toc.c:674
+#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Anslutningen st辰ngd"
 
-#: ../libgaim/protocols/toc/toc.c:714
+#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "V辰ntar p奪 svar..."
 
-#: ../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 har kommit tillbaka fr奪n dess paus. Du kan nu skicka meddelanden igen."
-
-#: ../libgaim/protocols/toc/toc.c:995
+msgstr ""
+"TOC har kommit tillbaka fr奪n dess paus. Du kan nu skicka meddelanden igen."
+
+#: ../libpurple/protocols/toc/toc.c:995
 msgid "Password Change Successful"
 msgstr "L旦senords辰ndring lyckades"
 
-#: ../libgaim/protocols/toc/toc.c:999
-msgid "TOC has sent a PAUSE command."
-msgstr "TOC har skickat en PAUS-kommando."
-
-#: ../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 "N辰r detta h辰nder, ignorerar TOC alla meddelanden som skickas till den, och kan sparak ut dig om du skickar ett meddelande. Gaim kommer att f旦rhindra att n奪got kommer igenom. Detta 辰r endast tillf辰lligt, h奪ll ut."
-
-#: ../libgaim/protocols/toc/toc.c:1373
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5519
+#: ../pidgin/gtkblist.c:5873
 msgid "_Group:"
 msgstr "_Grupp:"
 
-#: ../libgaim/protocols/toc/toc.c:1555
+#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "H辰mta kataloginformation"
 
-#: ../libgaim/protocols/toc/toc.c:1695
+#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "St辰ll in kataloginformation"
 
-#: ../libgaim/protocols/toc/toc.c:1817
+#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Kunde inte 旦ppna %s f旦r l辰sning!"
 
-#: ../libgaim/protocols/toc/toc.c:1853
+#: ../libpurple/protocols/toc/toc.c:1833
 msgid "File transfer failed; other side probably canceled."
 msgstr "Fil旦verf旦ringen misslyckades, antagligen eftersom andra sidan avbr旦t."
 
-#: ../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 "Kunde inte ansluta f旦r 旦verf旦ring."
 
-#: ../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 "Kunde inte skriva filhuvud, filen kommer inte att skickas."
 
-#: ../libgaim/protocols/toc/toc.c:2195
-msgid "Gaim - Save As..."
-msgstr "Gaim - Spara som..."
-
-#: ../libgaim/protocols/toc/toc.c:2229
+#: ../libpurple/protocols/toc/toc.c:2175
+msgid "Save As..."
+msgstr "Spara som..."
+
+#: ../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] "%s ber %s att acceptera %d fil: %s (%.2f %s)%s%s"
 msgstr[1] "%s ber %s att acceptera %d filer: %s (%.2f %s)%s%s"
 
-#: ../libgaim/protocols/toc/toc.c:2236
+#: ../libpurple/protocols/toc/toc.c:2216
 #, c-format
 msgid "%s requests you to send them a file"
 msgstr "%s ber att du ska skicka denne en fil"
@@ -13774,203 +11010,233 @@
 #. *< 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 "Insticksmodul f旦r TOC-protokoll"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:793
+#: ../libpurple/protocols/yahoo/yahoo.c:810
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ditt Yahoo!-meddelande skickades inte."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:852
-#: ../libgaim/protocols/yahoo/yahoo.c:3732
-msgid "Buzz!!"
-msgstr "Buzz!!"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:898
+#: ../libpurple/protocols/yahoo/yahoo.c:880
+#, c-format
+msgid "%s just sent you a Buzz!"
+msgstr "%s skickade just en vibb!"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:927
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-systemmeddelande till %s:"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:958
+#: ../libpurple/protocols/yahoo/yahoo.c:986
 msgid "Authorization denied message:"
 msgstr "Auktoriserings nekelsemeddelande:"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1037
+#: ../libpurple/protocols/yahoo/yahoo.c:1067
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
-msgstr "%s har (retroaktivt) nekat din att l辰gga till henne/honom till din kontaktlista."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1040
-#, c-format
-msgid "%s has (retroactively) denied your request to add them to your list for the following reason: %s."
-msgstr "%s har (retroaktivt) nekat din f旦rfr奪gan att l辰gga till henne/honom till din kontaktlista med f旦ljande motivering: %s."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1043
+msgstr ""
+"%s har (retroaktivt) nekat din att l辰gga till henne/honom till din "
+"kontaktlista."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1070
+#, c-format
+msgid ""
+"%s has (retroactively) denied your request to add them to your list for the "
+"following reason: %s."
+msgstr ""
+"%s har (retroaktivt) nekat din f旦rfr奪gan att l辰gga till henne/honom till din "
+"kontaktlista med f旦ljande motivering: %s."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1073
 msgid "Add buddy rejected"
 msgstr "L辰gg till kompisavvisning"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1794
-#, 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 "Yahoo-servern har beg辰rt att en ok辰nd autentisering ska anv辰ndas. Denna version av Gaim kommer antagligen inte kunna logga in i Yahoo. Kontrollera om det finns uppdateringar p奪 %s."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1797
+#: ../libpurple/protocols/yahoo/yahoo.c:1824
+#, c-format
+msgid ""
+"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 ""
+"Yahoo-servern har beg辰rt att en ok辰nd autentisering ska anv辰ndas. Du kommer "
+"antagligen inte lyckas med att ansluta till Yahoo. Kontrollera om det finns "
+"uppdateringar p奪 %s."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1827
 msgid "Failed Yahoo! Authentication"
 msgstr "Misslyckad Yahoo!-autentisering"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1863
-#, 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 "Du har f旦rs旦kt ignorera %s men hon/han finns i din kompislista. Genom att klicka \"Ja\" tar du bort och blockerar kompisen."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1866
+#: ../libpurple/protocols/yahoo/yahoo.c:1893
+#, 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 ""
+"Du har f旦rs旦kt ignorera %s men hon/han finns i din kompislista. Genom att "
+"klicka \"Ja\" tar du bort och blockerar kompisen."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:1896
 msgid "Ignore buddy?"
 msgstr "Ignorera kompis?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1914
-msgid "Normal authentication failed!"
-msgstr "Normal autentisering misslyckades!"
-
-#: ../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 "Den normala autentiseringsmetoden har misslyckats. Detta inneb辰r antingen att ditt l旦senord 辰r felaktigt eller att Yahoo!'s autentiseringsschema har 辰ndrats. Gaim kommer du f旦rs旦ka ansluta genom Web Messenger autentisering vilket inneb辰r en reducering i funktionalitet."
-
-#: ../libgaim/protocols/yahoo/yahoo.c:1926
+#: ../libpurple/protocols/yahoo/yahoo.c:1955
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Ditt konto 辰r l奪st, var v辰nlig och logga in p奪 Yahoo!s webbplats."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1929
+#: ../libpurple/protocols/yahoo/yahoo.c:1958
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr "Ok辰nt felnummer %d. Logga in p奪 Yahoo!s hemsida kan fixa detta."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1983
+#: ../libpurple/protocols/yahoo/yahoo.c:2012
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr "Kan inte l辰gga till kompis %s i grupp %s p奪 serverlistan f旦r konto %s."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:1986
+#: ../libpurple/protocols/yahoo/yahoo.c:2015
 msgid "Could not add buddy to server list"
 msgstr "Kunde inte l辰gga till kompis i listan p奪 servern"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2105
+#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ H旦rbar %s/%s/%s.swf ] %s"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2436
+#: ../libpurple/protocols/yahoo/yahoo.c:2474
 msgid "Received unexpected HTTP response from server."
 msgstr "Mottog ov辰ntat HTTP-svar fr奪n servern."
 
-#: ../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:2498
+#: ../libpurple/protocols/yahoo/yahoo.c:2684
+#: ../libpurple/protocols/yahoo/yahoo.c:2787
+#: ../libpurple/protocols/yahoo/yahoo.c:2797
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
+#: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Problem med anslutning"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2860
-#: ../libgaim/protocols/yahoo/yahoo.c:3466
+#: ../libpurple/protocols/yahoo/yahoo.c:2524
+#, c-format
+msgid ""
+"Lost connection with %s:\n"
+"%s"
+msgstr ""
+"Tappade anslutningen med %s:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2549
+#, c-format
+msgid ""
+"Could not establish a connection with %s:\n"
+"%s"
+msgstr ""
+"Kunde inte skapa en anslutning med %s:\n"
+"%s"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2899
+#: ../libpurple/protocols/yahoo/yahoo.c:3510
 msgid "Not at Home"
 msgstr "Inte hemma"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2862
-#: ../libgaim/protocols/yahoo/yahoo.c:3469
+#: ../libpurple/protocols/yahoo/yahoo.c:2901
+#: ../libpurple/protocols/yahoo/yahoo.c:3513
 msgid "Not at Desk"
 msgstr "Inte vid skrivbordet"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2864
-#: ../libgaim/protocols/yahoo/yahoo.c:3472
+#: ../libpurple/protocols/yahoo/yahoo.c:2903
+#: ../libpurple/protocols/yahoo/yahoo.c:3516
 msgid "Not in Office"
 msgstr "Inte p奪 kontoret"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2868
-#: ../libgaim/protocols/yahoo/yahoo.c:3478
+#: ../libpurple/protocols/yahoo/yahoo.c:2907
+#: ../libpurple/protocols/yahoo/yahoo.c:3522
 msgid "On Vacation"
 msgstr "P奪 semester"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2872
-#: ../libgaim/protocols/yahoo/yahoo.c:3484
+#: ../libpurple/protocols/yahoo/yahoo.c:2911
+#: ../libpurple/protocols/yahoo/yahoo.c:3528
 msgid "Stepped Out"
 msgstr "G奪tt ut"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:2965
-#: ../libgaim/protocols/yahoo/yahoo.c:2995
+#: ../libpurple/protocols/yahoo/yahoo.c:3004
+#: ../libpurple/protocols/yahoo/yahoo.c:3034
 msgid "Not on server list"
 msgstr "Finns inte i listan p奪 servern"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3012
-#: ../libgaim/protocols/yahoo/yahoo.c:3070
+#: ../libpurple/protocols/yahoo/yahoo.c:3051
+#: ../libpurple/protocols/yahoo/yahoo.c:3109
 msgid "Appear Online"
 msgstr "Verka vara ansluten"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3015
-#: ../libgaim/protocols/yahoo/yahoo.c:3091
+#: ../libpurple/protocols/yahoo/yahoo.c:3054
+#: ../libpurple/protocols/yahoo/yahoo.c:3130
 msgid "Appear Permanently Offline"
 msgstr "Verka vara permanent fr奪nkopplad"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3033
+#: ../libpurple/protocols/yahoo/yahoo.c:3072
 msgid "Presence"
 msgstr "N辰rvaro"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3076
+#: ../libpurple/protocols/yahoo/yahoo.c:3115
 msgid "Appear Offline"
 msgstr "Verka vara fr奪nkopplad"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3085
+#: ../libpurple/protocols/yahoo/yahoo.c:3124
 msgid "Don't Appear Permanently Offline"
 msgstr "Verka inte vara permanent fr奪nkopplad"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3133
+#: ../libpurple/protocols/yahoo/yahoo.c:3172
 msgid "Join in Chat"
 msgstr "Anslut till chatt"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3139
+#: ../libpurple/protocols/yahoo/yahoo.c:3178
 msgid "Initiate Conference"
 msgstr "Starta konferens"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3167
+#: ../libpurple/protocols/yahoo/yahoo.c:3206
 msgid "Presence Settings"
 msgstr "N辰rvaroinst辰llningar"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3173
+#: ../libpurple/protocols/yahoo/yahoo.c:3212
 msgid "Start Doodling"
 msgstr "Starta kladda"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3205
+#. XXX Typo: This should be _("Activate which ID?") - fix after string freeze is over
+#: ../libpurple/protocols/yahoo/yahoo.c:3245
 msgid "Active which ID?"
 msgstr "Vilket ID ska aktiveras?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3214
+#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Join who in chat?"
 msgstr "Anslut vem till chatten?"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3224
+#: ../libpurple/protocols/yahoo/yahoo.c:3268
 msgid "Activate ID..."
 msgstr "Aktivera ID..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3228
+#: ../libpurple/protocols/yahoo/yahoo.c:3272
 msgid "Join User in Chat..."
 msgstr "G奪 med anv辰ndare i chatt..."
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3791
+#: ../libpurple/protocols/yahoo/yahoo.c:3779
+msgid "You have just sent a Buzz!"
+msgstr "Du har just s辰nt en vibb!"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3838
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;rum&gt;:  Anslut till ett chatt-rum p奪 Yahoo-n辰tverket"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3796
+#: ../libpurple/protocols/yahoo/yahoo.c:3843
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Listar rummen p奪 Yahoo's n辰tverk"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3800
+#: ../libpurple/protocols/yahoo/yahoo.c:3847
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: St旦r en anv辰ndare f旦r att f奪 dennes uppm辰rksamhet"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3804
+#: ../libpurple/protocols/yahoo/yahoo.c:3851
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Fr奪ga anv辰ndaren ang奪ende att starta en kladd-session"
 
@@ -13984,226 +11250,241 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/yahoo/yahoo.c:3899
-#: ../libgaim/protocols/yahoo/yahoo.c:3901
+#: ../libpurple/protocols/yahoo/yahoo.c:4059
+#: ../libpurple/protocols/yahoo/yahoo.c:4061
 msgid "Yahoo Protocol Plugin"
 msgstr "Insticksmodul f旦r Yahoo-protokoll"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3918
+#: ../libpurple/protocols/yahoo/yahoo.c:4084
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3921
+#: ../libpurple/protocols/yahoo/yahoo.c:4087
 msgid "Pager server"
 msgstr "S旦karserver"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3924
+#: ../libpurple/protocols/yahoo/yahoo.c:4090
 msgid "Japan Pager server"
 msgstr "Japan S旦kars旦rver"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3927
+#: ../libpurple/protocols/yahoo/yahoo.c:4093
 msgid "Pager port"
 msgstr "S旦kareport"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3930
+#: ../libpurple/protocols/yahoo/yahoo.c:4096
 msgid "File transfer server"
 msgstr "Fil旦verf旦ringsserver"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3933
+#: ../libpurple/protocols/yahoo/yahoo.c:4099
 msgid "Japan file transfer server"
 msgstr "Japan fil旦verf旦ringsserver"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3936
+#: ../libpurple/protocols/yahoo/yahoo.c:4102
 msgid "File transfer port"
 msgstr "Port f旦r fil旦verf旦ring"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3939
+#: ../libpurple/protocols/yahoo/yahoo.c:4105
 msgid "Chat room locale"
 msgstr "Chatrummets spr奪k"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3942
+#: ../libpurple/protocols/yahoo/yahoo.c:4108
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorera inbjudningar till konferenser och chatrum"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3945
-#: ../libgaim/protocols/zephyr/zephyr.c:2990
-msgid "Encoding"
-msgstr "Kodning"
-
-#: ../libgaim/protocols/yahoo/yahoo.c:3950
+#: ../libpurple/protocols/yahoo/yahoo.c:4116
 msgid "Chat room list URL"
 msgstr "URL f旦r chattrumlista"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3953
+#: ../libpurple/protocols/yahoo/yahoo.c:4119
 msgid "Yahoo Chat server"
 msgstr "Yahoo Chat-server"
 
-#: ../libgaim/protocols/yahoo/yahoo.c:3956
+#: ../libpurple/protocols/yahoo/yahoo.c:4122
 msgid "Yahoo Chat port"
 msgstr "Yahoo Chatt port"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:203
+#: ../libpurple/protocols/yahoo/yahoochat.c:204
 #, c-format
 msgid "%s declined your conference invitation to room \"%s\" because \"%s\"."
 msgstr "%s tackade nej till din inbjudan till rum \"%s\" eftersom \"%s\"."
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:205
+#: ../libpurple/protocols/yahoo/yahoochat.c:206
 msgid "Invitation Rejected"
 msgstr "Inbjudan avvisad"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:361
+#: ../libpurple/protocols/yahoo/yahoochat.c:362
 msgid "Failed to join chat"
 msgstr "Kunde inte ansluta till chatt"
 
 #. -6
-#: ../libgaim/protocols/yahoo/yahoochat.c:364
+#: ../libpurple/protocols/yahoo/yahoochat.c:365
 msgid "Unknown room"
 msgstr "Ok辰nt rum"
 
 #. -15
-#: ../libgaim/protocols/yahoo/yahoochat.c:367
+#: ../libpurple/protocols/yahoo/yahoochat.c:368
 msgid "Maybe the room is full"
 msgstr "Kanske rummet 辰r fullt"
 
 #. -35
-#: ../libgaim/protocols/yahoo/yahoochat.c:370
+#: ../libpurple/protocols/yahoo/yahoochat.c:371
 msgid "Not available"
 msgstr "Ej tillg辰nglig"
 
-#: ../libgaim/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 "Ok辰nt fel. Du kanske beh旦ver koppla fr奪n och v辰nta fem minuter f旦re du kan ansluta till chatrummet igen"
-
-#: ../libgaim/protocols/yahoo/yahoochat.c:452
+#: ../libpurple/protocols/yahoo/yahoochat.c:375
+msgid ""
+"Unknown error. You may need to logout and wait five minutes before being "
+"able to rejoin a chatroom"
+msgstr ""
+"Ok辰nt fel. Du kanske beh旦ver koppla fr奪n och v辰nta fem minuter f旦re du kan "
+"ansluta till chatrummet igen"
+
+#: ../libpurple/protocols/yahoo/yahoochat.c:453
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Du chattar nu i %s."
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:627
+#: ../libpurple/protocols/yahoo/yahoochat.c:628
 msgid "Failed to join buddy in chat"
 msgstr "Kunde inte ansluta kompis till chatt"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:628
+#: ../libpurple/protocols/yahoo/yahoochat.c:629
 msgid "Maybe they're not in a chat?"
 msgstr "De kanske inte 辰r i n奪gon chatt?"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1357
-#: ../libgaim/protocols/yahoo/yahoochat.c:1383
+#: ../libpurple/protocols/yahoo/yahoochat.c:1320
+#: ../libpurple/protocols/yahoo/yahoochat.c:1346
 msgid "Fetching the room list failed."
 msgstr "H辰mtning av rumlistan misslyckades."
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1441
+#: ../libpurple/protocols/yahoo/yahoochat.c:1404
 msgid "Voices"
 msgstr "R旦ster"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1444
+#: ../libpurple/protocols/yahoo/yahoochat.c:1407
 msgid "Webcams"
 msgstr "Webbkamera"
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1455
-#: ../libgaim/protocols/yahoo/yahoochat.c:1525
+#: ../libpurple/protocols/yahoo/yahoochat.c:1418
+#: ../libpurple/protocols/yahoo/yahoochat.c:1488
 msgid "Unable to fetch room list."
 msgstr "Kan inte h辰mta rumlista."
 
-#: ../libgaim/protocols/yahoo/yahoochat.c:1518
+#: ../libpurple/protocols/yahoo/yahoochat.c:1481
 msgid "User Rooms"
 msgstr "Anv辰ndarrum"
 
 #. 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 "Skickade Doodle-f旦rfr奪gan."
 
-#: ../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:270
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
+#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:292
 msgid "Unable to establish file descriptor."
 msgstr "Kan inte inte etablera filbeskrivning."
 
 #. TODO: what to do here - do we really have to disconnect?
-#: ../libgaim/protocols/yahoo/yahoo_packet.c:288
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:302
 msgid "Write Error"
 msgstr "Skrivfel"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:773
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan-profil"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:774
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Yahoo! Profil"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:814
-msgid "Sorry, profiles marked as containing adult content are not supported at this time."
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
+msgid ""
+"Sorry, profiles marked as containing adult content are not supported at this "
+"time."
 msgstr "Profiler m辰rkta att inneh奪lla vuxeninneh奪ll st旦ds 辰nnu inte."
 
-#: ../libgaim/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:"
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:840
+msgid ""
+"If you wish to view this profile, you will need to visit this link in your "
+"web browser:"
 msgstr "Om du vill se denna profil m奪ste du bes旦ka l辰nken i din webbl辰sare"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1010
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 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:1109
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1113
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1117
 msgid "Hobbies"
 msgstr "Hobbyer"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1103
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1107
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "Senaste nytt"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1128
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "Hemsida"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1143
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "Tuff l辰nk 1"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1148
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "Tuff l辰nk 2"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1152
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "Tuff l辰nk 3"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1166
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "Senast uppdaterad"
 
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1175
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Anv辰ndarinformation om %s 辰r inte tillg辰nglig"
 
-#: ../libgaim/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."
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1205
+msgid ""
+"Sorry, this profile seems to be in a language or format that is not "
+"supported at this time."
 msgstr "Denna profil verkar vara i ett spr奪k eller format som 辰nnu inte st旦ds."
 
-#: ../libgaim/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 "Kan inte h辰mta anv辰ndarens profil. Detta 辰r antagligen ett tempor辰rt fel p奪 servern. var god f旦rs旦k igen senare."
-
-#: ../libgaim/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 "Kunde inte h辰mta anv辰ndarens profil. Detta beror antagligen p奪 att anv辰ndaren inte finns, men ibland hittar inte Yahoo! en anv辰ndares profil. Om du vet att anv辰ndaren finns: f旦rs旦k igen senare."
-
-#: ../libgaim/protocols/yahoo/yahoo_profile.c:1207
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1221
+msgid ""
+"Could not retrieve the user's profile. This most likely is a temporary "
+"server-side problem. Please try again later."
+msgstr ""
+"Kan inte h辰mta anv辰ndarens profil. Detta 辰r antagligen ett tempor辰rt fel p奪 "
+"servern. var god f旦rs旦k igen senare."
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
+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 ""
+"Kunde inte h辰mta anv辰ndarens profil. Detta beror antagligen p奪 att "
+"anv辰ndaren inte finns, men ibland hittar inte Yahoo! en anv辰ndares profil. "
+"Om du vet att anv辰ndaren finns: f旦rs旦k igen senare."
+
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
 msgstr "Anv辰ndarens profil 辰r tom."
 
-#: ../libgaim/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Problem med anslutning till YCHT-server."
 
-#: ../libgaim/protocols/yahoo/ycht.c:475
+#: ../libpurple/protocols/yahoo/ycht.c:475
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -14212,102 +11493,124 @@
 "Tappade anslutningen till servern\n"
 "%s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:355
-msgid "(There was an error converting this message.\t Check the 'Encoding' option in the Account Editor)"
-msgstr "(Det blev ett fel vid konverteringen av detta meddelande.\t Kontrollera Kodningsinst辰llningen f旦r kontot.)"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:753
+#: ../libpurple/protocols/zephyr/zephyr.c:354
+msgid ""
+"(There was an error converting this message.\t Check the 'Encoding' option "
+"in the Account Editor)"
+msgstr ""
+"(Det blev ett fel vid konverteringen av detta meddelande.\t Kontrollera "
+"Kodningsinst辰llningen f旦r kontot.)"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:752
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Kunde inte skicka till chatt %s,%s,%s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:787
-#: ../libgaim/protocols/zephyr/zephyr.c:1209
+#: ../libpurple/protocols/zephyr/zephyr.c:786
+#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "Anv辰ndare"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:792
-#: ../libgaim/protocols/zephyr/zephyr.c:1215
+#: ../libpurple/protocols/zephyr/zephyr.c:791
+#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "G旦md eller inte inloggad"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:798
-#: ../libgaim/protocols/zephyr/zephyr.c:1217
+#: ../libpurple/protocols/zephyr/zephyr.c:797
+#: ../libpurple/protocols/zephyr/zephyr.c:1212
 #, c-format
 msgid "<br>At %s since %s"
 msgstr "<br>%s sedan %s"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:1551
-#: ../libgaim/protocols/zephyr/zephyr.c:1552
+#: ../libpurple/protocols/zephyr/zephyr.c:1546
+#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "N奪gon"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2359
+#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_Klass:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2365
+#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_Instans:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2371
+#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_Mottagare:"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2382
+#: ../libpurple/protocols/zephyr/zephyr.c:2377
 #, c-format
 msgid "Attempt to subscribe to %s,%s,%s failed"
 msgstr "F旦rs旦k att prenumrera p奪 %s,%s,%s misslyckades"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2695
+#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nick&gt;: Lokalisera anv辰ndare"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2700
+#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nick&gt;: Lokalisera anv辰ndare"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2705
+#: ../libpurple/protocols/zephyr/zephyr.c:2700
 msgid "instance &lt;instance&gt;: Set the instance to be used on this class"
-msgstr "instance &lt;instance&gt;: Ange instanserna att anv辰ndas med denna klass"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:2710
+msgstr ""
+"instance &lt;instance&gt;: Ange instanserna att anv辰ndas med denna klass"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2705
 msgid "inst &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instance&gt;: Ange instanserna att anv辰ndas med denna klass"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2715
+#: ../libpurple/protocols/zephyr/zephyr.c:2710
 msgid "topic &lt;instance&gt;: Set the instance to be used on this class"
 msgstr "inst &lt;instance&gt;: Ange instanserna att anv辰ndas med denna klass"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2721
+#: ../libpurple/protocols/zephyr/zephyr.c:2716
 msgid "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Join a new chat"
-msgstr "sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Anslut till en ny chatt"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:2726
-msgid "zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
-msgstr "zi &lt;instance&gt;: Skicka ett meddelande till &lt;message,<i>instance</i>,*&gt;"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:2732
-msgid "zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,<i>instance</i>,*&gt;"
-msgstr "zci &lt;class&gt; &lt;instance&gt;: Skicka ett meddelande till &lt;<i>class</i>,<i>instance</i>,*&gt;"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:2738
-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 "zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Skicka ett meddelande till &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:2744
-msgid "zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
-msgstr "zir &lt;instance&gt; &lt;recipient&gt;: Skicka ett meddelande till &lt;MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:2749
+msgstr ""
+"sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Anslut till en ny chatt"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2721
+msgid ""
+"zi &lt;instance&gt;: Send a message to &lt;message,<i>instance</i>,*&gt;"
+msgstr ""
+"zi &lt;instance&gt;: Skicka ett meddelande till &lt;message,<i>instance</i>,"
+"*&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2727
+msgid ""
+"zci &lt;class&gt; &lt;instance&gt;: Send a message to &lt;<i>class</i>,"
+"<i>instance</i>,*&gt;"
+msgstr ""
+"zci &lt;class&gt; &lt;instance&gt;: Skicka ett meddelande till &lt;<i>class</"
+"i>,<i>instance</i>,*&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2733
+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 ""
+"zcir &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Skicka ett meddelande "
+"till &lt;<i>class</i>,<i>instance</i>,<i>recipient</i>&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2739
+msgid ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Send a message to &lt;MESSAGE,"
+"<i>instance</i>,<i>recipient</i>&gt;"
+msgstr ""
+"zir &lt;instance&gt; &lt;recipient&gt;: Skicka ett meddelande till &lt;"
+"MESSAGE,<i>instance</i>,<i>recipient</i>&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2744
 msgid "zc &lt;class&gt;: Send a message to &lt;<i>class</i>,PERSONAL,*&gt;"
-msgstr "zc &lt;class&gt;: Skicka ett meddelande till &lt;<i>class</i>,PERSONAL,*&gt;"
-
-#: ../libgaim/protocols/zephyr/zephyr.c:2855
+msgstr ""
+"zc &lt;class&gt;: Skicka ett meddelande till &lt;<i>class</i>,PERSONAL,*&gt;"
+
+#: ../libpurple/protocols/zephyr/zephyr.c:2850
 msgid "Resubscribe"
 msgstr "�terprenumerera"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2858
+#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "H辰mta prenumrationer fr奪n server"
 
@@ -14321,47 +11624,45 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libgaim/protocols/zephyr/zephyr.c:2945
-#: ../libgaim/protocols/zephyr/zephyr.c:2947
+#: ../libpurple/protocols/zephyr/zephyr.c:2946
+#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Insticksmodul f旦r Zephyr-protokoll"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2966
+#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "Anv辰nd tzc"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2969
+#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "tzc kommando"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2972
+#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "Exportera till .anyone"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2975
+#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "Exportera till .zephyr.subs"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2978
+#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "Importera fr奪n .anyone"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2981
+#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "Importera fr奪n .zephyr.subs"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2984
+#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "Kungarike"
 
-#: ../libgaim/protocols/zephyr/zephyr.c:2987
+#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "Exponering"
 
-#: ../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:1600
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -14370,57 +11671,66 @@
 "Kan inte skapa uttag:\n"
 "%s"
 
-#: ../libgaim/proxy.c:644
+#: ../libpurple/proxy.c:658
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Kan inte tolka svaret fr奪n HTTP-proxyn: %s\n"
 
-#: ../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-proxyanslutningsfel %d"
 
-#: ../libgaim/proxy.c:764
+#: ../libpurple/proxy.c:778
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "�tkomst nekad: HTTP-proxyservern till奪ter inte tunnel p奪 port %d."
 
-#: ../libgaim/proxy.c:984
+#: ../libpurple/proxy.c:995
 #, c-format
 msgid "Error resolving %s"
 msgstr "Fel vid uppslagning av %s"
 
-#: ../libgaim/proxy.c:1676
+#: ../libpurple/proxy.c:1697
 msgid "Could not resolve host name"
 msgstr "Kunde inte sl奪 upp v辰rdnamnet"
 
 #. *
-#. * A wrapper for gaim_request_action() that uses Accept and Cancel buttons.
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
 #.
-#: ../libgaim/request.h:1354
+#: ../libpurple/request.h:1377
+msgid "_Yes"
+msgstr "_Ja"
+
+#: ../libpurple/request.h:1377
+msgid "_No"
+msgstr "_Nej"
+
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#.
+#: ../libpurple/request.h:1397
 msgid "_Accept"
 msgstr "_Acceptera"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libgaim/savedstatuses.c:46
+#: ../libpurple/savedstatuses.c:47
 msgid "I'm not here right now"
 msgstr "Jag 辰r inte h辰r just nu"
 
-#: ../libgaim/savedstatuses.c:525
+#: ../libpurple/savedstatuses.c:534
 msgid "saved statuses"
 msgstr "sparade status"
 
-#: ../libgaim/server.c:228
+#: ../libpurple/server.c:233
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s 辰r nu k辰nd som %s.\n"
 
-#: ../libgaim/server.c:674
+#: ../libpurple/server.c:680
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -14429,150 +11739,4518 @@
 "%s har bjudit in %s till chattrum %s\n"
 "%s"
 
-#: ../libgaim/server.c:679
+#: ../libpurple/server.c:685
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s bjuder in %s till chattrum %s\n"
 
-#: ../libgaim/server.c:683
+#: ../libpurple/server.c:689
 msgid "Accept chat invitation?"
 msgstr "Tacka ja till chattinbjudan?"
 
-#: ../libgaim/status.c:153
+#: ../libpurple/status.c:152
 msgid "Unset"
 msgstr "Osatt"
 
-#: ../libgaim/status.c:156
-msgid "Unavailable"
-msgstr "Otillg辰nglig"
-
-#: ../libgaim/status.c:160
+#: ../libpurple/status.c:155 ../pidgin/gtkstatusbox.c:1057
+msgid "Do not disturb"
+msgstr "St旦r inte"
+
+#: ../libpurple/status.c:158
+msgid "Extended away"
+msgstr "Ut旦kad fr奪nvaro"
+
+#: ../libpurple/status.c:159
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libgaim/status.c:611
+#: ../libpurple/status.c:608
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s har bytt status fr奪n %s till %s"
 
-#: ../libgaim/status.c:621
+#: ../libpurple/status.c:618
 #, c-format
 msgid "%s is now %s"
 msgstr "%s 辰r nu %s"
 
-#: ../libgaim/status.c:626
+#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s 辰r inte l辰ngre %s"
 
-#: ../libgaim/status.c:1293
+#: ../libpurple/status.c:1233
 #, c-format
 msgid "%s became idle"
 msgstr "%s har blivit inaktiv"
 
-#: ../libgaim/status.c:1310
+#: ../libpurple/status.c:1250
 #, c-format
 msgid "%s became unidle"
 msgstr "%s har blivit aktiv"
 
-#: ../libgaim/status.c:1376
+#: ../libpurple/status.c:1313
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s har blivit inaktiv"
 
-#: ../libgaim/status.c:1378
+#: ../libpurple/status.c:1315
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s har blivit aktiv"
 
-#: ../libgaim/util.c:680
+#: ../libpurple/util.c:717
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libgaim/util.c:2434
+#: ../libpurple/util.c:2692
 #, c-format
 msgid "Error Reading %s"
 msgstr "Fel vid l辰sning av %s"
 
-#: ../libgaim/util.c:2435
-#, 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 "Ett fel uppt辰cktes vid inl辰sandet av din %s. De har inte laddats och den gamla har blivit flyttad till %s~."
-
-#: ../libgaim/util.c:2898
+#: ../libpurple/util.c:2693
+#, 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 ""
+"Ett fel uppt辰cktes vid inl辰sandet av din %s. De har inte laddats och den "
+"gamla har blivit flyttad till %s~."
+
+#: ../libpurple/util.c:3193
 msgid "Calculating..."
 msgstr "Ber辰knar..."
 
-#: ../libgaim/util.c:2901
+#: ../libpurple/util.c:3196
 msgid "Unknown."
 msgstr "Ok辰nd."
 
-#: ../libgaim/util.c:2927
+#: ../libpurple/util.c:3222
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
-#: ../libgaim/util.c:2939
+#: ../libpurple/util.c:3234
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagar"
 
-#: ../libgaim/util.c:2947
+#: ../libpurple/util.c:3242
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d timme"
 msgstr[1] "%s, %d timmar"
 
-#: ../libgaim/util.c:2953
+#: ../libpurple/util.c:3248
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d timme"
 msgstr[1] "%d timmar"
 
-#: ../libgaim/util.c:2961
+#: ../libpurple/util.c:3256
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minut"
 msgstr[1] "%s, %d minuter"
 
-#: ../libgaim/util.c:2967
+#: ../libpurple/util.c:3262
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuter"
 
-#: ../libgaim/util.c:3166
-#: ../libgaim/util.c:3464
+#: ../libpurple/util.c:3522
+#, c-format
+msgid "Could not open %s: Redirected too many times"
+msgstr "Kunde inte 旦ppna %s: Omdirigerad f旦r m奪nga g奪nger"
+
+#: ../libpurple/util.c:3559 ../libpurple/util.c:3854
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Kan inte ansluta till %s"
 
-#: ../libgaim/util.c:3292
-#, c-format
-msgid "Unable to allocate enough memory to hold the contents from %s.  The web server may be trying something malicious."
-msgstr "Kunde inte allokera tillr辰ckligt mycket minne f旦r att h奪lla inneh奪llet fr奪n %s. Webb-servern f旦rs旦ker kanske med n奪got konstigt."
-
-#: ../libgaim/util.c:3327
+#: ../libpurple/util.c:3682
+#, c-format
+msgid ""
+"Unable to allocate enough memory to hold the contents from %s.  The web "
+"server may be trying something malicious."
+msgstr ""
+"Kunde inte allokera tillr辰ckligt mycket minne f旦r att h奪lla inneh奪llet fr奪n %"
+"s. Webb-servern f旦rs旦ker kanske med n奪got konstigt."
+
+#: ../libpurple/util.c:3717
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Fel vid l辰sning av fr奪n %s: %s"
 
-#: ../libgaim/util.c:3358
+#: ../libpurple/util.c:3748
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Fel vid skrivning av %s: %s"
 
-#: ../libgaim/util.c:3383
+#: ../libpurple/util.c:3773
 #, c-format
 msgid "Unable to connect to %s: %s"
 msgstr "Kan inte ansluta till %s: %s"
 
+#: ../pidgin.desktop.in.h:1
+msgid "Internet Messenger"
+msgstr "Meddelandeklient"
+
+#: ../pidgin.desktop.in.h:2
+msgid "Pidgin Internet Messenger"
+msgstr "Pidgin Meddelandeklient"
+
+#: ../pidgin.desktop.in.h:3
+msgid "Send instant messages over multiple protocols"
+msgstr "S辰nder snabbmeddelanden 旦ver multipla protokoll"
+
+#: ../pidgin/eggtrayicon.c:129
+msgid "Orientation"
+msgstr "Orientering"
+
+#: ../pidgin/eggtrayicon.c:130
+msgid "The orientation of the tray."
+msgstr "Uppsamlarens orientering."
+
+#. Build the login options frame.
+#: ../pidgin/gtkaccount.c:409
+msgid "Login Options"
+msgstr "Inloggningsalternativ"
+
+#: ../pidgin/gtkaccount.c:430
+msgid "Pro_tocol:"
+msgstr "Pro_tokoll:"
+
+#: ../pidgin/gtkaccount.c:441
+msgid "Screen _name:"
+msgstr "Sk辰rm_namn:"
+
+#: ../pidgin/gtkaccount.c:531
+msgid "_Local alias:"
+msgstr "_Lokalt alias:"
+
+#: ../pidgin/gtkaccount.c:535
+msgid "Remember pass_word"
+msgstr "_Kom ih奪g l旦senordet"
+
+#. Build the user options frame.
+#: ../pidgin/gtkaccount.c:593
+msgid "User Options"
+msgstr "Anv辰ndaralternativ"
+
+#: ../pidgin/gtkaccount.c:606
+msgid "New _mail notifications"
+msgstr "Rapportera ny e-_post"
+
+#. Buddy icon
+#: ../pidgin/gtkaccount.c:611
+msgid "Use this buddy _icon for this account:"
+msgstr "Anv辰nd denna kompis_ikon f旦r detta konto:"
+
+# src/menus.c:311
+#. Build the protocol options frame.
+#: ../pidgin/gtkaccount.c:731
+#, c-format
+msgid "%s Options"
+msgstr "%s-alternativ"
+
+#: ../pidgin/gtkaccount.c:936
+msgid "Use GNOME Proxy Settings"
+msgstr "Anv辰nd GNOME proxyinst辰llningar"
+
+#: ../pidgin/gtkaccount.c:937
+msgid "Use Global Proxy Settings"
+msgstr "Anv辰nd globala proxyinst辰llningar"
+
+#: ../pidgin/gtkaccount.c:943
+msgid "No Proxy"
+msgstr "Ingen proxy"
+
+#: ../pidgin/gtkaccount.c:949
+msgid "HTTP"
+msgstr "HTTP"
+
+#: ../pidgin/gtkaccount.c:955
+msgid "SOCKS 4"
+msgstr "SOCKS 4"
+
+#: ../pidgin/gtkaccount.c:961
+msgid "SOCKS 5"
+msgstr "SOCKS 5"
+
+#: ../pidgin/gtkaccount.c:967 ../pidgin/gtkprefs.c:1206
+msgid "Use Environmental Settings"
+msgstr "Anv辰nd milj旦inst辰llningar"
+
+#. 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:1006
+msgid "If you look real closely"
+msgstr "Om du tittar riktigt n辰ra"
+
+#. This is an easter egg. See the comment on the previous line in the source.
+#: ../pidgin/gtkaccount.c:1009
+msgid "you can see the butterflies mating"
+msgstr "kan du se fj辰rilarna para sig"
+
+#: ../pidgin/gtkaccount.c:1030
+msgid "Proxy Options"
+msgstr "Proxyalternativ"
+
+#: ../pidgin/gtkaccount.c:1044 ../pidgin/gtkprefs.c:1200
+msgid "Proxy _type:"
+msgstr "Proxy_typ:"
+
+#: ../pidgin/gtkaccount.c:1053 ../pidgin/gtkprefs.c:1221
+msgid "_Host:"
+msgstr "_V辰rd:"
+
+#: ../pidgin/gtkaccount.c:1057 ../pidgin/gtkprefs.c:1239
+msgid "_Port:"
+msgstr "_Port:"
+
+#: ../pidgin/gtkaccount.c:1065
+msgid "_Username:"
+msgstr "_Anv辰ndarnamn:"
+
+#: ../pidgin/gtkaccount.c:1072 ../pidgin/gtkprefs.c:1276
+msgid "Pa_ssword:"
+msgstr "_L旦senord:"
+
+#: ../pidgin/gtkaccount.c:1473
+msgid "Add Account"
+msgstr "L辰gg till konto"
+
+# src/menus.c:327
+#: ../pidgin/gtkaccount.c:1492
+msgid "_Basic"
+msgstr "_Basic"
+
+#: ../pidgin/gtkaccount.c:1503
+msgid "_Advanced"
+msgstr "_Avancerat"
+
+#: ../pidgin/gtkaccount.c:1977 ../pidgin/gtkplugin.c:568
+msgid "Enabled"
+msgstr "Aktiverad"
+
+#: ../pidgin/gtkaccount.c:2005
+msgid "Protocol"
+msgstr "Protokoll"
+
+#: ../pidgin/gtkaccount.c:2205
+#, 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 ""
+"<span size='larger' weight='bold'>V辰lkommen till %s!</span>\n"
+"\n"
+"Du har inga IM-konton konfigurerade. F旦r att p奪b旦rja en anslutning med %s s奪 "
+"trycker du p奪 knappen <b>L辰gg till</b> nedanf旦r och konfigurerar ditt f旦rsta "
+"konto. Om du vill att %s ska ansluta till fler konton trycker du p奪 <b>L辰gg "
+"till</b> igen f旦r att konfigurera dem en och en.\n"
+"\n"
+"Du kan komma tillbaka till detta f旦nster f旦r att l辰gga till, 辰ndra eller ta "
+"bort konton fr奪n <b>Konton->L辰gg till/�ndra</b> i kompislistans f旦nster"
+
+#: ../pidgin/gtkblist.c:763
+msgid "Join a Chat"
+msgstr "Anslut till chatt"
+
+#: ../pidgin/gtkblist.c:784
+msgid ""
+"Please enter the appropriate information about the chat you would like to "
+"join.\n"
+msgstr "Var god ange information om chatten du vill ansluta till.\n"
+
+#. Set up stuff for the account box
+#: ../pidgin/gtkblist.c:795 ../pidgin/gtkblist.c:5467
+#: ../pidgin/gtkblist.c:5834 ../pidgin/gtkpounce.c:540
+#: ../pidgin/gtkroomlist.c:395
+msgid "_Account:"
+msgstr "_Konto:"
+
+#: ../pidgin/gtkblist.c:1084 ../pidgin/gtkprivacy.c:602
+#: ../pidgin/gtkprivacy.c:616
+msgid "_Block"
+msgstr "_Blockera"
+
+#: ../pidgin/gtkblist.c:1084
+msgid "Un_block"
+msgstr "Ta bort _blockering"
+
+#: ../pidgin/gtkblist.c:1135
+msgid "Get _Info"
+msgstr "H辰mta _info"
+
+#: ../pidgin/gtkblist.c:1138 ../pidgin/pidginstock.c:84
+msgid "I_M"
+msgstr "_Meddelande"
+
+#: ../pidgin/gtkblist.c:1144
+msgid "_Send File"
+msgstr "_Skicka fil"
+
+#: ../pidgin/gtkblist.c:1151
+msgid "Add Buddy _Pounce"
+msgstr "L辰gg till kom_pisattack"
+
+#: ../pidgin/gtkblist.c:1155 ../pidgin/gtkblist.c:1159
+#: ../pidgin/gtkblist.c:1262 ../pidgin/gtkblist.c:1285
+msgid "View _Log"
+msgstr "Visa _logg"
+
+#: ../pidgin/gtkblist.c:1171 ../pidgin/gtkblist.c:1180
+#: ../pidgin/gtkblist.c:1270 ../pidgin/gtkblist.c:1291
+msgid "_Alias..."
+msgstr "_Alias..."
+
+#: ../pidgin/gtkblist.c:1174 ../pidgin/gtkblist.c:1182
+#: ../pidgin/gtkblist.c:1272 ../pidgin/gtkblist.c:1293
+msgid "_Remove"
+msgstr "_Ta bort"
+
+#: ../pidgin/gtkblist.c:1232
+msgid "Add a _Buddy"
+msgstr "_L辰gg till kompis"
+
+#: ../pidgin/gtkblist.c:1235
+msgid "Add a C_hat"
+msgstr "L辰gg till c_hatt"
+
+#: ../pidgin/gtkblist.c:1238
+msgid "_Delete Group"
+msgstr "_Ta bort grupp"
+
+#: ../pidgin/gtkblist.c:1240
+msgid "_Rename"
+msgstr "Byt _namn"
+
+#. join button
+#: ../pidgin/gtkblist.c:1258 ../pidgin/gtkroomlist.c:306
+#: ../pidgin/gtkroomlist.c:459 ../pidgin/pidginstock.c:82
+msgid "_Join"
+msgstr "_Anslut"
+
+#: ../pidgin/gtkblist.c:1260
+msgid "Auto-Join"
+msgstr "Anslut automatiskt"
+
+#: ../pidgin/gtkblist.c:1298 ../pidgin/gtkblist.c:1321
+msgid "_Collapse"
+msgstr "_F辰ll ihop"
+
+#: ../pidgin/gtkblist.c:1326
+msgid "_Expand"
+msgstr "_Expandera"
+
+#: ../pidgin/gtkblist.c:1571 ../pidgin/gtkblist.c:1583
+#: ../pidgin/gtkblist.c:4561 ../pidgin/gtkblist.c:4571
+msgid "/Tools/Mute Sounds"
+msgstr "/Verktyg/St辰ng av ljud"
+
+#: ../pidgin/gtkblist.c:2043 ../pidgin/gtkconv.c:4619
+#: ../pidgin/gtkpounce.c:429
+msgid ""
+"You are not currently signed on with an account that can add that buddy."
+msgstr ""
+"Du 辰r f旦r tillf辰llet inte inloggad med n奪got konto som kan l辰gga till den "
+"kompisen."
+
+#. Buddies menu
+#: ../pidgin/gtkblist.c:2838
+msgid "/_Buddies"
+msgstr "/_Kompisar"
+
+#: ../pidgin/gtkblist.c:2839
+msgid "/Buddies/New Instant _Message..."
+msgstr "/Kompisar/Nytt _snabbmeddelande..."
+
+#: ../pidgin/gtkblist.c:2840
+msgid "/Buddies/Join a _Chat..."
+msgstr "/Kompisar/Anslut till _chatt..."
+
+#: ../pidgin/gtkblist.c:2841
+msgid "/Buddies/Get User _Info..."
+msgstr "/Kompisar/H辰mta anv辰ndar_info..."
+
+#: ../pidgin/gtkblist.c:2842
+msgid "/Buddies/View User _Log..."
+msgstr "/Kompisar/Visa anv辰ndar_logg..."
+
+#: ../pidgin/gtkblist.c:2844
+msgid "/Buddies/Show _Offline Buddies"
+msgstr "/Kompisar/Visa _fr奪nkopplade kompisar"
+
+#: ../pidgin/gtkblist.c:2845
+msgid "/Buddies/Show _Empty Groups"
+msgstr "/Kompisar/Visa _tomma grupper"
+
+#: ../pidgin/gtkblist.c:2846
+msgid "/Buddies/Show Buddy _Details"
+msgstr "/Kompisar/Visa _kompisdetaljer"
+
+#: ../pidgin/gtkblist.c:2847
+msgid "/Buddies/Show Idle _Times"
+msgstr "/Kompisar/Visa fr奪nvaro_tid"
+
+#: ../pidgin/gtkblist.c:2848
+msgid "/Buddies/_Sort Buddies"
+msgstr "/Kompisar/_Sortera kompisar"
+
+#: ../pidgin/gtkblist.c:2850
+msgid "/Buddies/_Add Buddy..."
+msgstr "/Kompisar/L辰gg till _kompis..."
+
+#: ../pidgin/gtkblist.c:2851
+msgid "/Buddies/Add C_hat..."
+msgstr "/Kompisar/L辰gg till c_hatt..."
+
+#: ../pidgin/gtkblist.c:2852
+msgid "/Buddies/Add _Group..."
+msgstr "/Kompisar/L辰gg till _grupp..."
+
+#: ../pidgin/gtkblist.c:2854
+msgid "/Buddies/_Quit"
+msgstr "/Kompisar/_Avsluta"
+
+#. Accounts menu
+#: ../pidgin/gtkblist.c:2857
+msgid "/_Accounts"
+msgstr "/_Konton"
+
+#: ../pidgin/gtkblist.c:2858 ../pidgin/gtkblist.c:6532
+msgid "/Accounts/Add\\/Edit"
+msgstr "/Verktyg/L辰gg till\\/Redigera"
+
+#. Tools
+#: ../pidgin/gtkblist.c:2861
+msgid "/_Tools"
+msgstr "/_Verktyg"
+
+#: ../pidgin/gtkblist.c:2862
+msgid "/Tools/Buddy _Pounces"
+msgstr "/Verktyg/Kom_pisattack"
+
+#: ../pidgin/gtkblist.c:2863
+msgid "/Tools/Plu_gins"
+msgstr "/Verktyg/Insticksmodu_ler"
+
+#: ../pidgin/gtkblist.c:2864
+msgid "/Tools/Pr_eferences"
+msgstr "/Verktyg/_Inst辰llningar"
+
+#: ../pidgin/gtkblist.c:2865
+msgid "/Tools/Pr_ivacy"
+msgstr "/Verktyg/_Sp辰rrlista"
+
+#: ../pidgin/gtkblist.c:2867
+msgid "/Tools/_File Transfers"
+msgstr "/Verktyg/_Fil旦verf旦ringar"
+
+#: ../pidgin/gtkblist.c:2868
+msgid "/Tools/R_oom List"
+msgstr "/Verktyg/R_umslista"
+
+#: ../pidgin/gtkblist.c:2869
+msgid "/Tools/System _Log"
+msgstr "/Verktyg/Visa _systemlogg"
+
+#: ../pidgin/gtkblist.c:2871
+msgid "/Tools/Mute _Sounds"
+msgstr "/Verktyg/St辰ng av _ljud"
+
+#. Help
+#: ../pidgin/gtkblist.c:2873
+msgid "/_Help"
+msgstr "/_Hj辰lp"
+
+#: ../pidgin/gtkblist.c:2874
+msgid "/Help/Online _Help"
+msgstr "/Hj辰lp/Online_hj辰lp"
+
+#: ../pidgin/gtkblist.c:2875
+msgid "/Help/_Debug Window"
+msgstr "/Hj辰lp/_Fels旦kningsf旦nster"
+
+#: ../pidgin/gtkblist.c:2877 ../pidgin/gtkblist.c:2879
+msgid "/Help/_About"
+msgstr "/Hj辰lp/_Om"
+
+#: ../pidgin/gtkblist.c:2908
+#, c-format
+msgid ""
+"\n"
+"<b>Account:</b> %s"
+msgstr ""
+"\n"
+"<b>Konto:</b> %s"
+
+#: ../pidgin/gtkblist.c:2986
+msgid "Buddy Alias"
+msgstr "Kompisalias"
+
+#: ../pidgin/gtkblist.c:3015
+msgid "Logged In"
+msgstr "Ansluten"
+
+#: ../pidgin/gtkblist.c:3061
+msgid "Last Seen"
+msgstr "Senast sedd"
+
+#: ../pidgin/gtkblist.c:3081
+msgid "Spooky"
+msgstr "Skr辰mmande"
+
+#: ../pidgin/gtkblist.c:3083
+msgid "Awesome"
+msgstr "Fantastisk"
+
+#: ../pidgin/gtkblist.c:3085
+msgid "Rockin'"
+msgstr "Rockar"
+
+#: ../pidgin/gtkblist.c:3428
+#, c-format
+msgid "Idle %dd %dh %02dm"
+msgstr "Inaktiv %dd %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3430
+#, c-format
+msgid "Idle %dh %02dm"
+msgstr "Inaktiv %dh %02dm"
+
+#: ../pidgin/gtkblist.c:3432
+#, c-format
+msgid "Idle %dm"
+msgstr "Inaktiv %dm"
+
+#: ../pidgin/gtkblist.c:3577
+msgid "/Buddies/New Instant Message..."
+msgstr "/Kompisar/Nytt snabbmeddelande..."
+
+#: ../pidgin/gtkblist.c:3578 ../pidgin/gtkblist.c:3611
+msgid "/Buddies/Join a Chat..."
+msgstr "/Kompisar/Anslut till _chatt..."
+
+#: ../pidgin/gtkblist.c:3579
+msgid "/Buddies/Get User Info..."
+msgstr "/Kompisar/H辰mta anv辰ndarinfo..."
+
+#: ../pidgin/gtkblist.c:3580
+msgid "/Buddies/Add Buddy..."
+msgstr "/Kompisar/L辰gg till kompis..."
+
+#: ../pidgin/gtkblist.c:3581 ../pidgin/gtkblist.c:3614
+msgid "/Buddies/Add Chat..."
+msgstr "/Kompisar/L辰gg till chatt..."
+
+#: ../pidgin/gtkblist.c:3582
+msgid "/Buddies/Add Group..."
+msgstr "/Kompisar/L辰gg till grupp..."
+
+#: ../pidgin/gtkblist.c:3617
+msgid "/Tools/Privacy"
+msgstr "/Verktyg/_Sp辰rrlista"
+
+# S辰ger man inte "rumslista"?
+#: ../pidgin/gtkblist.c:3620
+msgid "/Tools/Room List"
+msgstr "/Verktyg/Rumlista"
+
+#: ../pidgin/gtkblist.c:3717 ../pidgin/gtkdocklet.c:153
+#, c-format
+msgid "%d unread message from %s\n"
+msgid_plural "%d unread messages from %s\n"
+msgstr[0] "%d ol辰st meddelande fr奪n %s\n"
+msgstr[1] "%d ol辰sta meddelande fr奪n %s\n"
+
+#: ../pidgin/gtkblist.c:3797
+msgid "Manually"
+msgstr "Manuellt"
+
+#: ../pidgin/gtkblist.c:3799
+msgid "Alphabetically"
+msgstr "Alfabetiskt"
+
+#: ../pidgin/gtkblist.c:3800
+msgid "By status"
+msgstr "Efter status"
+
+#: ../pidgin/gtkblist.c:3801
+msgid "By log size"
+msgstr "Efter loggstorlek"
+
+#: ../pidgin/gtkblist.c:4005 ../pidgin/gtkconn.c:178
+#, c-format
+msgid "%s disconnected"
+msgstr "%s kopplades ifr奪n."
+
+#: ../pidgin/gtkblist.c:4015
+msgid "Re-enable Account"
+msgstr "�teraktivera konto"
+
+#: ../pidgin/gtkblist.c:4039
+#, c-format
+msgid "<span color=\"red\">%s disconnected: %s</span>"
+msgstr "<span color=\"red\">%s fr奪nkopplad: %s</span>"
+
+#: ../pidgin/gtkblist.c:4191
+msgid "<b>Username:</b>"
+msgstr "<b>Anv辰ndarnamn:</b>"
+
+#: ../pidgin/gtkblist.c:4198
+msgid "<b>Password:</b>"
+msgstr "<b>L旦senord:</b>"
+
+#: ../pidgin/gtkblist.c:4209
+msgid "_Login"
+msgstr "_Login"
+
+#: ../pidgin/gtkblist.c:4292
+msgid "/Accounts"
+msgstr "/Konton"
+
+#. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
+#: ../pidgin/gtkblist.c:4306
+#, 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 ""
+"<span weight='bold' size='larger'>V辰lkommen till %s!</span>\n"
+"\n"
+"Du har inga konton aktiverade. Aktivera dina IM-konton fr奪n f旦nstret "
+"<b>Konton</b> vid <b>Konton->L辰gg till/�ndra</b>. S奪 snart dy har aktiverat "
+"dina konton kommer du kunna v辰lja en status och prata med dina v辰nner."
+
+#. set the Show Offline Buddies option. must be done
+#. * after the treeview or faceprint gets mad. -Robot101
+#.
+#: ../pidgin/gtkblist.c:4555
+msgid "/Buddies/Show Offline Buddies"
+msgstr "/Kompisar/Visa fr奪nkopplade kompisar"
+
+#: ../pidgin/gtkblist.c:4558
+msgid "/Buddies/Show Empty Groups"
+msgstr "/Kompisar/Visa tomma grupper"
+
+#: ../pidgin/gtkblist.c:4564
+msgid "/Buddies/Show Buddy Details"
+msgstr "/Kompisar/Visa kompisdetaljer"
+
+#: ../pidgin/gtkblist.c:4567
+msgid "/Buddies/Show Idle Times"
+msgstr "/Kompisar/Visa fr奪nvarotid"
+
+#: ../pidgin/gtkblist.c:5444
+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 ""
+"Ange anv辰ndar-ID f旦r den kompis du vill l辰gga till i din kompislista. Du kan "
+"ocks奪 ange ett alias eller ett smeknamn p奪 kompisen. Detta alias kommer att "
+"visas i st辰llet f旦r anv辰ndar-ID n辰r det 辰r m旦jligt.\n"
+
+#. End of account box
+#: ../pidgin/gtkblist.c:5479
+msgid "_Screen name:"
+msgstr "_Sk辰rmnamn:"
+
+#: ../pidgin/gtkblist.c:5501 ../pidgin/gtkblist.c:5855
+msgid "A_lias:"
+msgstr "A_lias:"
+
+#: ../pidgin/gtkblist.c:5767
+msgid "This protocol does not support chat rooms."
+msgstr "Protokollet st旦djer inte chattrum."
+
+#: ../pidgin/gtkblist.c:5783
+msgid ""
+"You are not currently signed on with any protocols that have the ability to "
+"chat."
+msgstr ""
+"Du 辰r f旦r tillf辰llet inte inloggad med n奪got protokoll som erbjuder chatt."
+
+#: ../pidgin/gtkblist.c:5824
+msgid ""
+"Please enter an alias, and the appropriate information about the chat you "
+"would like to add to your buddy list.\n"
+msgstr ""
+"Ange information och alias f旦r den chatt som du vill l辰gga till i din "
+"kompislista.\n"
+
+#: ../pidgin/gtkblist.c:5912
+msgid "Please enter the name of the group to be added."
+msgstr "Ange namnet p奪 den grupp som du vill l辰gga till."
+
+#: ../pidgin/gtkblist.c:6552
+msgid "<PurpleMain>/Accounts/"
+msgstr "<PurpleMain>/Konton/"
+
+#: ../pidgin/gtkblist.c:6576
+msgid "_Edit Account"
+msgstr "_�ndra konto"
+
+#: ../pidgin/gtkblist.c:6589 ../pidgin/gtkconv.c:2994
+msgid "No actions available"
+msgstr "Inga 奪tg辰rder tillg辰ngliga"
+
+# M旦jligen passar "Aktivt" b辰ttre h辰r.
+# �r inte s奪 s辰ker p奪 det, tror det 辰r mer en fr奪ga om smak d奪 det 辰r viss skillnad mellan n奪got som 辰r aktivt och n奪got som 辰r aktiverat. Tyv辰rr kan jag inte bygga det fr奪n CVS just nu (eller r辰ttare sagt: jag kan bygga det, men jag f奪r det inte att starta p奪 denna datorn) s奪 d辰rf旦r kan jag inte kolla upp riktigt i vilken kontext det 辰r.
+#: ../pidgin/gtkblist.c:6597
+msgid "_Disable"
+msgstr "A_vaktivera"
+
+#: ../pidgin/gtkblist.c:6609
+msgid "Enable Account"
+msgstr "Aktivera konto"
+
+#: ../pidgin/gtkblist.c:6615
+msgid "<PurpleMain>/Accounts/Enable Account"
+msgstr "<PurpleMain>/Konton/Aktivera Konto"
+
+#: ../pidgin/gtkblist.c:6664
+msgid "/Tools"
+msgstr "/Verktyg"
+
+#: ../pidgin/gtkblist.c:6734
+msgid "/Buddies/Sort Buddies"
+msgstr "/Kompisar/Sortera kompisar"
+
+#: ../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 ""
+"%s\n"
+"\n"
+"%s kommer inte f旦rs旦ka ansluta f旦rr辰n du har r辰ttat till felet och "
+"奪teraktiverat kontot."
+
+#: ../pidgin/gtkconv.c:486
+msgid "Unknown command."
+msgstr "Ok辰nt kommando."
+
+#: ../pidgin/gtkconv.c:758 ../pidgin/gtkconv.c:784
+msgid "That buddy is not on the same protocol as this chat."
+msgstr "Den kompisen anv辰nder inte samma protokoll som denna chatt."
+
+#: ../pidgin/gtkconv.c:778
+msgid ""
+"You are not currently signed on with an account that can invite that buddy."
+msgstr ""
+"Du 辰r f旦r tillf辰llet inte inloggad med n奪got konto som kan bjuda in den "
+"kompisen."
+
+#: ../pidgin/gtkconv.c:831
+msgid "Invite Buddy Into Chat Room"
+msgstr "Bjud in kompis till chattrum"
+
+#. Put our happy label in it.
+#: ../pidgin/gtkconv.c:861
+msgid ""
+"Please enter the name of the user you wish to invite, along with an optional "
+"invite message."
+msgstr ""
+"Ange namnet p奪 den anv辰ndare du vill bjuda in, samt ett "
+"inbjudningsmeddelande om du vill"
+
+#: ../pidgin/gtkconv.c:882
+msgid "_Buddy:"
+msgstr "_Kompis:"
+
+# src/sidebar.c:103
+#: ../pidgin/gtkconv.c:902 ../pidgin/gtksavedstatuses.c:1193
+#: ../pidgin/gtksavedstatuses.c:1525
+msgid "_Message:"
+msgstr "_Meddelande:"
+
+#: ../pidgin/gtkconv.c:959 ../pidgin/gtkconv.c:2518 ../pidgin/gtkdebug.c:218
+#: ../pidgin/gtkft.c:542
+msgid "Unable to open file."
+msgstr "Kan inte 旦ppna filen."
+
+#: ../pidgin/gtkconv.c:965
+#, c-format
+msgid "<h1>Conversation with %s</h1>\n"
+msgstr "<h1>Konversation med %s</h1>\n"
+
+#: ../pidgin/gtkconv.c:1001
+msgid "Save Conversation"
+msgstr "Spara konversationen"
+
+#: ../pidgin/gtkconv.c:1150 ../pidgin/gtkdebug.c:166 ../pidgin/gtkdebug.c:742
+msgid "Find"
+msgstr "S旦k"
+
+#: ../pidgin/gtkconv.c:1176 ../pidgin/gtkdebug.c:194
+msgid "_Search for:"
+msgstr "_S旦k efter:"
+
+#: ../pidgin/gtkconv.c:1359
+msgid "Logging started. Future messages in this conversation will be logged."
+msgstr ""
+"Loggning startades. Framtida meddelanden i denna konversation kommer att "
+"loggas."
+
+#: ../pidgin/gtkconv.c:1367
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Loggning stoppades. Framtida meddelanden i denna konversation kommer inte "
+"att loggas."
+
+#: ../pidgin/gtkconv.c:1615
+msgid "Un-Ignore"
+msgstr "Avignorera"
+
+#: ../pidgin/gtkconv.c:1618
+msgid "Ignore"
+msgstr "Ignorera"
+
+#: ../pidgin/gtkconv.c:1638
+msgid "Get Away Message"
+msgstr "H辰mta fr奪nvaromeddelande"
+
+#: ../pidgin/gtkconv.c:1661
+msgid "Last said"
+msgstr "Senast sagt"
+
+#: ../pidgin/gtkconv.c:2526
+msgid "Unable to save icon file to disk."
+msgstr "Kan inte spara ikonfil p奪 disken."
+
+#: ../pidgin/gtkconv.c:2577
+msgid "Save Icon"
+msgstr "Spara ikon"
+
+#: ../pidgin/gtkconv.c:2629
+msgid "Animate"
+msgstr "Animera"
+
+#: ../pidgin/gtkconv.c:2634
+msgid "Hide Icon"
+msgstr "D旦lj ikon"
+
+#: ../pidgin/gtkconv.c:2637
+msgid "Save Icon As..."
+msgstr "Spara ikon som..."
+
+#: ../pidgin/gtkconv.c:2641
+msgid "Set Custom Icon..."
+msgstr "V辰lj egen ikon..."
+
+#: ../pidgin/gtkconv.c:2654
+msgid "Remove Custom Icon"
+msgstr "Ta bort egen ikon"
+
+#. Conversation menu
+#: ../pidgin/gtkconv.c:2796
+msgid "/_Conversation"
+msgstr "/_Konversation"
+
+#: ../pidgin/gtkconv.c:2798
+msgid "/Conversation/New Instant _Message..."
+msgstr "/Konversation/Nytt snabb_meddelande..."
+
+#: ../pidgin/gtkconv.c:2803
+msgid "/Conversation/_Find..."
+msgstr "/Konversation/_S旦k..."
+
+#: ../pidgin/gtkconv.c:2805
+msgid "/Conversation/View _Log"
+msgstr "/Konversation/Visa _Logg"
+
+#: ../pidgin/gtkconv.c:2806
+msgid "/Conversation/_Save As..."
+msgstr "/Konversation/_Spara som..."
+
+#: ../pidgin/gtkconv.c:2808
+msgid "/Conversation/Clea_r Scrollback"
+msgstr "/Konversation/_Rensa tillbakablick"
+
+#: ../pidgin/gtkconv.c:2812
+msgid "/Conversation/Se_nd File..."
+msgstr "/Konversation/S_kicka fil..."
+
+#: ../pidgin/gtkconv.c:2813
+msgid "/Conversation/Add Buddy _Pounce..."
+msgstr "/Konversation/L辰gg till Kom_pisattack..."
+
+#: ../pidgin/gtkconv.c:2815
+msgid "/Conversation/_Get Info"
+msgstr "/Konversation/_H辰mta information"
+
+#: ../pidgin/gtkconv.c:2817
+msgid "/Conversation/In_vite..."
+msgstr "/Konversation/_Bjud in..."
+
+#: ../pidgin/gtkconv.c:2819
+msgid "/Conversation/M_ore"
+msgstr "/Konversation/_Mer"
+
+#: ../pidgin/gtkconv.c:2823
+msgid "/Conversation/Al_ias..."
+msgstr "/Konversation/Al_ias..."
+
+#: ../pidgin/gtkconv.c:2825
+msgid "/Conversation/_Block..."
+msgstr "/Konversation/_Blockera"
+
+#: ../pidgin/gtkconv.c:2827
+msgid "/Conversation/_Unblock..."
+msgstr "/Konversation/_Avblockera..."
+
+#: ../pidgin/gtkconv.c:2829
+msgid "/Conversation/_Add..."
+msgstr "/Konversation/_L辰gg till..."
+
+#: ../pidgin/gtkconv.c:2831
+msgid "/Conversation/_Remove..."
+msgstr "/Konversation/_Ta bort..."
+
+#: ../pidgin/gtkconv.c:2836
+msgid "/Conversation/Insert Lin_k..."
+msgstr "/Konversation/Infoga l辰n_k..."
+
+#: ../pidgin/gtkconv.c:2838
+msgid "/Conversation/Insert Imag_e..."
+msgstr "/Konversation/Infoga _bild..."
+
+#: ../pidgin/gtkconv.c:2844
+msgid "/Conversation/_Close"
+msgstr "/Konversation/_St辰ng"
+
+# src/menus.c:311
+#. Options
+#: ../pidgin/gtkconv.c:2848
+msgid "/_Options"
+msgstr "_Alternativ"
+
+#: ../pidgin/gtkconv.c:2849
+msgid "/Options/Enable _Logging"
+msgstr "/Alternativ/Aktivera _loggning"
+
+#: ../pidgin/gtkconv.c:2850
+msgid "/Options/Enable _Sounds"
+msgstr "/Alternativ/_Aktivera ljud"
+
+#: ../pidgin/gtkconv.c:2851
+msgid "/Options/Show Buddy _Icon"
+msgstr "/Alternativ/Visa kompis_ikoner"
+
+# Lite konstigt med plural p奪 verktygsrader, men det st奪r
+# ju faktiskt s奪:-)
+#: ../pidgin/gtkconv.c:2853
+msgid "/Options/Show Formatting _Toolbars"
+msgstr "/Alternativ/Visa forma_teringsverktygsrader"
+
+#: ../pidgin/gtkconv.c:2854
+msgid "/Options/Show Ti_mestamps"
+msgstr "/Alternativ/Visa tidsst辰_mplar"
+
+#: ../pidgin/gtkconv.c:2930
+msgid "/Conversation/More"
+msgstr "/Konversation/Mer"
+
+# src/menus.c:311
+#: ../pidgin/gtkconv.c:3038
+msgid "/Options"
+msgstr "/Alternativ"
+
+#. 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:3073 ../pidgin/gtkconv.c:3105
+msgid "/Conversation"
+msgstr "/Konversation"
+
+#: ../pidgin/gtkconv.c:3113
+msgid "/Conversation/View Log"
+msgstr "/Konversation/Visa logg"
+
+#: ../pidgin/gtkconv.c:3119
+msgid "/Conversation/Send File..."
+msgstr "/Konversation/Skicka fil..."
+
+#: ../pidgin/gtkconv.c:3123
+msgid "/Conversation/Add Buddy Pounce..."
+msgstr "/Konversation/L辰gg till kompisattack..."
+
+#: ../pidgin/gtkconv.c:3129
+msgid "/Conversation/Get Info"
+msgstr "/Konversation/H辰mta information"
+
+#: ../pidgin/gtkconv.c:3133
+msgid "/Conversation/Invite..."
+msgstr "/Konversation/Bjud in..."
+
+#: ../pidgin/gtkconv.c:3139
+msgid "/Conversation/Alias..."
+msgstr "/Konversation/Alias..."
+
+#: ../pidgin/gtkconv.c:3143
+msgid "/Conversation/Block..."
+msgstr "/Konversation/Blockera..."
+
+#: ../pidgin/gtkconv.c:3147
+msgid "/Conversation/Unblock..."
+msgstr "/Konversation/Avblockera..."
+
+#: ../pidgin/gtkconv.c:3151
+msgid "/Conversation/Add..."
+msgstr "/Konversation/L辰gg till..."
+
+#: ../pidgin/gtkconv.c:3155
+msgid "/Conversation/Remove..."
+msgstr "/Konversation/Ta bort..."
+
+#: ../pidgin/gtkconv.c:3161
+msgid "/Conversation/Insert Link..."
+msgstr "/Konversation/Infoga l辰nk..."
+
+#: ../pidgin/gtkconv.c:3165
+msgid "/Conversation/Insert Image..."
+msgstr "/Konversation/Infoga bild..."
+
+#: ../pidgin/gtkconv.c:3171
+msgid "/Options/Enable Logging"
+msgstr "/Alternativ/Aktivera loggning"
+
+#: ../pidgin/gtkconv.c:3174
+msgid "/Options/Enable Sounds"
+msgstr "/Alternativ/Aktivera ljud"
+
+#: ../pidgin/gtkconv.c:3187
+msgid "/Options/Show Formatting Toolbars"
+msgstr "/Alternativ/Visa formateringsverktyg"
+
+#: ../pidgin/gtkconv.c:3190
+msgid "/Options/Show Timestamps"
+msgstr "/Alternativ/Visa tidsst辰mplar"
+
+#: ../pidgin/gtkconv.c:3193
+msgid "/Options/Show Buddy Icon"
+msgstr "/Alternativ/Visa kompisikoner"
+
+#: ../pidgin/gtkconv.c:3277 ../pidgin/gtkconv.c:3319
+msgid "User is typing..."
+msgstr "Anv辰ndaren skriver..."
+
+#: ../pidgin/gtkconv.c:3322
+msgid "User has typed something and stopped"
+msgstr "Anv辰ndaren har skrivit n奪got och sedan slutat"
+
+#. Build the Send To menu
+#: ../pidgin/gtkconv.c:3504
+msgid "_Send To"
+msgstr "_Skicka till"
+
+#: ../pidgin/gtkconv.c:4218
+msgid "_Send"
+msgstr "_Skicka"
+
+#. Setup the label telling how many people are in the room.
+#: ../pidgin/gtkconv.c:4322
+msgid "0 people in room"
+msgstr "0 personer i rummet"
+
+#: ../pidgin/gtkconv.c:5518 ../pidgin/gtkconv.c:5639
+#, c-format
+msgid "%d person in room"
+msgid_plural "%d people in room"
+msgstr[0] "%d person 辰r i rummet"
+msgstr[1] "%d personer 辰r i rummet"
+
+#: ../pidgin/gtkconv.c:6238 ../pidgin/gtkstatusbox.c:659
+msgid "Typing"
+msgstr "Skriver"
+
+#: ../pidgin/gtkconv.c:6244
+msgid "Stopped Typing"
+msgstr "Slutade skriva"
+
+#: ../pidgin/gtkconv.c:6249
+msgid "Nick Said"
+msgstr "Smeknamn n辰mnt"
+
+#: ../pidgin/gtkconv.c:6254 ../pidgin/gtkdocklet.c:492
+msgid "Unread Messages"
+msgstr "Ol辰sta meddeladen"
+
+#: ../pidgin/gtkconv.c:6259
+msgid "New Event"
+msgstr "Ny h辰ndelse"
+
+#: ../pidgin/gtkconv.c:7237
+msgid "clear: Clears all conversation scrollbacks."
+msgstr "clear: Rensar alla konversationers tillbakablickar."
+
+#: ../pidgin/gtkconv.c:7401
+msgid "Confirm close"
+msgstr "Bekr辰fta st辰ngning"
+
+#: ../pidgin/gtkconv.c:7433
+msgid "You have unread messages. Are you sure you want to close the window?"
+msgstr "Du har ol辰sta meddelanden. �r du s辰ker p奪 att du vill st辰nga f旦nstret?"
+
+#: ../pidgin/gtkconv.c:8005
+msgid "Close other tabs"
+msgstr "St辰ng andra flikar"
+
+#: ../pidgin/gtkconv.c:8011
+msgid "Close all tabs"
+msgstr "St辰ng alla flikar"
+
+#: ../pidgin/gtkconv.c:8019
+msgid "Detach this tab"
+msgstr "Lossa denna flik"
+
+#: ../pidgin/gtkconv.c:8025
+msgid "Close this tab"
+msgstr "St辰ng denna flik"
+
+#: ../pidgin/gtkconv.c:8506
+msgid "Close conversation"
+msgstr "St辰ng konversationen"
+
+#: ../pidgin/gtkconv.c:9038
+msgid "Last created window"
+msgstr "Senast skapade f旦nster"
+
+#: ../pidgin/gtkconv.c:9040
+msgid "Separate IM and Chat windows"
+msgstr "Separera IM- och chattf旦nster"
+
+#: ../pidgin/gtkconv.c:9042 ../pidgin/gtkprefs.c:1410
+msgid "New window"
+msgstr "Nytt f旦nster"
+
+#: ../pidgin/gtkconv.c:9044
+msgid "By group"
+msgstr "Efter grupp"
+
+#: ../pidgin/gtkconv.c:9046
+msgid "By account"
+msgstr "Efter konto"
+
+#: ../pidgin/gtkdebug.c:233
+msgid "Save Debug Log"
+msgstr "Spara fels旦kningslogg"
+
+#: ../pidgin/gtkdebug.c:581
+msgid "Invert"
+msgstr "Invertera"
+
+#: ../pidgin/gtkdebug.c:584
+msgid "Highlight matches"
+msgstr "Markera tr辰ffar"
+
+#: ../pidgin/gtkdebug.c:651
+msgid "_Icon Only"
+msgstr "Endast _ikon"
+
+#: ../pidgin/gtkdebug.c:652
+msgid "_Text Only"
+msgstr "Endast _text"
+
+#: ../pidgin/gtkdebug.c:653
+msgid "_Both Icon & Text"
+msgstr "_B奪da ikon och text"
+
+#: ../pidgin/gtkdebug.c:774
+msgid "Filter"
+msgstr "Filter"
+
+#: ../pidgin/gtkdebug.c:793
+msgid "Right click for more options."
+msgstr "H旦gerklicka f旦r fler alternativ."
+
+#: ../pidgin/gtkdebug.c:823
+msgid "Level "
+msgstr "Niv奪"
+
+#: ../pidgin/gtkdebug.c:824 ../pidgin/gtkdebug.c:830
+msgid "Select the debug filter level."
+msgstr "V辰lj debugfiltrets niv奪."
+
+#: ../pidgin/gtkdebug.c:832
+msgid "All"
+msgstr "Alla"
+
+#: ../pidgin/gtkdebug.c:833
+msgid "Misc"
+msgstr "�vrigt"
+
+#: ../pidgin/gtkdebug.c:835
+msgid "Warning"
+msgstr "Varning"
+
+#: ../pidgin/gtkdebug.c:836
+msgid "Error "
+msgstr "Fel"
+
+#: ../pidgin/gtkdebug.c:837
+msgid "Fatal Error"
+msgstr "Allvarligt fel"
+
+#: ../pidgin/gtkdialogs.c:71 ../pidgin/gtkdialogs.c:117
+msgid "lead developer"
+msgstr "utvecklingsledare"
+
+#: ../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:84
+#: ../pidgin/gtkdialogs.c:85 ../pidgin/gtkdialogs.c:88
+#: ../pidgin/gtkdialogs.c:89 ../pidgin/gtkdialogs.c:90
+msgid "developer"
+msgstr "utvecklare"
+
+#: ../pidgin/gtkdialogs.c:77
+msgid "developer & webmaster"
+msgstr "utvecklare & webbansvarig"
+
+#: ../pidgin/gtkdialogs.c:86
+msgid "support"
+msgstr "support"
+
+#: ../pidgin/gtkdialogs.c:87
+msgid "support/QA"
+msgstr "support/QA"
+
+#: ../pidgin/gtkdialogs.c:109
+msgid "win32 port"
+msgstr "win32-portering"
+
+# Vi borde f旦rs旦ka hitta en bra 旦vers辰ttning f旦r detta ord.
+# Kanske "underh奪llsansvarig"?
+#: ../pidgin/gtkdialogs.c:110 ../pidgin/gtkdialogs.c:111
+msgid "maintainer"
+msgstr "maintainer"
+
+#: ../pidgin/gtkdialogs.c:112
+msgid "libfaim maintainer"
+msgstr "libfaim-maintainer "
+
+#. If "lazy bum" translates literally into a serious insult, use something else or omit it.
+#: ../pidgin/gtkdialogs.c:114
+msgid "hacker and designated driver [lazy bum]"
+msgstr "hacker och fyllechaffis [lat typ]"
+
+#: ../pidgin/gtkdialogs.c:115
+msgid "XMPP developer"
+msgstr "XMPP utvecklare"
+
+#: ../pidgin/gtkdialogs.c:116
+msgid "original author"
+msgstr "ursprunglig upphovsman"
+
+#: ../pidgin/gtkdialogs.c:123
+msgid "Afrikaans"
+msgstr "Afrikaans"
+
+#: ../pidgin/gtkdialogs.c:124
+msgid "Arabic"
+msgstr "Arabiska"
+
+#: ../pidgin/gtkdialogs.c:125 ../pidgin/gtkdialogs.c:126
+#: ../pidgin/gtkdialogs.c:213
+msgid "Bulgarian"
+msgstr "Bulgariska"
+
+#: ../pidgin/gtkdialogs.c:127 ../pidgin/gtkdialogs.c:128
+#: ../pidgin/gtkdialogs.c:129 ../pidgin/gtkdialogs.c:130
+msgid "Bengali"
+msgstr "Bengali"
+
+#: ../pidgin/gtkdialogs.c:131
+msgid "Bosnian"
+msgstr "Bostniska"
+
+#: ../pidgin/gtkdialogs.c:132 ../pidgin/gtkdialogs.c:214
+#: ../pidgin/gtkdialogs.c:215
+msgid "Catalan"
+msgstr "Katalanska"
+
+#: ../pidgin/gtkdialogs.c:133 ../pidgin/gtkdialogs.c:134
+msgid "Valencian-Catalan"
+msgstr "Valencianska"
+
+#: ../pidgin/gtkdialogs.c:135 ../pidgin/gtkdialogs.c:216
+msgid "Czech"
+msgstr "Tjeckiska"
+
+#: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
+msgid "Danish"
+msgstr "Danska"
+
+#: ../pidgin/gtkdialogs.c:138 ../pidgin/gtkdialogs.c:139
+#: ../pidgin/gtkdialogs.c:217
+msgid "German"
+msgstr "Tyska"
+
+#: ../pidgin/gtkdialogs.c:140 ../pidgin/gtkdialogs.c:141
+#: ../pidgin/gtkdialogs.c:142
+msgid "Dzongkha"
+msgstr "Dzongkha"
+
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:144
+msgid "Greek"
+msgstr "Grekiska"
+
+#: ../pidgin/gtkdialogs.c:145
+msgid "Australian English"
+msgstr "Australiensisk engelska"
+
+#: ../pidgin/gtkdialogs.c:146
+msgid "Canadian English"
+msgstr "Kanadensiskt engelska"
+
+#: ../pidgin/gtkdialogs.c:147
+msgid "British English"
+msgstr "Brittisk engelska"
+
+#: ../pidgin/gtkdialogs.c:148
+msgid "Esperanto"
+msgstr "Esperanto"
+
+#: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:218
+#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:221
+msgid "Spanish"
+msgstr "Spanska"
+
+#: ../pidgin/gtkdialogs.c:150 ../pidgin/gtkdialogs.c:151
+msgid "Euskera(Basque)"
+msgstr "Baskiska"
+
+#: ../pidgin/gtkdialogs.c:152 ../pidgin/gtkdialogs.c:153
+#: ../pidgin/gtkdialogs.c:154
+msgid "Persian"
+msgstr "Persiska"
+
+#: ../pidgin/gtkdialogs.c:155 ../pidgin/gtkdialogs.c:222
+#: ../pidgin/gtkdialogs.c:223
+msgid "Finnish"
+msgstr "Finska"
+
+#: ../pidgin/gtkdialogs.c:156 ../pidgin/gtkdialogs.c:224
+#: ../pidgin/gtkdialogs.c:225 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:227
+msgid "French"
+msgstr "Franska"
+
+#: ../pidgin/gtkdialogs.c:157 ../pidgin/gtkdialogs.c:158
+msgid "Galician"
+msgstr "Galiciska"
+
+#: ../pidgin/gtkdialogs.c:159 ../pidgin/gtkdialogs.c:160
+msgid "Gujarati"
+msgstr "Gujarati"
+
+#: ../pidgin/gtkdialogs.c:160
+msgid "Gujarati Language Team"
+msgstr "Gujarati Spr奪kteam"
+
+#: ../pidgin/gtkdialogs.c:161 ../pidgin/gtkdialogs.c:228
+msgid "Hebrew"
+msgstr "Hebreiska"
+
+#: ../pidgin/gtkdialogs.c:162
+msgid "Hindi"
+msgstr "Hindi"
+
+#: ../pidgin/gtkdialogs.c:163
+msgid "Hungarian"
+msgstr "Ungerska"
+
+#: ../pidgin/gtkdialogs.c:164
+msgid "Indonesian"
+msgstr "Indonesiska"
+
+#: ../pidgin/gtkdialogs.c:165 ../pidgin/gtkdialogs.c:229
+msgid "Italian"
+msgstr "Italienska"
+
+#: ../pidgin/gtkdialogs.c:166 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:231 ../pidgin/gtkdialogs.c:232
+msgid "Japanese"
+msgstr "Japanska"
+
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:233
+msgid "Georgian"
+msgstr "Georgiska"
+
+#: ../pidgin/gtkdialogs.c:167
+msgid "Ubuntu Georgian Translators"
+msgstr "Ubuntu Georgiska 旦vers辰ttare"
+
+#: ../pidgin/gtkdialogs.c:168
+msgid "Kannada"
+msgstr "Kannada"
+
+#: ../pidgin/gtkdialogs.c:168
+msgid "Kannada Translation team"
+msgstr "Kannada 旦vers辰ttningsteam"
+
+#: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:234
+#: ../pidgin/gtkdialogs.c:235
+msgid "Korean"
+msgstr "Koreanska"
+
+#: ../pidgin/gtkdialogs.c:170 ../pidgin/gtkdialogs.c:171
+#: ../pidgin/gtkdialogs.c:172
+msgid "Kurdish"
+msgstr "Kurdiska"
+
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:236
+#: ../pidgin/gtkdialogs.c:237
+msgid "Lithuanian"
+msgstr "Lettl辰ndska"
+
+#: ../pidgin/gtkdialogs.c:174 ../pidgin/gtkdialogs.c:175
+#: ../pidgin/gtkdialogs.c:238
+msgid "Macedonian"
+msgstr "Makedonska"
+
+#: ../pidgin/gtkdialogs.c:176
+msgid "Bokm奪l Norwegian"
+msgstr "Bokm奪l Norska"
+
+#: ../pidgin/gtkdialogs.c:177
+msgid "Nepali"
+msgstr "Nepalska"
+
+#: ../pidgin/gtkdialogs.c:178
+msgid "Dutch, Flemish"
+msgstr "Holl辰ndska, Flaml辰ndska"
+
+#: ../pidgin/gtkdialogs.c:179
+msgid "Norwegian"
+msgstr "Norska"
+
+#: ../pidgin/gtkdialogs.c:180
+msgid "Norwegian Nynorsk"
+msgstr "Norska Nynorsk"
+
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:182
+#: ../pidgin/gtkdialogs.c:183 ../pidgin/gtkdialogs.c:239
+msgid "Polish"
+msgstr "Polska"
+
+#: ../pidgin/gtkdialogs.c:184
+msgid "Portuguese"
+msgstr "Portugisiska"
+
+#: ../pidgin/gtkdialogs.c:185
+msgid "Portuguese-Brazil"
+msgstr "Portugisiska (brasiliansk)"
+
+#: ../pidgin/gtkdialogs.c:186
+msgid "Pashto"
+msgstr "Pashto"
+
+#: ../pidgin/gtkdialogs.c:187
+msgid "Romanian"
+msgstr "Rum辰nska"
+
+#: ../pidgin/gtkdialogs.c:188 ../pidgin/gtkdialogs.c:240
+#: ../pidgin/gtkdialogs.c:241
+msgid "Russian"
+msgstr "Ryska"
+
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:190
+#: ../pidgin/gtkdialogs.c:242 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:244
+msgid "Slovak"
+msgstr "Slovakiska"
+
+#: ../pidgin/gtkdialogs.c:191 ../pidgin/gtkdialogs.c:245
+msgid "Slovenian"
+msgstr "Slovenska"
+
+#: ../pidgin/gtkdialogs.c:192
+msgid "Albanian"
+msgstr "Albanska"
+
+#: ../pidgin/gtkdialogs.c:193 ../pidgin/gtkdialogs.c:194
+msgid "Serbian"
+msgstr "Serbiska"
+
+#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:246
+msgid "Swedish"
+msgstr "Svenska"
+
+#: ../pidgin/gtkdialogs.c:196
+msgid "Tamil"
+msgstr "Tamilska"
+
+#: ../pidgin/gtkdialogs.c:197
+msgid "Telugu"
+msgstr "Telugu"
+
+#: ../pidgin/gtkdialogs.c:198
+msgid "Thai"
+msgstr "Thail辰ndska"
+
+#: ../pidgin/gtkdialogs.c:199 ../pidgin/gtkdialogs.c:247
+msgid "Turkish"
+msgstr "Turkiska"
+
+#: ../pidgin/gtkdialogs.c:200
+msgid "Vietnamese"
+msgstr "Vietnamesiska"
+
+#: ../pidgin/gtkdialogs.c:200
+msgid "T.M.Thanh and the Gnome-Vi Team"
+msgstr "T.M.Thanh och Gnome-Vi Teamet"
+
+#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:248
+msgid "Simplified Chinese"
+msgstr "F旦renklad kinesiska"
+
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
+#: ../pidgin/gtkdialogs.c:204
+msgid "Hong Kong Chinese"
+msgstr "Hong Kong Kinesiska"
+
+#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:206
+#: ../pidgin/gtkdialogs.c:249
+msgid "Traditional Chinese"
+msgstr "Traditionell kinesiska"
+
+#: ../pidgin/gtkdialogs.c:212
+msgid "Amharic"
+msgstr "Amhariska"
+
+#: ../pidgin/gtkdialogs.c:334
+#, c-format
+msgid "About %s"
+msgstr "Om %s"
+
+#: ../pidgin/gtkdialogs.c:372
+#, c-format
+msgid ""
+"%s is a graphical modular messaging client based on libpurple which is "
+"capable of connecting to AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu, and QQ all at "
+"once.  It is written using GTK+.<BR><BR>You may modify and redistribute the "
+"program under the terms of the GPL (version 2 or later).  A copy of the GPL "
+"is contained in the 'COPYING' file distributed with %s.  %s is copyrighted "
+"by its contributors.  See the 'COPYRIGHT' file for the complete list of "
+"contributors.  We provide no warranty for this program.<BR><BR>"
+msgstr ""
+"%s 辰r en grafisk modul辰r meddelandeklient baserad p奪 libpurple som 辰r "
+"kapabel att anv辰nda AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, "
+"Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, Gadu-Gadu och QQ "
+"samtidigt.  Det 辰r skrivet med GTK+.<BR><BR>Du kan 辰ndra och distribuera "
+"programmet enligt GPL (version 2 eller senare).  En kopia av GPL finns i "
+"filen 'COPYING' som kommer med %s.  %s 辰r kopieringsskyddad av dess "
+"bidragsgivare.  Se filen 'COPYRIGHT' f旦r en komplett lista av "
+"bidragsgivare.  Vi ger inga garantier f旦r detta program.<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:387
+msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
+msgstr "<FONT SIZE=\"4\">IRC:</FONT> #pidgin p奪 irc.freenode.net<BR><BR>"
+
+#: ../pidgin/gtkdialogs.c:392
+msgid "Current Developers"
+msgstr "Nuvarande utvecklare"
+
+#: ../pidgin/gtkdialogs.c:407
+msgid "Crazy Patch Writers"
+msgstr "Programmerare av galna patchar"
+
+#: ../pidgin/gtkdialogs.c:422
+msgid "Retired Developers"
+msgstr "F旦re detta utvecklare"
+
+#: ../pidgin/gtkdialogs.c:437
+msgid "Artists"
+msgstr "Artister"
+
+#: ../pidgin/gtkdialogs.c:452
+msgid "Current Translators"
+msgstr "Nuvarande 旦vers辰ttare"
+
+#: ../pidgin/gtkdialogs.c:472
+msgid "Past Translators"
+msgstr "F旦re detta 旦vers辰ttare"
+
+#: ../pidgin/gtkdialogs.c:490
+msgid "Debugging Information"
+msgstr "Fels旦kningsinformation"
+
+#: ../pidgin/gtkdialogs.c:859
+msgid "Get User Info"
+msgstr "H辰mta anv辰ndarinformation"
+
+#: ../pidgin/gtkdialogs.c:861
+msgid ""
+"Please enter the screen name or alias of the person whose info you would "
+"like to view."
+msgstr ""
+"Ange anv辰ndar-ID eller alias f旦r den person vars information du vill visa."
+
+#: ../pidgin/gtkdialogs.c:951
+msgid "View User Log"
+msgstr "Visa anv辰ndarlogg"
+
+#: ../pidgin/gtkdialogs.c:953
+msgid ""
+"Please enter the screen name or alias of the person whose log you would like "
+"to view."
+msgstr "Ange anv辰ndar-ID eller alias f旦r den person vars logg du vill visa."
+
+#: ../pidgin/gtkdialogs.c:973
+msgid "Alias Contact"
+msgstr "Kontaktalias"
+
+#: ../pidgin/gtkdialogs.c:974
+msgid "Enter an alias for this contact."
+msgstr "Ange ett alias f旦r denna kontakt."
+
+#: ../pidgin/gtkdialogs.c:996
+#, c-format
+msgid "Enter an alias for %s."
+msgstr "Ange ett alias f旦r %s."
+
+#: ../pidgin/gtkdialogs.c:998
+msgid "Alias Buddy"
+msgstr "Kompisalias"
+
+#: ../pidgin/gtkdialogs.c:1019
+msgid "Alias Chat"
+msgstr "Chattalias"
+
+#: ../pidgin/gtkdialogs.c:1020
+msgid "Enter an alias for this chat."
+msgstr "Ange ett alias f旦r denna chatt."
+
+#: ../pidgin/gtkdialogs.c:1059
+#, 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] ""
+"Du h奪ller p奪 att ta bort kontakten som inneh奪ller %s och %d annan kompis "
+"fr奪n din kompislista. Vill du forts辰tta?"
+msgstr[1] ""
+"Du h奪ller p奪 att ta bort kontakten som inneh奪ller %s och %d andra kompisar "
+"fr奪n din kompislista. Vill du forts辰tta?"
+
+#: ../pidgin/gtkdialogs.c:1067
+msgid "Remove Contact"
+msgstr "Ta bort kontakt"
+
+#: ../pidgin/gtkdialogs.c:1070
+msgid "_Remove Contact"
+msgstr "Ta bo_rt kontakt"
+
+#: ../pidgin/gtkdialogs.c:1101
+#, c-format
+msgid ""
+"You are about to merge the group called %s into the group called %s. Do you "
+"want to continue?"
+msgstr ""
+"Du h奪ller p奪 att sl奪 ihop gruppen %s med gruppen %s. Vill du forts辰tta?"
+
+#: ../pidgin/gtkdialogs.c:1108
+msgid "Merge Groups"
+msgstr "Sl奪 ihop grupper"
+
+#: ../pidgin/gtkdialogs.c:1111
+msgid "_Merge Groups"
+msgstr "_Sl奪 ihop grupper"
+
+#: ../pidgin/gtkdialogs.c:1161
+#, 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 ""
+"Du h奪ller p奪 att ta bort gruppen %s och alla dess medlemmar fr奪n din "
+"kompislista. Vill du forts辰tta?"
+
+#: ../pidgin/gtkdialogs.c:1164
+msgid "Remove Group"
+msgstr "Ta bort grupp"
+
+#: ../pidgin/gtkdialogs.c:1167
+msgid "_Remove Group"
+msgstr "Ta bo_rt grupp"
+
+#: ../pidgin/gtkdialogs.c:1200
+#, c-format
+msgid ""
+"You are about to remove %s from your buddy list.  Do you want to continue?"
+msgstr "Du h奪ller p奪 att ta bort %s fr奪n din kompislista. Vill du forts辰tta?"
+
+#: ../pidgin/gtkdialogs.c:1203
+msgid "Remove Buddy"
+msgstr "Ta bort kompis"
+
+#: ../pidgin/gtkdialogs.c:1206
+msgid "_Remove Buddy"
+msgstr "Ta bo_rt kompis"
+
+#: ../pidgin/gtkdialogs.c:1227
+#, c-format
+msgid ""
+"You are about to remove the chat %s from your buddy list.  Do you want to "
+"continue?"
+msgstr ""
+"Du h奪ller p奪 att ta bort chatten %s fr奪n din kompislista. Vill du forts辰tta?"
+
+#: ../pidgin/gtkdialogs.c:1230
+msgid "Remove Chat"
+msgstr "Ta bort chatt"
+
+#: ../pidgin/gtkdialogs.c:1233
+msgid "_Remove Chat"
+msgstr "Ta bo_rt chatt"
+
+#: ../pidgin/gtkdocklet.c:150
+msgid "Right-click for more unread messages...\n"
+msgstr "H旦gerklicka f旦r fler ol辰sta meddelanden...\n"
+
+#: ../pidgin/gtkdocklet.c:435
+msgid "Change Status"
+msgstr "�ndra status"
+
+#: ../pidgin/gtkdocklet.c:487
+msgid "Show Buddy List"
+msgstr "Visa kompislistan"
+
+#: ../pidgin/gtkdocklet.c:513
+msgid "New Message..."
+msgstr "Nytt meddelande..."
+
+#: ../pidgin/gtkdocklet.c:528
+msgid "Mute Sounds"
+msgstr "St辰ng av ljud"
+
+#: ../pidgin/gtkdocklet.c:535
+msgid "Blink on new message"
+msgstr "Blinka vid nya meddelande"
+
+#: ../pidgin/gtkdocklet.c:542
+msgid "Quit"
+msgstr "Avsluta"
+
+#: ../pidgin/gtkft.c:153
+msgid "Not started"
+msgstr "Ej startad"
+
+#: ../pidgin/gtkft.c:273
+msgid "<b>Receiving As:</b>"
+msgstr "<b>Tar emot som:</b>"
+
+#: ../pidgin/gtkft.c:275
+msgid "<b>Receiving From:</b>"
+msgstr "<b>Tar emot fr奪n:</b>"
+
+#: ../pidgin/gtkft.c:279
+msgid "<b>Sending To:</b>"
+msgstr "<b>Skickar till:</b>"
+
+#: ../pidgin/gtkft.c:281
+msgid "<b>Sending As:</b>"
+msgstr "<b>Skickar som:</b>"
+
+#: ../pidgin/gtkft.c:497
+msgid "There is no application configured to open this type of file."
+msgstr ""
+"Det finns ingen applikation konfigurarad att 旦ppna den h辰r typen av fil."
+
+#: ../pidgin/gtkft.c:502
+msgid "An error occurred while opening the file."
+msgstr "Ett fel uppstod n辰r filen 旦ppnades."
+
+#: ../pidgin/gtkft.c:539
+#, c-format
+msgid "Error launching %s: %s"
+msgstr "Fel vid k旦rning av %s: %s"
+
+#: ../pidgin/gtkft.c:548
+#, c-format
+msgid "Error running %s"
+msgstr "Fel vid k旦rning av %s"
+
+#: ../pidgin/gtkft.c:549
+#, c-format
+msgid "Process returned error code %d"
+msgstr "Processen gav felkod %d"
+
+#: ../pidgin/gtkft.c:696
+msgid "Filename:"
+msgstr "Filnamn:"
+
+#: ../pidgin/gtkft.c:697
+msgid "Local File:"
+msgstr "Lokal fil:"
+
+#: ../pidgin/gtkft.c:699
+msgid "Speed:"
+msgstr "Hastighet:"
+
+#: ../pidgin/gtkft.c:700
+msgid "Time Elapsed:"
+msgstr "Tid som g奪tt:"
+
+#: ../pidgin/gtkft.c:701
+msgid "Time Remaining:"
+msgstr "Tid som 奪terst奪r:"
+
+#: ../pidgin/gtkft.c:783
+msgid "Close this window when all transfers _finish"
+msgstr "St辰ng detta _f旦nster d奪 alla 旦verf旦ringar 辰r klara"
+
+#: ../pidgin/gtkft.c:793
+msgid "C_lear finished transfers"
+msgstr "_Rensa bort f辰rdiga 旦verf旦ringar"
+
+#. "Download Details" arrow
+#: ../pidgin/gtkft.c:802
+msgid "File transfer _details"
+msgstr "_Detaljerad fil旦verf旦ringsinformation"
+
+#. Pause button
+#: ../pidgin/gtkft.c:832 ../pidgin/pidginstock.c:89
+msgid "_Pause"
+msgstr "_Pausa"
+
+#. Resume button
+#: ../pidgin/gtkft.c:842
+msgid "_Resume"
+msgstr "_�teruppta"
+
+#: ../pidgin/gtkimhtml.c:795
+msgid "Paste as Plain _Text"
+msgstr "Klistra in som ren _text"
+
+#: ../pidgin/gtkimhtml.c:812
+msgid "_Reset formatting"
+msgstr "_Rensa formatering"
+
+#: ../pidgin/gtkimhtml.c:1349
+msgid "Hyperlink color"
+msgstr "F辰rg p奪 l辰nkar"
+
+#: ../pidgin/gtkimhtml.c:1350
+msgid "Color to draw hyperlinks."
+msgstr "F辰rg som l辰nkar ska ha."
+
+# "utpekade" var det b辰sta ord jag kunde komma p奪.
+#: ../pidgin/gtkimhtml.c:1353
+msgid "Hyperlink prelight color"
+msgstr "F辰rg p奪 utpekade l辰nkar"
+
+#: ../pidgin/gtkimhtml.c:1354
+msgid "Color to draw hyperlinks when mouse is over them."
+msgstr "F辰rg som l辰nkar ska ha n辰r musmark旦ren 辰r ovanf旦r dem."
+
+#: ../pidgin/gtkimhtml.c:1575
+msgid "_Copy E-Mail Address"
+msgstr "_Kopiera e-postadress"
+
+#: ../pidgin/gtkimhtml.c:1587
+msgid "_Open Link in Browser"
+msgstr "_�ppna l辰nk i webbl辰sare"
+
+#: ../pidgin/gtkimhtml.c:1597
+msgid "_Copy Link Location"
+msgstr "_Kopiera l辰nk"
+
+#: ../pidgin/gtkimhtml.c:3341
+msgid ""
+"<span size='larger' weight='bold'>Unrecognized file type</span>\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"<span size='larger' weight='bold'>Ok辰nd filtyp</span>\n"
+"\n"
+"Tillbakafaller till PNG."
+
+#: ../pidgin/gtkimhtml.c:3344
+msgid ""
+"Unrecognized file type\n"
+"\n"
+"Defaulting to PNG."
+msgstr ""
+"Ok辰nd filtyp\n"
+"\n"
+"Tillbakafaller till PNG."
+
+#: ../pidgin/gtkimhtml.c:3373
+#, c-format
+msgid ""
+"<span size='larger' weight='bold'>Error saving image</span>\n"
+"\n"
+"%s"
+msgstr ""
+"<span size='larger' weight='bold'>Fel n辰r bild sparades</span>\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3376
+#, c-format
+msgid ""
+"Error saving image\n"
+"\n"
+"%s"
+msgstr ""
+"Fel n辰r bild sparades\n"
+"\n"
+"%s"
+
+#: ../pidgin/gtkimhtml.c:3454 ../pidgin/gtkimhtml.c:3466
+msgid "Save Image"
+msgstr "Spara bild"
+
+#: ../pidgin/gtkimhtml.c:3494
+msgid "_Save Image..."
+msgstr "_Spara bild..."
+
+#: ../pidgin/gtkimhtmltoolbar.c:153
+msgid "Select Font"
+msgstr "V辰lj typsnitt"
+
+#: ../pidgin/gtkimhtmltoolbar.c:232
+msgid "Select Text Color"
+msgstr "V辰lj textf辰rg"
+
+#: ../pidgin/gtkimhtmltoolbar.c:311
+msgid "Select Background Color"
+msgstr "V辰lj bakgrundsf辰rg"
+
+#: ../pidgin/gtkimhtmltoolbar.c:400
+msgid "_URL"
+msgstr "_URL"
+
+#: ../pidgin/gtkimhtmltoolbar.c:408
+msgid "_Description"
+msgstr "_Beskrivning"
+
+#: ../pidgin/gtkimhtmltoolbar.c:411
+msgid ""
+"Please enter the URL and description of the link that you want to insert. "
+"The description is optional."
+msgstr ""
+"Ange URL och beskrivning av l辰nken du vill infoga. Beskrivningen 辰r inte "
+"obligatorisk."
+
+#: ../pidgin/gtkimhtmltoolbar.c:415
+msgid "Please enter the URL of the link that you want to insert."
+msgstr "Ange URL f旦r l辰nken du vill infoga."
+
+#: ../pidgin/gtkimhtmltoolbar.c:420
+msgid "Insert Link"
+msgstr "Infoga l辰nk"
+
+#: ../pidgin/gtkimhtmltoolbar.c:424 ../pidgin/gtkimhtmltoolbar.c:1155
+msgid "_Insert"
+msgstr "_Infoga"
+
+#: ../pidgin/gtkimhtmltoolbar.c:493
+#, c-format
+msgid "Failed to store image: %s\n"
+msgstr "Kunde inte spara bilden: %s\n"
+
+#: ../pidgin/gtkimhtmltoolbar.c:519 ../pidgin/gtkimhtmltoolbar.c:529
+msgid "Insert Image"
+msgstr "Infoga bild"
+
+#: ../pidgin/gtkimhtmltoolbar.c:740
+msgid "This theme has no available smileys."
+msgstr "Detta tema har inga tillg辰ngliga smileys."
+
+#. show everything
+#: ../pidgin/gtkimhtmltoolbar.c:757
+msgid "Smile!"
+msgstr "Smile!"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1064
+msgid "_Bold"
+msgstr "_Fet"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1065
+msgid "_Italic"
+msgstr "_Kursiv"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1066
+msgid "_Underline"
+msgstr "_Understruken"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1067
+msgid "_Larger"
+msgstr "_St旦rre"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1069
+msgid "_Normal"
+msgstr "_Normal"
+
+# src/menus.c:280
+#: ../pidgin/gtkimhtmltoolbar.c:1071
+msgid "_Smaller"
+msgstr "_Mindre"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1072
+msgid "_Font face"
+msgstr "_Typsnittsansikte"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1073
+msgid "_Foreground color"
+msgstr "_F旦rgrundsf辰rg"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1074
+msgid "_Background color"
+msgstr "_Bakgrundsf辰rg"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "_Font"
+msgstr "_Typsnitt"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1135
+msgid "_Reset font"
+msgstr "_Rensa typsnitt"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1162
+msgid "_Smiley"
+msgstr "_Smiley"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1168
+msgid "_Image"
+msgstr "B_ild"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1174
+msgid "_Link"
+msgstr "_L辰nk"
+
+#: ../pidgin/gtklog.c:292
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation with "
+"%s which started at %s?"
+msgstr ""
+"�r du s辰ker p奪 att du vill permanent ta bort historiken 旦ver "
+"konversationerna med %s som p奪b旦rjades vid %s?"
+
+#: ../pidgin/gtklog.c:303
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the log of the conversation in %"
+"s which started at %s?"
+msgstr ""
+"�r du s辰ker p奪 att du vill permanent ta bort historiken 旦ver konversationer "
+"i %s som p奪b旦rjades vid %s"
+
+#: ../pidgin/gtklog.c:308
+#, c-format
+msgid ""
+"Are you sure you want to permanently delete the system log which started at %"
+"s?"
+msgstr ""
+"�r du s辰ker p奪 att du vill permanent ta bort systemloggen vilken startades "
+"vid %s?"
+
+#: ../pidgin/gtklog.c:452
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation in %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Konversation i %s p奪 %s</span>"
+
+#: ../pidgin/gtklog.c:455
+#, c-format
+msgid "<span size='larger' weight='bold'>Conversation with %s on %s</span>"
+msgstr "<span size='larger' weight='bold'>Konversation med %s p奪 %s</span>"
+
+#: ../pidgin/gtklog.c:502
+msgid "%B %Y"
+msgstr "%B %Y"
+
+#: ../pidgin/gtklog.c:549
+msgid ""
+"System events will only be logged if the \"Log all status changes to system "
+"log\" preference is enabled."
+msgstr ""
+"Systemh辰ndelser kommer endast att loggas om alternativet \"Logga alla "
+"statusf旦r辰ndringar till systemloggen\" 辰r aktiverat i inst辰llningarna."
+
+#: ../pidgin/gtklog.c:553
+msgid ""
+"Instant messages will only be logged if the \"Log all instant messages\" "
+"preference is enabled."
+msgstr ""
+"Snabbmeddelanden kommer endast att loggas om alternativet \"Logga alla "
+"snabbmeddelanden\" 辰r aktiverat i inst辰llningarna."
+
+#: ../pidgin/gtklog.c:556
+msgid ""
+"Chats will only be logged if the \"Log all chats\" preference is enabled."
+msgstr ""
+"Chattar kommer endast att loggas om alternativet \"Logga alla chattar\" 辰r "
+"aktiverat i inst辰llningarna."
+
+#: ../pidgin/gtklog.c:560
+msgid "No logs were found"
+msgstr "Inga loggar hittades"
+
+#. Steal the "HELP" response and use it to trigger browsing to the logs folder
+#: ../pidgin/gtklog.c:575
+msgid "_Browse logs folder"
+msgstr "_Bl辰ddra bland logg-kataloger"
+
+#: ../pidgin/gtklog.c:639
+msgid "Total log size:"
+msgstr "Total loggstorlek"
+
+#: ../pidgin/gtklog.c:708
+#, c-format
+msgid "Conversations in %s"
+msgstr "Konversationer i %s"
+
+#: ../pidgin/gtklog.c:716 ../pidgin/gtklog.c:778
+#, c-format
+msgid "Conversations with %s"
+msgstr "Konversationer med %s"
+
+#: ../pidgin/gtklog.c:803
+msgid "System Log"
+msgstr "Systemlogg"
+
+#: ../pidgin/gtkmain.c:385
+#, c-format
+msgid "%s %s. Try `%s -h' for more information.\n"
+msgstr "%s %s. F旦rs旦k med '%s -h' f旦r mer information.\n"
+
+# FIXME: Ska "FLAGGA" anv辰ndas ist辰llet f旦r "ALTERNATIV" h辰r?
+#: ../pidgin/gtkmain.c:387
+#, c-format
+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"
+"  -m, --multiple      do not ensure single instance\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"
+"Anv辰ndning: %s [FLAGGA]...\n"
+"\n"
+"  -c, --config=KATALOG   anv辰nd KATALOG f旦r konfigurationsfiler\n"
+"  -d, --debug         skriv fels旦kningsinformation till standardut\n"
+"  -h, --help          visa denna hj辰lp och avsluta\n"
+"  -m, --multiple      begr辰nsar inte till en enda process\n"
+"  -n, --nologin       logga inte in automatiskt\n"
+"  -l, --login[=NAMN]  logga in automatiskt (frivilliga argumentet NAMN\n"
+"                      anger kontot/kontona som ska anv辰ndas, separerade\n"
+"                      med kommatecken)\n"
+"  -v, --version       visa den nuvarande versionen och avsluta\n"
+
+#: ../pidgin/gtkmain.c:511
+#, 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 developers\n"
+"by reporting a bug at:\n"
+"%ssimpleticket/\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"
+"%swiki/GetABacktrace\n"
+"\n"
+"If you need further assistance, please IM either SeanEgn or \n"
+"LSchiere (via AIM).  Contact information for Sean and Luke \n"
+"on other protocols is at\n"
+"%swiki/DeveloperPages\n"
+msgstr ""
+"%s har r奪kat ut f旦r ett segmenteringsfel och f旦rs旦kte att dumpa k辰rnan till "
+"fil.\n"
+"Detta 辰r ett fel i mjukvaran och beror inte p奪 n奪got fel du gjort.\n"
+"\n"
+"Om du kan 奪terskapa krashen, var v辰nlig att meddela utvecklarna\n"
+"genom att rapportera felet vid\n"
+"%ssimpleticket\n"
+"\n"
+"Var god och meddela vad du gjorde vid tillf辰llet\n"
+"och posta backtraceen fr奪n k辰rn-filen. Om du inte vet hur du skapar en "
+"backtrace,\n"
+"var god l辰s instruktionerna p奪\n"
+"%swiki/GetABacktrace\n"
+"\n"
+"Om du beh旦ver ytterligare hj辰lp s奪 kan du skicka ett meddelande till "
+"antingen\n"
+"SeanEgn eller LSchiere (via AIM). Hur du f奪r tag p奪 Sean och Luke finner du "
+"p奪\n"
+"%swiki/DeveloperPages\n"
+
+#. Translators may want to transliterate the name.
+#. It is not to be translated.
+#: ../pidgin/gtkmain.c:697 ../pidgin/pidgin.h:50
+msgid "Pidgin"
+msgstr "Pidgin"
+
+#: ../pidgin/gtknotify.c:343
+msgid "Open All Messages"
+msgstr "�ppna alla meddelanden"
+
+#: ../pidgin/gtknotify.c:395
+msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
+msgstr "<span weight=\"bold\" size=\"larger\">Du har f奪tt e-post!!</span>"
+
+#: ../pidgin/gtknotify.c:515
+#, c-format
+msgid "%s has %d new message."
+msgid_plural "%s has %d new messages."
+msgstr[0] "%s har %d nytt meddelande."
+msgstr[1] "%s har %d nya meddelanden."
+
+#: ../pidgin/gtknotify.c:526
+#, c-format
+msgid "<b>You have %d new e-mail.</b>"
+msgid_plural "<b>You have %d new e-mails.</b>"
+msgstr[0] "<b> Du har %d nytt epost.</b>"
+msgstr[1] "<b> Du har %d nya epost.</b>"
+
+#: ../pidgin/gtknotify.c:964
+#, c-format
+msgid "The browser command \"%s\" is invalid."
+msgstr "Kommandot f旦r webbl辰saren \"%s\" 辰r ogiltigt."
+
+#: ../pidgin/gtknotify.c:966 ../pidgin/gtknotify.c:978
+#: ../pidgin/gtknotify.c:991 ../pidgin/gtknotify.c:1119
+msgid "Unable to open URL"
+msgstr "Kan inte 旦ppna URL"
+
+#: ../pidgin/gtknotify.c:976 ../pidgin/gtknotify.c:989
+#, c-format
+msgid "Error launching \"%s\": %s"
+msgstr "Fel vid k旦rning av \"%s\": %s"
+
+#: ../pidgin/gtknotify.c:1120
+msgid ""
+"The 'Manual' browser command has been chosen, but no command has been set."
+msgstr "Manuellt webbl辰sarkommando har valts, men inget kommando angivits."
+
+#: ../pidgin/gtkplugin.c:264
+msgid "The following plugins will be unloaded."
+msgstr "De f旦ljande modulerna kommer avladdas."
+
+#: ../pidgin/gtkplugin.c:283
+msgid "Multiple plugins will be unloaded."
+msgstr "Multibla moduler kommer bli avladdade."
+
+#: ../pidgin/gtkplugin.c:287
+msgid "Unload Plugins"
+msgstr "Avladda insticksmoduler"
+
+#: ../pidgin/gtkplugin.c:399
+#, 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\">Skriven av::</span>\t%s\n"
+"<span weight=\"bold\">Hemsida::</span>\t\t%s\n"
+"<span weight=\"bold\">Filnamn::</span>\t\t%s"
+
+#: ../pidgin/gtkplugin.c:409
+#, 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\">Fel: %s\n"
+"S旦k efter en uppdatering f旦r modulen p奪 dess hemsida.</span>"
+
+#: ../pidgin/gtkplugin.c:535
+msgid "Configure Pl_ugin"
+msgstr "Konfigurera Insticksmod_uler"
+
+#: ../pidgin/gtkplugin.c:598
+msgid "<b>Plugin Details</b>"
+msgstr "<b>Detaljer f旦r modul</b>"
+
+#: ../pidgin/gtkpounce.c:156
+msgid "Select a file"
+msgstr "V辰lj en fil"
+
+#. Create the "Pounce on Whom" frame.
+#: ../pidgin/gtkpounce.c:533
+msgid "Pounce on Whom"
+msgstr "Attackera vem"
+
+#: ../pidgin/gtkpounce.c:560
+msgid "_Buddy name:"
+msgstr "K_ompisnamn:"
+
+#: ../pidgin/gtkpounce.c:594
+msgid "Si_gns on"
+msgstr "_Ansluter"
+
+#: ../pidgin/gtkpounce.c:596
+msgid "Signs o_ff"
+msgstr "_Kopplar ifr奪n"
+
+#: ../pidgin/gtkpounce.c:598
+msgid "Goes a_way"
+msgstr "Blir _fr奪nvarande"
+
+#: ../pidgin/gtkpounce.c:600
+msgid "Ret_urns from away"
+msgstr "_�terv辰nder fr奪n fr奪nvaro"
+
+#: ../pidgin/gtkpounce.c:602
+msgid "Becomes _idle"
+msgstr "Blir _inaktiv"
+
+#: ../pidgin/gtkpounce.c:604
+msgid "Is no longer i_dle"
+msgstr "_�r inte l辰ngre inaktiv"
+
+#: ../pidgin/gtkpounce.c:606
+msgid "Starts _typing"
+msgstr "B旦rjar _skriva"
+
+#: ../pidgin/gtkpounce.c:608
+msgid "P_auses while typing"
+msgstr "Pa_usar under skrivning"
+
+#: ../pidgin/gtkpounce.c:610
+msgid "Stops t_yping"
+msgstr "Slutar s_kriva"
+
+#: ../pidgin/gtkpounce.c:612
+msgid "Sends a _message"
+msgstr "Skickar ett _meddelande"
+
+#: ../pidgin/gtkpounce.c:655
+msgid "Ope_n an IM window"
+msgstr "_�ppna ett snabbmeddelandef旦nster"
+
+#: ../pidgin/gtkpounce.c:657
+msgid "_Pop up a notification"
+msgstr "Visa en _rapport"
+
+#: ../pidgin/gtkpounce.c:659
+msgid "Send a _message"
+msgstr "Skicka ett _meddelande"
+
+#: ../pidgin/gtkpounce.c:661
+msgid "E_xecute a command"
+msgstr "_K旦r ett kommando"
+
+#: ../pidgin/gtkpounce.c:663
+msgid "P_lay a sound"
+msgstr "Spela upp ett _ljud"
+
+#: ../pidgin/gtkpounce.c:669
+msgid "Brows_e..."
+msgstr "_Bl辰ddra..."
+
+#: ../pidgin/gtkpounce.c:671
+msgid "Br_owse..."
+msgstr "B_l辰ddra..."
+
+#: ../pidgin/gtkpounce.c:672
+msgid "Pre_view"
+msgstr "_F旦rhandsgranska"
+
+#: ../pidgin/gtkpounce.c:799
+msgid "P_ounce only when my status is not Available"
+msgstr "A_ttackera enbart d奪 min status 辰r fr奪nvarande"
+
+#: ../pidgin/gtkpounce.c:804
+msgid "_Recurring"
+msgstr "�te_rkommande"
+
+#: ../pidgin/gtkpounce.c:1260
+msgid "Pounce Target"
+msgstr "Attackera m奪l"
+
+#: ../pidgin/gtkprefs.c:385
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:1
+msgid "Default"
+msgstr "F旦rval"
+
+#: ../pidgin/gtkprefs.c:516
+msgid "Smiley theme failed to unpack."
+msgstr "Smiley temat kunde inte packas upp."
+
+#: ../pidgin/gtkprefs.c:643
+msgid "Install Theme"
+msgstr "Installera tema"
+
+#: ../pidgin/gtkprefs.c:696
+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 ""
+"V辰lj det tema f旦r grafiska smileys som du vill anv辰nda fr奪n listan nedanf旦r. "
+"Nya teman kan installeras genom att dra och sl辰ppa dem p奪 temalistan."
+
+#: ../pidgin/gtkprefs.c:731
+msgid "Icon"
+msgstr "Ikon"
+
+#: ../pidgin/gtkprefs.c:893
+msgid "System Tray Icon"
+msgstr "Systempanelikon"
+
+#: ../pidgin/gtkprefs.c:894
+msgid "_Show system tray icon:"
+msgstr "Vi_sa systempanelsikon:"
+
+#: ../pidgin/gtkprefs.c:896 ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:1756
+#: ../pidgin/plugins/timestamp_format.c:42
+#: ../pidgin/plugins/timestamp_format.c:51
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:338
+msgid "Always"
+msgstr "Alltid"
+
+#: ../pidgin/gtkprefs.c:898
+msgid "On unread messages"
+msgstr "Vid ol辰sta meddeladen"
+
+#: ../pidgin/gtkprefs.c:903
+msgid "Conversation Window Hiding"
+msgstr "D旦lj konversationsf旦nster"
+
+#: ../pidgin/gtkprefs.c:904
+msgid "_Hide new IM conversations:"
+msgstr "_D旦lj nya IM konversationer:"
+
+#: ../pidgin/gtkprefs.c:907 ../pidgin/gtkprefs.c:1937
+msgid "When away"
+msgstr "Vid fr奪nvaro"
+
+#. All the tab options!
+#: ../pidgin/gtkprefs.c:915
+msgid "Tabs"
+msgstr "Flikar"
+
+#: ../pidgin/gtkprefs.c:917
+msgid "Show IMs and chats in _tabbed windows"
+msgstr "Visa snabbmeddelanden och chattar i _flikf旦nster."
+
+#: ../pidgin/gtkprefs.c:931
+msgid "Show close b_utton on tabs"
+msgstr "_Visa st辰ngningsknapp p奪 flikar"
+
+#: ../pidgin/gtkprefs.c:934
+msgid "_Placement:"
+msgstr "_Placering:"
+
+#: ../pidgin/gtkprefs.c:936
+msgid "Top"
+msgstr "�verst"
+
+#: ../pidgin/gtkprefs.c:937
+msgid "Bottom"
+msgstr "Nederst"
+
+#: ../pidgin/gtkprefs.c:938
+msgid "Left"
+msgstr "V辰nster"
+
+#: ../pidgin/gtkprefs.c:939
+msgid "Right"
+msgstr "H旦ger"
+
+#: ../pidgin/gtkprefs.c:941
+msgid "Left Vertical"
+msgstr "Vertikalt till v辰nster"
+
+#: ../pidgin/gtkprefs.c:942
+msgid "Right Vertical"
+msgstr "Vertikalt till h旦ger"
+
+#: ../pidgin/gtkprefs.c:949
+msgid "N_ew conversations:"
+msgstr "_Nya konversationer:"
+
+#: ../pidgin/gtkprefs.c:994
+msgid "Show _formatting on incoming messages"
+msgstr "Visa _formaterade inkommande meddelanden"
+
+#: ../pidgin/gtkprefs.c:997
+msgid "Show Buddy _Details"
+msgstr "Visa kompis_detaljer"
+
+#: ../pidgin/gtkprefs.c:999
+msgid "Enable buddy ic_on animation"
+msgstr "Aktivera _animering av kompisikoner"
+
+#: ../pidgin/gtkprefs.c:1006
+msgid "_Notify buddies that you are typing to them"
+msgstr "_Meddela kompisar att du skriver till dem"
+
+#: ../pidgin/gtkprefs.c:1009
+msgid "Highlight _misspelled words"
+msgstr "_Markera felstavade ord"
+
+#: ../pidgin/gtkprefs.c:1013
+msgid "Use smooth-scrolling"
+msgstr "Anv辰nd mjuk rullning"
+
+#: ../pidgin/gtkprefs.c:1016
+msgid "F_lash window when IMs are received"
+msgstr "B_linka med f旦nstret n辰r meddelanden tagits emot"
+
+#: ../pidgin/gtkprefs.c:1018
+msgid "Minimi_ze new conversation windows"
+msgstr "_Minimera nya konversationsf旦nstret"
+
+#: ../pidgin/gtkprefs.c:1022
+msgid "Font"
+msgstr "Typsnitt"
+
+#: ../pidgin/gtkprefs.c:1024
+msgid "Use document font from _theme"
+msgstr "Anv辰nde dokumenttypsnitt fr奪n _tema"
+
+#: ../pidgin/gtkprefs.c:1026
+msgid "Use font from _theme"
+msgstr "Anv辰nde typsnitt fr奪n _tema"
+
+#: ../pidgin/gtkprefs.c:1028
+msgid "Conversation _font:"
+msgstr "Konversations_typsnitt:"
+
+#: ../pidgin/gtkprefs.c:1041
+msgid "Default Formatting"
+msgstr "F旦rvald Formatering"
+
+#: ../pidgin/gtkprefs.c:1057
+msgid ""
+"This is how your outgoing message text will appear when you use protocols "
+"that support formatting."
+msgstr ""
+"S奪 h辰r kommer texten i ditt utg奪ende meddelande att se ut n辰r du anv辰nder "
+"ett protokoll som st旦djer formatering."
+
+#: ../pidgin/gtkprefs.c:1123
+msgid "ST_UN server:"
+msgstr "ST_UN-server:"
+
+#: ../pidgin/gtkprefs.c:1135
+msgid "<span style=\"italic\">Example: stunserver.org</span>"
+msgstr "<span style=\"italic\">Exempel: stunserver.org</span>"
+
+#: ../pidgin/gtkprefs.c:1139
+msgid "_Autodetect IP address"
+msgstr "K辰nn av IP-adress _automatiskt"
+
+#: ../pidgin/gtkprefs.c:1148
+msgid "Public _IP:"
+msgstr "Publik _IP-adress:"
+
+#: ../pidgin/gtkprefs.c:1177
+msgid "Ports"
+msgstr "Portar"
+
+#: ../pidgin/gtkprefs.c:1180
+msgid "_Manually specify range of ports to listen on"
+msgstr "Ange _manuellt vilken portserie som ska anv辰ndas"
+
+#: ../pidgin/gtkprefs.c:1183
+msgid "_Start port:"
+msgstr "_Startport:"
+
+#: ../pidgin/gtkprefs.c:1190
+msgid "_End port:"
+msgstr "_Slutport:"
+
+#: ../pidgin/gtkprefs.c:1198
+msgid "Proxy Server"
+msgstr "Proxyserver"
+
+#: ../pidgin/gtkprefs.c:1202
+msgid "No proxy"
+msgstr "Ingen proxy"
+
+#: ../pidgin/gtkprefs.c:1258
+msgid "_User:"
+msgstr "_Anv辰ndare:"
+
+#: ../pidgin/gtkprefs.c:1323
+msgid "Seamonkey"
+msgstr "Seamonkey"
+
+#: ../pidgin/gtkprefs.c:1324
+msgid "Opera"
+msgstr "Opera"
+
+#: ../pidgin/gtkprefs.c:1325
+msgid "Netscape"
+msgstr "Netscape"
+
+#: ../pidgin/gtkprefs.c:1326
+msgid "Mozilla"
+msgstr "Mozilla"
+
+#: ../pidgin/gtkprefs.c:1327
+msgid "Konqueror"
+msgstr "Konqueror"
+
+#: ../pidgin/gtkprefs.c:1328
+msgid "GNOME Default"
+msgstr "GNOMEs standardval"
+
+#: ../pidgin/gtkprefs.c:1329
+msgid "Galeon"
+msgstr "Galeon"
+
+#: ../pidgin/gtkprefs.c:1330
+msgid "Firefox"
+msgstr "Firefox"
+
+#: ../pidgin/gtkprefs.c:1331
+msgid "Firebird"
+msgstr "Firebird"
+
+#: ../pidgin/gtkprefs.c:1332
+msgid "Epiphany"
+msgstr "Epiphany"
+
+#: ../pidgin/gtkprefs.c:1341
+msgid "Manual"
+msgstr "Manuell"
+
+#: ../pidgin/gtkprefs.c:1394
+msgid "Browser Selection"
+msgstr "Val av webbl辰sare"
+
+#: ../pidgin/gtkprefs.c:1398
+msgid "_Browser:"
+msgstr "Webb_l辰sare:"
+
+#: ../pidgin/gtkprefs.c:1406
+msgid "_Open link in:"
+msgstr "_�ppna l辰nk i:"
+
+#: ../pidgin/gtkprefs.c:1408
+msgid "Browser default"
+msgstr "F旦rvald webbl辰sare"
+
+#: ../pidgin/gtkprefs.c:1409
+msgid "Existing window"
+msgstr "Befintligt f旦nster"
+
+#: ../pidgin/gtkprefs.c:1411
+msgid "New tab"
+msgstr "Ny flik"
+
+#: ../pidgin/gtkprefs.c:1425
+#, c-format
+msgid ""
+"_Manual:\n"
+"(%s for URL)"
+msgstr ""
+"_Manuell:\n"
+"(%s f旦r URL)"
+
+#: ../pidgin/gtkprefs.c:1465
+msgid "Log _format:"
+msgstr "Logg _format:"
+
+#: ../pidgin/gtkprefs.c:1470
+msgid "Log all _instant messages"
+msgstr "_Logga alla snabbmeddelanden"
+
+#: ../pidgin/gtkprefs.c:1472
+msgid "Log all c_hats"
+msgstr "Logga alla _chattar"
+
+#: ../pidgin/gtkprefs.c:1474
+msgid "Log all _status changes to system log"
+msgstr "Logga alla _statusf旦r辰ndringar till systemloggen"
+
+#: ../pidgin/gtkprefs.c:1582 ../pidgin/gtkprefs.c:1671
+#: ../pidgin/gtkprefs.c:1865
+msgid "(default)"
+msgstr "(f旦rval)"
+
+#: ../pidgin/gtkprefs.c:1620
+msgid "Sound Selection"
+msgstr "Ljudval"
+
+#: ../pidgin/gtkprefs.c:1630
+msgid "Quietest"
+msgstr "Tystast"
+
+#: ../pidgin/gtkprefs.c:1632
+msgid "Quieter"
+msgstr "Tystare"
+
+#: ../pidgin/gtkprefs.c:1634
+msgid "Quiet"
+msgstr "Tyst"
+
+#: ../pidgin/gtkprefs.c:1638
+msgid "Loud"
+msgstr "H旦gt"
+
+#: ../pidgin/gtkprefs.c:1640
+msgid "Louder"
+msgstr "H旦gre"
+
+#: ../pidgin/gtkprefs.c:1642
+msgid "Loudest"
+msgstr "H旦gst"
+
+#: ../pidgin/gtkprefs.c:1705
+msgid "Sound Method"
+msgstr "Ljudmetod"
+
+#: ../pidgin/gtkprefs.c:1706
+msgid "_Method:"
+msgstr "_Metod:"
+
+#: ../pidgin/gtkprefs.c:1708
+msgid "Console beep"
+msgstr "Konsolpip"
+
+#: ../pidgin/gtkprefs.c:1710
+msgid "Automatic"
+msgstr "Automatisk"
+
+#: ../pidgin/gtkprefs.c:1714
+msgid "Command"
+msgstr "Kommando"
+
+#: ../pidgin/gtkprefs.c:1715
+msgid "No sounds"
+msgstr "Inga ljud"
+
+#: ../pidgin/gtkprefs.c:1723
+#, c-format
+msgid ""
+"Sound c_ommand:\n"
+"(%s for filename)"
+msgstr ""
+"Ljud_kommando:\n"
+"(%s f旦r filnamn)"
+
+#: ../pidgin/gtkprefs.c:1749
+msgid "Sound Options"
+msgstr "Ljudalternativ"
+
+#: ../pidgin/gtkprefs.c:1750
+msgid "Sounds when conversation has _focus"
+msgstr "Ljud n辰r konversationsf旦nstret har _fokus"
+
+#: ../pidgin/gtkprefs.c:1752
+msgid "Enable sounds:"
+msgstr "Aktivera ljud:"
+
+#: ../pidgin/gtkprefs.c:1754
+msgid "Only when available"
+msgstr "Endast vid tillg辰nglig"
+
+#: ../pidgin/gtkprefs.c:1755
+msgid "Only when not available"
+msgstr "Edast vid Ej tillg辰nglig"
+
+#: ../pidgin/gtkprefs.c:1763
+msgid "Volume:"
+msgstr "Volum:"
+
+#: ../pidgin/gtkprefs.c:1791
+msgid "Sound Events"
+msgstr "Ljudh辰ndelser"
+
+#: ../pidgin/gtkprefs.c:1843
+msgid "Play"
+msgstr "Spela upp"
+
+#: ../pidgin/gtkprefs.c:1850
+msgid "Event"
+msgstr "H辰ndelse"
+
+#: ../pidgin/gtkprefs.c:1869
+msgid "Test"
+msgstr "Test"
+
+#: ../pidgin/gtkprefs.c:1873
+msgid "Reset"
+msgstr "�terst辰ll"
+
+#: ../pidgin/gtkprefs.c:1877
+msgid "Choose..."
+msgstr "V辰lj..."
+
+#: ../pidgin/gtkprefs.c:1920
+msgid "_Report idle time:"
+msgstr "_Rapportera inaktivitetstid:"
+
+#: ../pidgin/gtkprefs.c:1925
+msgid "Based on keyboard or mouse use"
+msgstr "Baserat p奪 tangetbord eller musanv辰ndning"
+
+#: ../pidgin/gtkprefs.c:1934
+msgid "_Auto-reply:"
+msgstr "_Automatiskt svar:"
+
+#: ../pidgin/gtkprefs.c:1938
+msgid "When both away and idle"
+msgstr "Vid b奪de fr奪nvaro och inaktivitet"
+
+#. Auto-away stuff
+#: ../pidgin/gtkprefs.c:1944
+msgid "Auto-away"
+msgstr "Automatisk fr奪nvaro"
+
+#: ../pidgin/gtkprefs.c:1946
+msgid "Change status when _idle"
+msgstr "�ndra status vid _inaktivitet"
+
+#: ../pidgin/gtkprefs.c:1950
+msgid "_Minutes before changing status:"
+msgstr "_Minuter innan status ska 辰ndras:"
+
+#: ../pidgin/gtkprefs.c:1958
+msgid "Change _status to:"
+msgstr "�ndra _status till:"
+
+#. Signon status stuff
+#: ../pidgin/gtkprefs.c:1979
+msgid "Status at Startup"
+msgstr "Status vid uppstart"
+
+#: ../pidgin/gtkprefs.c:1981
+msgid "Use status from last _exit at startup"
+msgstr "A_nv辰nd samma status som vid senaste avslutet"
+
+#: ../pidgin/gtkprefs.c:1987
+msgid "Status to a_pply at startup:"
+msgstr "Status att anv辰nda vid u_ppstart:"
+
+#: ../pidgin/gtkprefs.c:2025
+msgid "Interface"
+msgstr "Gr辰nssnitt"
+
+#: ../pidgin/gtkprefs.c:2027
+msgid "Smiley Themes"
+msgstr "Smileyteman"
+
+#: ../pidgin/gtkprefs.c:2028
+msgid "Sounds"
+msgstr "Ljud"
+
+#: ../pidgin/gtkprefs.c:2034
+msgid "Browser"
+msgstr "Webbl辰sare"
+
+#: ../pidgin/gtkprefs.c:2038
+msgid "Status / Idle"
+msgstr "Status / Inaktiv"
+
+#: ../pidgin/gtkprivacy.c:79
+msgid "Allow all users to contact me"
+msgstr "Till奪t alla anv辰ndare att kontakta mig"
+
+#: ../pidgin/gtkprivacy.c:80
+msgid "Allow only the users on my buddy list"
+msgstr "Till奪t endast anv辰ndarna i min kompislista"
+
+#: ../pidgin/gtkprivacy.c:81
+msgid "Allow only the users below"
+msgstr "Till奪t endast anv辰ndarna nedan"
+
+#: ../pidgin/gtkprivacy.c:82
+msgid "Block all users"
+msgstr "Blockera alla anv辰ndare"
+
+#: ../pidgin/gtkprivacy.c:83
+msgid "Block only the users below"
+msgstr "Blockera endast anv辰ndarna nedan"
+
+#: ../pidgin/gtkprivacy.c:369
+msgid "Privacy"
+msgstr "Sp辰rrlista"
+
+#: ../pidgin/gtkprivacy.c:381
+msgid "Changes to privacy settings take effect immediately."
+msgstr "�ndringar i sp辰rrlistans inst辰llningar b旦rjar g辰lla direkt."
+
+#. "Set privacy for:" label
+#: ../pidgin/gtkprivacy.c:393
+msgid "Set privacy for:"
+msgstr "St辰ll in sp辰rrlista f旦r:"
+
+#: ../pidgin/gtkprivacy.c:556 ../pidgin/gtkprivacy.c:573
+msgid "Permit User"
+msgstr "Till奪t anv辰ndare"
+
+#: ../pidgin/gtkprivacy.c:557
+msgid "Type a user you permit to contact you."
+msgstr "Ange en anv辰ndare du till奪ter att kontakta dig."
+
+#: ../pidgin/gtkprivacy.c:558
+msgid "Please enter the name of the user you wish to be able to contact you."
+msgstr "Ange namnet p奪 den anv辰ndare du vill ska kunna kontakta dig."
+
+#: ../pidgin/gtkprivacy.c:561 ../pidgin/gtkprivacy.c:577
+msgid "_Permit"
+msgstr "_Till奪t"
+
+#: ../pidgin/gtkprivacy.c:567
+#, c-format
+msgid "Allow %s to contact you?"
+msgstr "Till奪t %s att kontakta dig?"
+
+#: ../pidgin/gtkprivacy.c:569
+#, c-format
+msgid "Are you sure you wish to allow %s to contact you?"
+msgstr "�r du s辰ker p奪 att du vill till奪ta %s att kontakta dig?"
+
+#: ../pidgin/gtkprivacy.c:598 ../pidgin/gtkprivacy.c:612
+msgid "Block User"
+msgstr "Blockera anv辰ndare"
+
+#: ../pidgin/gtkprivacy.c:599
+msgid "Type a user to block."
+msgstr "Ange en anv辰ndare som ska blockeras."
+
+#: ../pidgin/gtkprivacy.c:600
+msgid "Please enter the name of the user you wish to block."
+msgstr "Ange namnet p奪 den anv辰ndare du vill blockera."
+
+#: ../pidgin/gtkprivacy.c:608
+#, c-format
+msgid "Block %s?"
+msgstr "Blockera %s?"
+
+#: ../pidgin/gtkprivacy.c:610
+#, c-format
+msgid "Are you sure you want to block %s?"
+msgstr "�r du s辰ker p奪 att du vill blockera %s?"
+
+#: ../pidgin/gtkrequest.c:271
+msgid "Apply"
+msgstr "Verkst辰ll"
+
+#: ../pidgin/gtkrequest.c:1483
+msgid "That file already exists"
+msgstr "Filen finns redan."
+
+#: ../pidgin/gtkrequest.c:1484
+msgid "Would you like to overwrite it?"
+msgstr "Vill du skriva 旦ver den?"
+
+#: ../pidgin/gtkrequest.c:1487
+msgid "Overwrite"
+msgstr "Skriv 旦ver"
+
+#: ../pidgin/gtkrequest.c:1488
+msgid "Choose New Name"
+msgstr "V辰lj nytt namn"
+
+#: ../pidgin/gtkrequest.c:1626 ../pidgin/gtkrequest.c:1640
+msgid "Select Folder..."
+msgstr "V辰lj katalog..."
+
+# "Rumslista" ist辰llet?
+#. Create the window.
+#: ../pidgin/gtkroomlist.c:374
+msgid "Room List"
+msgstr "Rumlista"
+
+#. list button
+#: ../pidgin/gtkroomlist.c:442
+msgid "_Get List"
+msgstr "_H辰mta lista"
+
+#. add button
+#: ../pidgin/gtkroomlist.c:450
+msgid "_Add Chat"
+msgstr "_L辰gg till chatt"
+
+#: ../pidgin/gtksavedstatuses.c:336
+msgid "Are you sure you want to delete the selected saved statuses?"
+msgstr ""
+"�r du s辰ker p奪 att du vill ta bort den valda sparade statusinst辰llningen?"
+
+#. Use button
+#: ../pidgin/gtksavedstatuses.c:619 ../pidgin/gtksavedstatuses.c:1265
+msgid "_Use"
+msgstr "_Anv辰nd"
+
+#: ../pidgin/gtksavedstatuses.c:779
+msgid "Title already in use.  You must choose a unique title."
+msgstr "Titeln anv辰nds redan. Du m奪ste v辰lja en unik titel."
+
+#: ../pidgin/gtksavedstatuses.c:969
+msgid "Different"
+msgstr "Skillnad"
+
+#: ../pidgin/gtksavedstatuses.c:1158
+msgid "_Title:"
+msgstr "_Titel"
+
+#: ../pidgin/gtksavedstatuses.c:1177 ../pidgin/gtksavedstatuses.c:1494
+msgid "_Status:"
+msgstr "_Status:"
+
+#. Different status message expander
+#: ../pidgin/gtksavedstatuses.c:1209
+msgid "Use a _different status for some accounts"
+msgstr "Anv辰nd en _annan status f旦r vissa konton"
+
+#. Save & Use button
+#: ../pidgin/gtksavedstatuses.c:1273
+msgid "Sa_ve & Use"
+msgstr "Spara & An_v辰nd"
+
+#: ../pidgin/gtksavedstatuses.c:1477
+#, c-format
+msgid "Status for %s"
+msgstr "Status f旦r %s"
+
+#: ../pidgin/gtksound.c:63
+msgid "Buddy logs in"
+msgstr "Kompis loggar in"
+
+#: ../pidgin/gtksound.c:64
+msgid "Buddy logs out"
+msgstr "Kompis loggar ut"
+
+# F旦rs旦ker h奪lla samma tempus som ovan.
+#: ../pidgin/gtksound.c:65
+msgid "Message received"
+msgstr "Meddelande tas emot"
+
+#: ../pidgin/gtksound.c:66
+msgid "Message received begins conversation"
+msgstr "Mottaget meddelande inleder konversation"
+
+#: ../pidgin/gtksound.c:67
+msgid "Message sent"
+msgstr "Meddelande skickas"
+
+#: ../pidgin/gtksound.c:68
+msgid "Person enters chat"
+msgstr "Person g奪r in i chatt"
+
+#: ../pidgin/gtksound.c:69
+msgid "Person leaves chat"
+msgstr "Person l辰mnar chatt"
+
+#: ../pidgin/gtksound.c:70
+msgid "You talk in chat"
+msgstr "Du pratar i chatt"
+
+#: ../pidgin/gtksound.c:71
+msgid "Others talk in chat"
+msgstr "Andra pratar i chatt"
+
+#: ../pidgin/gtksound.c:74
+msgid "Someone says your screen name in chat"
+msgstr "N奪gon n辰mner ditt sk辰rmnamn i en chatt"
+
+#: ../pidgin/gtksound.c:310
+msgid "GStreamer Failure"
+msgstr "GStreamer fel"
+
+#: ../pidgin/gtksound.c:311
+msgid "GStreamer failed to initialize."
+msgstr "GStreamer misslyckades med att initialisera."
+
+#: ../pidgin/gtkstatusbox.c:663
+msgid "Waiting for network connection"
+msgstr "V辰ntar p奪 n辰tverksanslutning."
+
+#: ../pidgin/gtkutils.c:627
+msgid "Google Talk"
+msgstr "Google Talk"
+
+#: ../pidgin/gtkutils.c:1384 ../pidgin/gtkutils.c:1407
+#, c-format
+msgid "The following error has occurred loading %s: %s"
+msgstr "F旦ljande fel skedde vis inl辰sning av %s: %s"
+
+#: ../pidgin/gtkutils.c:1387 ../pidgin/gtkutils.c:1409
+msgid "Failed to load image"
+msgstr "Kunde inte l辰sa in bilden"
+
+#: ../pidgin/gtkutils.c:1483
+#, c-format
+msgid "Cannot send folder %s."
+msgstr "Kan inte skicka mappen %s."
+
+#: ../pidgin/gtkutils.c:1484
+#, c-format
+msgid ""
+"%s cannot transfer a folder. You will need to send the files within "
+"individually."
+msgstr ""
+"%s kan inte 旦verf旦ra en mapp. Du m奪ste skicka filerna inuti den en och en"
+
+#: ../pidgin/gtkutils.c:1516 ../pidgin/gtkutils.c:1528
+#: ../pidgin/gtkutils.c:1535
+msgid "You have dragged an image"
+msgstr "Du har dragit och sl辰ppt en bild"
+
+#: ../pidgin/gtkutils.c:1517
+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 ""
+"Du kan skicka bilden via fil旦verf旦ring, infoga den i detta meddelande, eller "
+"anv辰nda den som kompisikon f旦r denna anv辰ndare."
+
+#: ../pidgin/gtkutils.c:1523 ../pidgin/gtkutils.c:1543
+msgid "Set as buddy icon"
+msgstr "Anv辰nd som kompisikon"
+
+#: ../pidgin/gtkutils.c:1524 ../pidgin/gtkutils.c:1544
+msgid "Send image file"
+msgstr "Skicka bildfil"
+
+#: ../pidgin/gtkutils.c:1525 ../pidgin/gtkutils.c:1544
+msgid "Insert in message"
+msgstr "Infoga i meddelandet"
+
+#: ../pidgin/gtkutils.c:1529
+msgid "Would you like to set it as the buddy icon for this user?"
+msgstr "Vill du anv辰nda den som kompisikon f旦r denna anv辰ndare?"
+
+#: ../pidgin/gtkutils.c:1536
+msgid ""
+"You can send this image as a file transfer, or use it as the buddy icon for "
+"this user."
+msgstr ""
+"Du kan skicka bilden via fil旦verf旦ring eller anv辰nda den som kompisikon f旦r "
+"denna anv辰ndare."
+
+#: ../pidgin/gtkutils.c:1537
+msgid ""
+"You can insert this image into this message, or use it as the buddy icon for "
+"this user"
+msgstr ""
+"Du kan infoga bilden i detta meddelande eller anv辰nda den som kompisikon f旦r "
+"denna anv辰ndare"
+
+#. 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:1595
+msgid "Cannot send launcher"
+msgstr "Kan inte skicka startare"
+
+#: ../pidgin/gtkutils.c:1595
+msgid ""
+"You dragged a desktop launcher. Most likely you wanted to send whatever this "
+"launcher points to instead of this launcher itself."
+msgstr ""
+"Du drog en skrivbordsstartare. Antagligen ville du skicka vad som startaren "
+"pekar p奪 ist辰llet f旦r startaren sj辰lv."
+
+#: ../pidgin/gtkutils.c:2317
+#, c-format
+msgid ""
+"<b>File:</b> %s\n"
+"<b>File size:</b> %s\n"
+"<b>Image size:</b> %dx%d"
+msgstr ""
+"<b>Fil:</b> %s\n"
+"<b>Filstorlek:</b> %s\n"
+"<b>Bildstorlek:</b> %dx%d"
+
+#: ../pidgin/gtkutils.c:2613
+#, c-format
+msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
+msgstr "Filen '%s' 辰r f旦r stor f旦r %s. F旦rs旦k med en mindre bild.\n"
+
+#: ../pidgin/gtkutils.c:2615
+msgid "Icon Error"
+msgstr "Ikonfel"
+
+#: ../pidgin/gtkutils.c:2616
+msgid "Could not set icon"
+msgstr "Kunde inte ange ikon"
+
+#: ../pidgin/gtkutils.c:2716
+#, c-format
+msgid "Failed to open file '%s': %s"
+msgstr "Kunde inte 旦ppna filen '%s': %s"
+
+#: ../pidgin/gtkutils.c:2765
+#, c-format
+msgid ""
+"Failed to load image '%s': reason not known, probably a corrupt image file"
+msgstr ""
+"Kunde inte 旦ppna bilden '%s' av ok辰nd anledning. Troligtvis 辰r filen trasig."
+
+#: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
+msgid "Save File"
+msgstr "Spara fil"
+
+#: ../pidgin/gtkwhiteboard.c:861
+msgid "Select color"
+msgstr "V辰lj f辰rg"
+
+#: ../pidgin/pidginstock.c:81
+msgid "_Alias"
+msgstr "_Alias"
+
+#: ../pidgin/pidginstock.c:83
+msgid "Close _tabs"
+msgstr "St辰ng _flik"
+
+#: ../pidgin/pidginstock.c:85
+msgid "_Get Info"
+msgstr "H辰mta _info"
+
+#: ../pidgin/pidginstock.c:86
+msgid "_Invite"
+msgstr "Bjud _in"
+
+#: ../pidgin/pidginstock.c:87
+msgid "_Modify"
+msgstr "_�ndra"
+
+#: ../pidgin/pidginstock.c:88
+msgid "_Open Mail"
+msgstr "_�ppna brev"
+
+#: ../pidgin/pixmaps/emotes/default/22/default.theme.in.h:2
+msgid "Pidgin smileys"
+msgstr "Pidgin smileys"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:1
+msgid "Penguin Pimps"
+msgstr "Penguin Pimps"
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:2
+msgid "Selecting this disables graphical emoticons."
+msgstr "V辰lj detta f旦r att avaktivera grafiska emoticons."
+
+#: ../pidgin/pixmaps/emotes/none/none.theme.in.h:3
+msgid "none"
+msgstr "ingen"
+
+#: ../pidgin/plugins/cap/cap.c:449
+msgid "Display Statistics"
+msgstr "Visa statestik"
+
+#: ../pidgin/plugins/cap/cap.c:461 ../pidgin/plugins/cap/cap.c:464
+msgid "Response Probability:"
+msgstr "Trolighet f旦r svar:"
+
+#: ../pidgin/plugins/cap/cap.c:810
+msgid "Statistics Configuration"
+msgstr "Statestikkonfigurering"
+
+#. msg_difference spinner
+#: ../pidgin/plugins/cap/cap.c:813
+msgid "Maximum response timeout:"
+msgstr "Maximal svarsv辰ntetid:"
+
+#: ../pidgin/plugins/cap/cap.c:816 ../pidgin/plugins/cap/cap.c:823
+#: ../pidgin/plugins/cap/cap.c:830 ../pidgin/plugins/timestamp.c:150
+msgid "minutes"
+msgstr "minuter"
+
+#. last_seen spinner
+#: ../pidgin/plugins/cap/cap.c:820
+msgid "Maximum last-seen difference:"
+msgstr "Maximal senast sedd-skillnad:"
+
+#. threshold spinner
+#: ../pidgin/plugins/cap/cap.c:827
+msgid "Threshold:"
+msgstr "Tr旦skel:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/cap/cap.c:935
+msgid "Contact Availability Prediction"
+msgstr "F旦rutsp奪 kontakters tillg辰nglighet"
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/cap/cap.c:937
+msgid "Contact Availability Prediction plugin."
+msgstr "Modul f旦r f旦rutsp奪 kontaktens tillg辰nglighet"
+
+#. *  summary
+#: ../pidgin/plugins/cap/cap.c:938
+msgid ""
+"The contact availability plugin (cap) is used to display statistical "
+"information about buddies in a users contact list."
+msgstr ""
+"Modulen f旦r f旦rutsp奪 kontaktens tillg辰nglighet anv辰nds f旦r att visa "
+"statistisk information f旦r en kompis i anv辰ndarens kontaktlistan."
+
+#: ../pidgin/plugins/contact_priority.c:61
+msgid "Buddy is idle"
+msgstr "Kompisen 辰r inaktiv"
+
+#: ../pidgin/plugins/contact_priority.c:62
+msgid "Buddy is away"
+msgstr "Kompisen 辰r fr奪nvarande"
+
+#: ../pidgin/plugins/contact_priority.c:63
+msgid "Buddy is \"extended\" away"
+msgstr "Kompisen 辰r \"ut旦kat\" fr奪nvarande"
+
+#. Not used yet.
+#: ../pidgin/plugins/contact_priority.c:66
+msgid "Buddy is mobile"
+msgstr "Kompisen 辰r mobil"
+
+#: ../pidgin/plugins/contact_priority.c:68
+msgid "Buddy is offline"
+msgstr "Kompisen 辰r fr奪nkopplad"
+
+#: ../pidgin/plugins/contact_priority.c:90
+msgid "Point values to use when..."
+msgstr "Po辰ngv辰rden att anv辰nda n辰r..."
+
+#: ../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 ""
+"Kompisen med den <i>st旦rsta po辰ngen</i> 辰r den kompisen som kommer ha "
+"prioritet i kontakten.\n"
+
+#: ../pidgin/plugins/contact_priority.c:125
+msgid "Use last buddy when scores are equal"
+msgstr "Anv辰nd senaste kompisen d奪 po辰ngen 辰r samma"
+
+#: ../pidgin/plugins/contact_priority.c:130
+msgid "Point values to use for account..."
+msgstr "Po辰ngv辰rden att anv辰nda f旦r konto..."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/contact_priority.c:187
+msgid "Contact Priority"
+msgstr "Kontaktprioritet"
+
+#. *< name
+#. *< version
+#. *< summary
+#: ../pidgin/plugins/contact_priority.c:190
+msgid ""
+"Allows for controlling the values associated with different buddy states."
+msgstr ""
+"Ger m旦jlighet att kontrollera v辰rdena associerade med olika kompisstatusar."
+
+#. *< description
+#: ../pidgin/plugins/contact_priority.c:192
+msgid ""
+"Allows for changing the point values of idle/away/offline states for buddies "
+"in contact priority computations."
+msgstr ""
+"Ger m旦jlighet att 辰ndra po辰ngv辰rdena p奪 inaktiv/fr奪nvarande/utloggad-status "
+"f旦r kompisar som konkurerar om kontaktprioritet."
+
+#: ../pidgin/plugins/convcolors.c:23
+msgid "Conversation Colors"
+msgstr "Konversationsf辰rger"
+
+#: ../pidgin/plugins/convcolors.c:25 ../pidgin/plugins/convcolors.c:26
+msgid "Customize colors in the conversation window"
+msgstr "�ndra f辰rgerna konversationsf旦nstret"
+
+#: ../pidgin/plugins/convcolors.c:82
+msgid "Error Messages"
+msgstr "Felmeddeladen"
+
+#: ../pidgin/plugins/convcolors.c:83
+msgid "Highlighted Messages"
+msgstr "Markerade tr辰ffar"
+
+#: ../pidgin/plugins/convcolors.c:84
+msgid "System Messages"
+msgstr "Systemmeddelanden"
+
+#: ../pidgin/plugins/convcolors.c:85
+msgid "Sent Messages"
+msgstr "Skickade meddelande"
+
+#: ../pidgin/plugins/convcolors.c:86
+msgid "Received Messages"
+msgstr "Mottagna meddelande"
+
+#: ../pidgin/plugins/convcolors.c:210 ../pidgin/plugins/pidginrc.c:251
+#, c-format
+msgid "Select Color for %s"
+msgstr "V辰lj f辰rg f旦r %s"
+
+#: ../pidgin/plugins/convcolors.c:287
+msgid "Bold"
+msgstr "Fet"
+
+#: ../pidgin/plugins/convcolors.c:294
+msgid "Italic"
+msgstr "Kursiv"
+
+#: ../pidgin/plugins/convcolors.c:301
+msgid "Underline"
+msgstr "Understruken"
+
+#: ../pidgin/plugins/convcolors.c:310
+msgid "Ignore incoming format"
+msgstr "Ignorera inkommande format"
+
+#: ../pidgin/plugins/convcolors.c:311
+msgid "Apply in Chats"
+msgstr "Verkst辰ll i Chatter"
+
+#: ../pidgin/plugins/convcolors.c:312
+msgid "Apply in IMs"
+msgstr "Verkst辰ll i IMs"
+
+#: ../pidgin/plugins/extplacement.c:80
+msgid "By conversation count"
+msgstr "Efter konversationsantal"
+
+#: ../pidgin/plugins/extplacement.c:101
+msgid "Conversation Placement"
+msgstr "Konversationsplacering"
+
+#. Translators: "New conversations" should match the text in the preferences dialog and "By conversation count" should be the same text used above
+#: ../pidgin/plugins/extplacement.c:105
+msgid ""
+"Note: The preference for \"New conversations\" must be set to \"By "
+"conversation count\"."
+msgstr ""
+"Observera: Inst辰llningen f旦r \"Nya konversationer\" m奪ste vara \"Efter "
+"konversationsantal\"."
+
+#: ../pidgin/plugins/extplacement.c:111
+msgid "Number of conversations per window"
+msgstr "Antal konversationer per f旦nster"
+
+#: ../pidgin/plugins/extplacement.c:117
+msgid "Separate IM and Chat windows when placing by number"
+msgstr "Separera snabbmeddelande- och chattf旦nster n辰r placerade efter nummer"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/extplacement.c:146
+msgid "ExtPlacement"
+msgstr "ExtPlacement"
+
+#. *< name
+#. *< version
+#: ../pidgin/plugins/extplacement.c:148
+msgid "Extra conversation placement options."
+msgstr "Extra konversationsplaceringsm旦jligheter."
+
+#. *< summary
+#. *  description
+#: ../pidgin/plugins/extplacement.c:150
+msgid ""
+"Restrict the number of conversations per windows, optionally separating IMs "
+"and Chats"
+msgstr ""
+"Begr辰nsa antalet konversationer per f旦nster med m旦jlighet att separera "
+"snabbmeddelanden och chattar"
+
+#. Configuration frame
+#: ../pidgin/plugins/gestures/gestures.c:235
+msgid "Mouse Gestures Configuration"
+msgstr "Konfiguration av musgester"
+
+#: ../pidgin/plugins/gestures/gestures.c:242
+msgid "Middle mouse button"
+msgstr "Mittenmusknapp"
+
+#: ../pidgin/plugins/gestures/gestures.c:247
+msgid "Right mouse button"
+msgstr "H旦ger musknapp"
+
+#. "Visual gesture display" checkbox
+#: ../pidgin/plugins/gestures/gestures.c:259
+msgid "_Visual gesture display"
+msgstr "_Visuell gestvisning"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gestures/gestures.c:295
+msgid "Mouse Gestures"
+msgstr "Musgester"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/gestures/gestures.c:298
+msgid "Provides support for mouse gestures"
+msgstr "G旦r det m旦jligt att anv辰nda musgester"
+
+#. *  description
+#: ../pidgin/plugins/gestures/gestures.c:300
+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 ""
+"G旦r det m旦jligt att anv辰nda musgester i konversationsf旦nster.\n"
+"Dra musen med mittersta knappen nedtryckt f旦r att ge olika kommandon:\n"
+"\n"
+"Dra ner och sedan till h旦ger f旦r att st辰nga konversationen.\n"
+"Dra upp och sedan till v辰nster f旦r att byta till f旦reg奪ende konversation.\n"
+"Dra upp och sedan till h旦ger f旦r att byta till n辰sta konversation."
+
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:143
+msgid "Instant Messaging"
+msgstr "Snabbmeddelanden"
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:457
+msgid "Select a person from your address book below, or add a new person."
+msgstr "V辰lj en person fr奪n din adressbok nedan eller l辰gg till en ny person."
+
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:551
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:303
+msgid "Group:"
+msgstr "Grupp:"
+
+#. "New Person" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:577
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:249
+msgid "New Person"
+msgstr "Ny person"
+
+#. "Select Buddy" button
+#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:594
+msgid "Select Buddy"
+msgstr "V辰lj kompis"
+
+#. Add the label.
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:343
+msgid ""
+"Select a person from your address book to add this buddy to, or create a new "
+"person."
+msgstr ""
+"V辰lj en person ur adressboken som du vill l辰gga till denna kompis till eller "
+"skapa en ny person."
+
+#. Add the expander
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:431
+msgid "User _details"
+msgstr "_Anv辰ndarinformation"
+
+#. "Associate Buddy" button
+#: ../pidgin/plugins/gevolution/assoc-buddy.c:484
+msgid "_Associate Buddy"
+msgstr "_Associera kompis"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:240
+#: ../pidgin/plugins/gevolution/gevolution.c:246
+msgid "Unable to send e-mail"
+msgstr "Kunde inte skicka e-post"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:241
+msgid "The evolution executable was not found in the PATH."
+msgstr "Evolutions k旦rfil hittades inte i s旦kv辰garna."
+
+#: ../pidgin/plugins/gevolution/gevolution.c:247
+msgid "An e-mail address was not found for this buddy."
+msgstr "Ingen epostadress hittades f旦r denna kompisen."
+
+#: ../pidgin/plugins/gevolution/gevolution.c:273
+msgid "Add to Address Book"
+msgstr "L辰gg till i adressboken"
+
+#: ../pidgin/plugins/gevolution/gevolution.c:285
+msgid "Send E-Mail"
+msgstr "Skicka e-post"
+
+#. Configuration frame
+#: ../pidgin/plugins/gevolution/gevolution.c:412
+msgid "Evolution Integration Configuration"
+msgstr "Konfigurering av integrering med Evolution"
+
+#. Label
+#: ../pidgin/plugins/gevolution/gevolution.c:415
+msgid "Select all accounts that buddies should be auto-added to."
+msgstr "V辰lj alla konton som kompisar automatiskt ska l辰ggas till i."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gevolution/gevolution.c:527
+msgid "Evolution Integration"
+msgstr "Integrering med Evolution"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/gevolution/gevolution.c:530
+#: ../pidgin/plugins/gevolution/gevolution.c:532
+msgid "Provides integration with Evolution."
+msgstr "Erbjuder integration med Evolution."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:263
+msgid "Please enter the person's information below."
+msgstr "Ange personens information nedan."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:267
+msgid "Please enter the buddy's screen name and account type below."
+msgstr "Ange kompisens Anv辰ndar-ID och kontotyp nedan."
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:287
+msgid "Account type:"
+msgstr "Kontotyp:"
+
+#. Optional Information section
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:311
+msgid "Optional information:"
+msgstr "Frivillig information:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:346
+msgid "First name:"
+msgstr "F旦rnamn:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:358
+msgid "Last name:"
+msgstr "Efternamn:"
+
+#: ../pidgin/plugins/gevolution/new_person_dialog.c:378
+msgid "E-mail:"
+msgstr "E-postadress:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/gtk-signals-test.c:160
+msgid "GTK Signals Test"
+msgstr "GTK Signaltest"
+
+#. *< 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 "Test f旦r att avg旦ra om alla ui signaler fungerar korrekt."
+
+#: ../pidgin/plugins/history.c:188
+msgid "History"
+msgstr "Historik"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/iconaway.c:82
+msgid "Iconify on Away"
+msgstr "Ikonifiera vid fr奪nvarande"
+
+#. *< 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 ""
+"G旦r din kompislista och dina konversationer till en ikon n辰r du 辰r "
+"fr奪nvarande."
+
+#: ../pidgin/plugins/mailchk.c:160
+msgid "Mail Checker"
+msgstr "E-post-kollare"
+
+#: ../pidgin/plugins/mailchk.c:162
+msgid "Checks for new local mail."
+msgstr "Kollar efter ny lokal e-post."
+
+#: ../pidgin/plugins/mailchk.c:163
+msgid "Adds a small box to the buddy list that shows if you have new mail."
+msgstr ""
+"L辰gger till en liten ruta till kompislistan som visar om du f奪tt ny e-post."
+
+#: ../pidgin/plugins/markerline.c:23
+msgid "Markerline"
+msgstr "Markeringslinje"
+
+#: ../pidgin/plugins/markerline.c:25 ../pidgin/plugins/markerline.c:26
+msgid "Draw a line to indicate new messages in a conversation."
+msgstr "Rita en linje f旦r att indikera nya meddelanden i en konversation."
+
+#: ../pidgin/plugins/markerline.c:246
+msgid "Draw Markerline in "
+msgstr "Rita markeringlinje i "
+
+#: ../pidgin/plugins/markerline.c:250 ../pidgin/plugins/notify.c:676
+msgid "_IM windows"
+msgstr "_Snabbmeddelandef旦nster"
+
+#: ../pidgin/plugins/markerline.c:254 ../pidgin/plugins/notify.c:683
+msgid "C_hat windows"
+msgstr "_Chattf旦nster"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:44
+msgid ""
+"A music messaging session has been requested. Please click the MM icon to "
+"accept."
+msgstr ""
+"En music messaging session har efterfr奪gats. Var god tryck p奪 MM-ikonen f旦r "
+"att acceptera."
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:45
+msgid "Music messaging session confirmed."
+msgstr "Music messaging session bekr辰ftad."
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:419
+msgid "Music Messaging"
+msgstr "Music Messaging"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:420
+msgid "There was a conflict in running the command:"
+msgstr "Det var en konflikt i k旦rning av kommandot:"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:528
+msgid "Error Running Editor"
+msgstr "Fel vid k旦rning av editor"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:529
+msgid "The following error has occurred:"
+msgstr "F旦ljande fel har intr辰ffat:"
+
+#. Configuration frame
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:628
+msgid "Music Messaging Configuration"
+msgstr "Music Messaging konfiguration"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:632
+msgid "Score Editor Path"
+msgstr "S旦kv辰g f旦r redigerare av notblad"
+
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:633
+msgid "_Apply"
+msgstr "_Aktivera"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:674
+msgid "Music Messaging Plugin for collaborative composition."
+msgstr "Music Messaging-modul f旦r gemensam komponering."
+
+#. *  summary
+#: ../pidgin/plugins/musicmessaging/musicmessaging.c:676
+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 ""
+"Music Messaging-modulen till奪ter ett antal anv辰ndare att samtidigt arbeta p奪 "
+"ett stycke musik genom att editera ett gemensamt notblad i realtid."
+
+#. ---------- "Notify For" ----------
+#: ../pidgin/plugins/notify.c:672
+msgid "Notify For"
+msgstr "Rapportera i"
+
+#: ../pidgin/plugins/notify.c:691
+msgid "\t_Only when someone says your screen name"
+msgstr "\tBara d奪 n奪g_on n辰mner ditt sk辰rmnamn"
+
+#: ../pidgin/plugins/notify.c:701
+msgid "_Focused windows"
+msgstr "_Fokuserade f旦nster"
+
+#. ---------- "Notification Methods" ----------
+#: ../pidgin/plugins/notify.c:709
+msgid "Notification Methods"
+msgstr "Rapporteringsmetod"
+
+# L辰gg m辰rke till att det st奪r "prepend".
+#: ../pidgin/plugins/notify.c:716
+msgid "Prepend _string into window title:"
+msgstr "L辰gg till _str辰ng i b旦rjan av f旦nstertiteln:"
+
+#. Count method button
+#: ../pidgin/plugins/notify.c:735
+msgid "Insert c_ount of new messages into window title"
+msgstr "L辰gg till en _r辰knare f旦r nya meddelanden i f旦nstrens titel"
+
+#. Count xprop method button
+#: ../pidgin/plugins/notify.c:744
+msgid "Insert count of new message into _X property"
+msgstr "L辰gg till meddelander辰knare i _X"
+
+#. Urgent method button
+#: ../pidgin/plugins/notify.c:752
+msgid "Set window manager \"_URGENT\" hint"
+msgstr "S辰tt f旦nsterhanterarens \"_URGENT\"-ledtr奪d"
+
+#. Raise window method button
+#: ../pidgin/plugins/notify.c:761
+msgid "R_aise conversation window"
+msgstr "_Fokusera konversationsf旦nstret"
+
+#. ---------- "Notification Removals" ----------
+#: ../pidgin/plugins/notify.c:769
+msgid "Notification Removal"
+msgstr "Ta bort rapportering"
+
+#. Remove on focus button
+#: ../pidgin/plugins/notify.c:774
+msgid "Remove when conversation window _gains focus"
+msgstr "Ta bort n辰r konversationsf旦nstret f奪r _fokus"
+
+#. Remove on click button
+#: ../pidgin/plugins/notify.c:781
+msgid "Remove when conversation window _receives click"
+msgstr "Ta bort n辰r konversationsf旦nstret blir _klickat"
+
+#. Remove on type button
+#: ../pidgin/plugins/notify.c:789
+msgid "Remove when _typing in conversation window"
+msgstr "Ta bort n辰r man _skriver i konversationsf旦nstret"
+
+#. Remove on message send button
+#: ../pidgin/plugins/notify.c:797
+msgid "Remove when a _message gets sent"
+msgstr "Ta bort n辰r ett _meddelande skickas"
+
+#. Remove on conversation switch button
+#: ../pidgin/plugins/notify.c:806
+msgid "Remove on switch to conversation ta_b"
+msgstr "Ta _bort vid byte till konversationsflik"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/notify.c:901
+msgid "Message Notification"
+msgstr "Meddelanderapportering"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/notify.c:904 ../pidgin/plugins/notify.c:906
+msgid "Provides a variety of ways of notifying you of unread messages."
+msgstr "Erbjuder ett antal olika s辰tt att f奪 rapporter om ol辰sta meddelanden."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/pidgininc.c:91
+msgid "Pidgin Demonstration Plugin"
+msgstr "Pidgin demonstrationsinsticksmodul"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/pidgininc.c:94
+msgid "An example plugin that does stuff - see the description."
+msgstr "Ett exempel p奪 insticksmodul som g旦r saker, se beskrivning."
+
+#. *  description
+#: ../pidgin/plugins/pidgininc.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 ""
+"Det h辰r 辰r en riktigt h辰ftig insticksmodul som g旦r en massa saker:\n"
+"- Den visar vem som skrivit programmet n辰r du loggar in\n"
+"- Den v辰nder p奪 all text som kommer in\n"
+"- Den s辰nder ett meddelande till personerna p奪 din kompislista direkt n辰r du "
+"loggar in"
+
+#: ../pidgin/plugins/pidginrc.c:41
+msgid "Cursor Color"
+msgstr "F辰rg p奪 mark旦ren"
+
+#: ../pidgin/plugins/pidginrc.c:42
+msgid "Secondary Cursor Color"
+msgstr "Sekund辰r f辰rg p奪 mark旦ren"
+
+#: ../pidgin/plugins/pidginrc.c:43
+msgid "Hyperlink Color"
+msgstr "F辰rg p奪 l辰nkar"
+
+#: ../pidgin/plugins/pidginrc.c:54
+msgid "GtkTreeView Horizontal Separation"
+msgstr "GtkTreeView horisontal separation"
+
+#: ../pidgin/plugins/pidginrc.c:73
+msgid "Conversation Entry"
+msgstr "Konversationsinl辰gg"
+
+#: ../pidgin/plugins/pidginrc.c:74
+msgid "Conversation History"
+msgstr "Konversationshistorik"
+
+#: ../pidgin/plugins/pidginrc.c:75
+msgid "Log Viewer"
+msgstr "Loggvisare"
+
+#: ../pidgin/plugins/pidginrc.c:76
+msgid "Request Dialog"
+msgstr "F旦rfr奪gningsdialog"
+
+#: ../pidgin/plugins/pidginrc.c:77
+msgid "Notify Dialog"
+msgstr "Rapporteringsdialog"
+
+#: ../pidgin/plugins/pidginrc.c:253
+msgid "Select Color"
+msgstr "V辰lj f辰rg"
+
+#: ../pidgin/plugins/pidginrc.c:300
+msgid "Select Interface Font"
+msgstr "V辰lj typsnitt f旦r gr辰nssnittet"
+
+#: ../pidgin/plugins/pidginrc.c:303
+#, c-format
+msgid "Select Font for %s"
+msgstr "V辰lj typsnitt f旦r %s"
+
+#: ../pidgin/plugins/pidginrc.c:371
+msgid "GTK+ Interface Font"
+msgstr "GTK+ Gr辰nssnittstypsnitt"
+
+#: ../pidgin/plugins/pidginrc.c:391
+msgid "GTK+ Text Shortcut Theme"
+msgstr "GTK+ Textgenv辰gstema"
+
+#.
+#. for (i = 0; i < G_N_ELEMENTS(widget_bool_prefs); i++) {
+#. hbox = gtk_hbox_new(FALSE, PIDGIN_HIG_CAT_SPACE);
+#. gtk_box_pack_start(GTK_BOX(frame), hbox, FALSE, FALSE, 0);
+#.
+#. check = pidgin_prefs_checkbox(_(widget_bool_names[i]),
+#. widget_bool_prefs_set[i], hbox);
+#. gtk_size_group_add_widget(labelsg, check);
+#.
+#. widget_bool_widgets[i] = pidgin_prefs_checkbox("", widget_bool_prefs[i], hbox);
+#. *
+#. gtk_size_group_add_widget(widgetsb, widget_bool_widgets[i]);
+#. *
+#. gtk_widget_set_sensitive(widget_bool_widgets[i],
+#. purple_prefs_get_bool(widget_bool_prefs_set[i]));
+#. g_signal_connect(G_OBJECT(check), "toggled",
+#. G_CALLBACK(pidgin_toggle_sensitive),
+#. widget_bool_widgets[i]);
+#. }
+#.
+#: ../pidgin/plugins/pidginrc.c:428
+msgid "Interface colors"
+msgstr "Gr辰nssnittsf辰rger"
+
+# Os辰ker: Finns smidigare l旦sning?
+#: ../pidgin/plugins/pidginrc.c:452
+msgid "Widget Sizes"
+msgstr "Storlek p奪 grafiska element"
+
+#: ../pidgin/plugins/pidginrc.c:473
+msgid "Fonts"
+msgstr "Typsnitt"
+
+#: ../pidgin/plugins/pidginrc.c:497
+msgid "Gtkrc File Tools"
+msgstr "Gtkrc filverktyg"
+
+#: ../pidgin/plugins/pidginrc.c:502
+#, c-format
+msgid "Write settings to %s%sgtkrc-2.0"
+msgstr "Skriv inst辰llningar till %s%sgtkrc-2.0"
+
+#: ../pidgin/plugins/pidginrc.c:511
+msgid "Re-read gtkrc files"
+msgstr "L辰s om gtkrc-filer"
+
+#: ../pidgin/plugins/pidginrc.c:544
+msgid "Pidgin GTK+ Theme Control"
+msgstr "Pidgin GTK+ temakontroll"
+
+#: ../pidgin/plugins/pidginrc.c:546 ../pidgin/plugins/pidginrc.c:547
+msgid "Provides access to commonly used gtkrc settings."
+msgstr "Ger tillg奪ng till ofta anv辰nda gtkrc-inst辰llningar."
+
+#: ../pidgin/plugins/raw.c:175
+msgid "Raw"
+msgstr "R奪"
+
+#: ../pidgin/plugins/raw.c:177
+msgid "Lets you send raw input to text-based protocols."
+msgstr "L奪ter dig skicka r奪 indata till textbaserade protokoll."
+
+#: ../pidgin/plugins/raw.c:178
+msgid ""
+"Lets you send raw input to text-based protocols (XMPP, MSN, IRC, TOC). Hit "
+"'Enter' in the entry box to send. Watch the debug window."
+msgstr ""
+"L奪ter dig skicka r奪 indata till textbaserade protokoll (XMPP, MSN, IRC, "
+"TOC). Tryck 'Enter' i inmatningsrutan f旦r att skicka. Titta i "
+"fels旦kningsf旦nstret."
+
+#: ../pidgin/plugins/relnot.c:71
+#, c-format
+msgid ""
+"You are using %s version %s.  The current version is %s.  You can get it "
+"from <a href=\"%s\">%s</a><hr>"
+msgstr ""
+"Du anv辰nder version %s av %s. Den aktuella versionen 辰r %s. Du kan h辰mta den "
+"fr奪n <a href=\"%s\">%s</a><hr>"
+
+#: ../pidgin/plugins/relnot.c:79
+#, c-format
+msgid "<b>ChangeLog:</b><br>%s"
+msgstr "<b>F旦r辰ndringslogg:</b><br>%s"
+
+#: ../pidgin/plugins/relnot.c:84 ../pidgin/plugins/relnot.c:85
+msgid "New Version Available"
+msgstr "Ny version tillg辰nglig"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/relnot.c:143
+msgid "Release Notification"
+msgstr "Meddela om nya versioner"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/relnot.c:146
+msgid "Checks periodically for new releases."
+msgstr "Kontrollerar periodiskt om ny version har sl辰ppts."
+
+#. *  description
+#: ../pidgin/plugins/relnot.c:148
+msgid ""
+"Checks periodically for new releases and notifies the user with the "
+"ChangeLog."
+msgstr ""
+"Kontrollerar periodiskt om ny version har sl辰ppts och rapporterar "
+"f旦r辰ndringsloggen till anv辰ndaren."
+
+#: ../pidgin/plugins/spellchk.c:1962
+msgid "Duplicate Correction"
+msgstr "Dublettkorrigering"
+
+#: ../pidgin/plugins/spellchk.c:1963
+msgid "The specified word already exists in the correction list."
+msgstr "Det angivna ordet finns redan i korrigeringslistan."
+
+#: ../pidgin/plugins/spellchk.c:2177
+msgid "Text Replacements"
+msgstr "Texters辰ttningar"
+
+#: ../pidgin/plugins/spellchk.c:2200
+msgid "You type"
+msgstr "Du skriver"
+
+#: ../pidgin/plugins/spellchk.c:2214
+msgid "You send"
+msgstr "Du skickar"
+
+#: ../pidgin/plugins/spellchk.c:2228
+msgid "Whole words only"
+msgstr "Endast hela ord"
+
+#: ../pidgin/plugins/spellchk.c:2240
+msgid "Case sensitive"
+msgstr "Skriftl辰gesk辰nslig"
+
+#: ../pidgin/plugins/spellchk.c:2266
+msgid "Add a new text replacement"
+msgstr "L辰gg till ny texters辰ttning"
+
+#: ../pidgin/plugins/spellchk.c:2282
+msgid "You _type:"
+msgstr "Du _skriver:"
+
+#: ../pidgin/plugins/spellchk.c:2299
+msgid "You _send:"
+msgstr "Du _skickar:"
+
+#. Created here so it can be passed to whole_words_button_toggled.
+#: ../pidgin/plugins/spellchk.c:2311
+msgid "_Exact case match (uncheck for automatic case handling)"
+msgstr ""
+"_Exakt skriftl辰gesk辰bslighet (avmarkera f旦r automatisk skriftl辰gesavk辰nning)"
+
+#: ../pidgin/plugins/spellchk.c:2313
+msgid "Only replace _whole words"
+msgstr "Ers辰tt endast _hela ord"
+
+#: ../pidgin/plugins/spellchk.c:2338
+msgid "General Text Replacement Options"
+msgstr "Allm辰nna texters辰ttningsval"
+
+#: ../pidgin/plugins/spellchk.c:2339
+msgid "Enable replacement of last word on send"
+msgstr "Till奪t ers辰ttning av det sista ordet vid s辰ndning."
+
+#: ../pidgin/plugins/spellchk.c:2370
+msgid "Text replacement"
+msgstr "Texters辰ttning"
+
+#: ../pidgin/plugins/spellchk.c:2372 ../pidgin/plugins/spellchk.c:2373
+msgid "Replaces text in outgoing messages according to user-defined rules."
+msgstr "Ers辰tter text i utg奪ende meddelanden enligt dina egna regler."
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/ticker/ticker.c:74 ../pidgin/plugins/ticker/ticker.c:354
+msgid "Buddy Ticker"
+msgstr "Kompistickare"
+
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../pidgin/plugins/ticker/ticker.c:357 ../pidgin/plugins/ticker/ticker.c:359
+msgid "A horizontal scrolling version of the buddy list."
+msgstr "En horisontellt rullande version av kompislistan."
+
+#: ../pidgin/plugins/timestamp.c:137
+msgid "Display Timestamps Every"
+msgstr "Visa tidsst辰mpel varje"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp.c:202
+msgid "Timestamp"
+msgstr "Tidsst辰mpel"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp.c:205
+msgid "Display iChat-style timestamps"
+msgstr "Visa tidst辰mpel av iChat-typ"
+
+#. *  description
+#: ../pidgin/plugins/timestamp.c:207
+msgid "Display iChat-style timestamps every N minutes."
+msgstr "Visa tidsst辰mplar av iChat-typ var N:te minut."
+
+#: ../pidgin/plugins/timestamp_format.c:23
+msgid "Timestamp Format Options"
+msgstr "Val f旦r tidsst辰mpelformat"
+
+#: ../pidgin/plugins/timestamp_format.c:26
+msgid "_Force 24-hour time format"
+msgstr "Tvinga 24-timmars tids_format"
+
+#: ../pidgin/plugins/timestamp_format.c:33
+msgid "Show dates in..."
+msgstr "Visa datum i..."
+
+#: ../pidgin/plugins/timestamp_format.c:38
+msgid "Co_nversations:"
+msgstr "Ko_nversationer:"
+
+#: ../pidgin/plugins/timestamp_format.c:40
+#: ../pidgin/plugins/timestamp_format.c:49
+msgid "For delayed messages"
+msgstr "F旦r f旦rdr旦jd meddeladen"
+
+#: ../pidgin/plugins/timestamp_format.c:41
+#: ../pidgin/plugins/timestamp_format.c:50
+msgid "For delayed messages and in chats"
+msgstr "F旦r f旦rdr旦jda meddelanden och i chattar"
+
+#: ../pidgin/plugins/timestamp_format.c:47
+msgid "_Message Logs:"
+msgstr "_Meddelandeloggar:"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/timestamp_format.c:151
+msgid "Message Timestamp Formats"
+msgstr "Tidsst辰mpelformat f旦r meddelande"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/timestamp_format.c:154
+msgid "Customizes the message timestamp formats."
+msgstr "Personifiera tidsformatsst辰mpeln f旦r meddelandet."
+
+#. *  description
+#: ../pidgin/plugins/timestamp_format.c:156
+msgid ""
+"This plugin allows the user to customize conversation and logging message "
+"timestamp formats."
+msgstr ""
+"Denna modul till奪ter anv辰ndaren att personifiera konversationernas och "
+"loggarnas tidsst辰mpelformat."
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:174
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:589
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:636
+msgid "Opacity:"
+msgstr "Ogenomskinlighet:"
+
+#. IM Convo trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:553
+msgid "IM Conversation Windows"
+msgstr "Snabbmeddelandef旦nster"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:554
+msgid "_IM window transparency"
+msgstr "_Genomskinlighet f旦r snabbmeddelandef旦nster"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:568
+msgid "_Show slider bar in IM window"
+msgstr "_Visa \"slider bar\" i snabbmeddelandef旦nster"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:575
+msgid "Remove IM window transparency on focus"
+msgstr "Ta bort genomskinlighet f旦r fokuserade snabbmeddelandef旦nster"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:578
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:626
+msgid "Always on top"
+msgstr "Alltid 旦verst"
+
+#. Buddy List trans options
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:610
+msgid "Buddy List Window"
+msgstr "Kompislistef旦nster"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:611
+msgid "_Buddy List window transparency"
+msgstr "Genomskinlighet f旦r _kompislistef旦nster"
+
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:624
+msgid "Remove Buddy List window transparency on focus"
+msgstr "Ta bort genomskinligheten p奪 kompislistef旦nstret n辰r det f奪r fokus"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:684
+msgid "Transparency"
+msgstr "Genomskinlighet"
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:687
+msgid "Variable Transparency for the buddy list and conversations."
+msgstr "Variabel genomskinlighet p奪 kompislistan och konversationer."
+
+#. *  description
+#: ../pidgin/plugins/win32/transparency/win2ktrans.c:689
+msgid ""
+"This plugin enables variable alpha transparency on conversation windows and "
+"the buddy list.\n"
+"\n"
+"* Note: This plugin requires Win2000 or greater."
+msgstr ""
+"Denna insticksmodul g旦r det m旦jligt att anv辰nda alfagenomskinlighet p奪 "
+"konversationsf旦nster och kompislistan.\n"
+"\n"
+"* Observera: Denna insticksmodul kr辰ver Win2000 eller senare."
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:307
+msgid "GTK+ Runtime Version"
+msgstr "GTK+ Runtime-version"
+
+#. Autostart
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:315
+msgid "Startup"
+msgstr "Uppstart"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:316
+#, c-format
+msgid "_Start %s on Windows startup"
+msgstr "_Starta %s n辰r Windows startar"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
+msgid "_Dockable Buddy List"
+msgstr "_Dockningsbar kompislista"
+
+#. Blist On Top
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:335
+msgid "_Keep Buddy List window on top:"
+msgstr "_H奪ll kompislistef旦nstret 旦verst:"
+
+#. XXX: Did this ever work?
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
+msgid "Only when docked"
+msgstr "Endast om dockad"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:345
+msgid "_Flash window when chat messages are received"
+msgstr "Blinka med _f旦nstret n辰r chattmeddelanden tas emot"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:375
+msgid "Windows Pidgin Options"
+msgstr "Inst辰llningar f旦r Pidgin i Windows"
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:377
+msgid "Options specific to Pidgin for Windows."
+msgstr "Inst辰llningar specifika f旦r Pidgin i Windows."
+
+#: ../pidgin/plugins/win32/winprefs/winprefs.c:378
+msgid ""
+"Provides options specific to Pidgin for Windows , such as buddy list docking."
+msgstr ""
+"Tillhandah奪ller ins辰llningar specifika f旦r Pidgion i Windows s奪som dockning "
+"av kompislistan."
+
+#: ../pidgin/plugins/xmppconsole.c:667
+msgid "<font color='#777777'>Logged out.</font>"
+msgstr "<font color='#777777'>Loggade ut.</font>"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#: ../pidgin/plugins/xmppconsole.c:746 ../pidgin/plugins/xmppconsole.c:841
+#: ../pidgin/plugins/xmppconsole.c:860
+msgid "XMPP Console"
+msgstr "XMPP Konsoll"
+
+#: ../pidgin/plugins/xmppconsole.c:753
+msgid "Account: "
+msgstr "Konto: "
+
+#: ../pidgin/plugins/xmppconsole.c:780
+msgid "<font color='#777777'>Not connected to XMPP</font>"
+msgstr "<font color='#777777'>Inte ansluten till XMPP</font>"
+
+#: ../pidgin/plugins/xmppconsole.c:790
+msgid "Insert an <iq/> stanza."
+msgstr "Infoga en <iq/> strof."
+
+#: ../pidgin/plugins/xmppconsole.c:799
+msgid "Insert a <presence/> stanza."
+msgstr "Infoga en <presence/> strof."
+
+#: ../pidgin/plugins/xmppconsole.c:808
+msgid "Insert a <message/> stanza."
+msgstr "Infoga en <message/> strof."
+
+#. *< name
+#. *< version
+#. *  summary
+#: ../pidgin/plugins/xmppconsole.c:863
+msgid "Send and receive raw XMPP stanzas."
+msgstr "Skicka och ta emot r奪a XMPP strofer."
+
+#. *  description
+#: ../pidgin/plugins/xmppconsole.c:865
+msgid "This plugin is useful for debbuging XMPP servers or clients."
+msgstr "Denna modul 'r anv辰ndbar vid fels旦kning av XMPP serverar och klienter."