changeset 21499:fa407f34864f

merge of 'cf2b9ed82ae35086ec3c7557b3b00c0664daca8e' and 'eeae2261ffb1dccbc44c10b02a7e95db57406bd9'
author Luke Schierer <lschiere@pidgin.im>
date Wed, 14 Nov 2007 12:44:45 +0000
parents e241c6cdce85 (current diff) 0df3d6b11d05 (diff)
children c6834071f6c5
files
diffstat 12 files changed, 4996 insertions(+), 9406 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog.API	Wed Nov 14 12:42:23 2007 +0000
+++ b/ChangeLog.API	Wed Nov 14 12:44:45 2007 +0000
@@ -146,11 +146,13 @@
 		  string id of a menuitem respectively.
 		* Added gnt_window_get_accel_item, which returns a the id of a menuitem
 		  bound to a keystroke.
-		* Added gnt_menu_get_item to activate and return a menuitem of the
-		  given id from a menu.
+		* Added gnt_menu_get_item to get a menuitem of the given id from a
+		  menu.
 		* Added gnt_menuitem_activate, which triggers the 'activate' signal on
 		  the menuitem and calls the callback function, if available.
 		* Added GntEntryKillRing in GntEntry.
+		* Added gnt_window_set_maximize and gnt_window_get_maximize, and
+		  GntWindowFlags enum.
 
 version 2.2.2 (??/??/????):
 	libpurple:
--- a/finch/libgnt/gntlabel.c	Wed Nov 14 12:42:23 2007 +0000
+++ b/finch/libgnt/gntlabel.c	Wed Nov 14 12:44:45 2007 +0000
@@ -130,7 +130,10 @@
 			PROP_TEXT_FLAG,
 			g_param_spec_int("text-flag", "Text flag",
 				"Text attribute to use when displaying the text in the label.",
-				GNT_TEXT_FLAG_NORMAL, GNT_TEXT_FLAG_HIGHLIGHT, GNT_TEXT_FLAG_NORMAL,
+				GNT_TEXT_FLAG_NORMAL,
+				GNT_TEXT_FLAG_NORMAL|GNT_TEXT_FLAG_BOLD|GNT_TEXT_FLAG_UNDERLINE|
+				GNT_TEXT_FLAG_BLINK|GNT_TEXT_FLAG_DIM|GNT_TEXT_FLAG_HIGHLIGHT,
+				GNT_TEXT_FLAG_NORMAL,
 				G_PARAM_READWRITE|G_PARAM_STATIC_NAME|G_PARAM_STATIC_NICK|G_PARAM_STATIC_BLURB
 			)
 		);
--- a/finch/libgnt/gntmenu.c	Wed Nov 14 12:42:23 2007 +0000
+++ b/finch/libgnt/gntmenu.c	Wed Nov 14 12:44:45 2007 +0000
@@ -490,9 +490,6 @@
 		item = NULL;
 	}
 
-	if (item)
-		menuitem_activate(menu, item);
-
 	return item;
 }
 
--- a/finch/libgnt/gntmenu.h	Wed Nov 14 12:42:23 2007 +0000
+++ b/finch/libgnt/gntmenu.h	Wed Nov 14 12:44:45 2007 +0000
@@ -108,7 +108,7 @@
 void gnt_menu_add_item(GntMenu *menu, GntMenuItem *item);
 
 /**
- * Activate and return the GntMenuItem with the given ID.
+ * Return the GntMenuItem with the given ID.
  *
  * @param menu   The menu.
  * @param id     The ID for an item.
--- a/finch/libgnt/gntwm.c	Wed Nov 14 12:42:23 2007 +0000
+++ b/finch/libgnt/gntwm.c	Wed Nov 14 12:44:45 2007 +0000
@@ -1876,8 +1876,11 @@
 			GntMenu *menu = GNT_WINDOW(win)->menu;
 			if (menu) {
 				const char *id = gnt_window_get_accel_item(GNT_WINDOW(win), keys);
-				if (id)
-					ret = (gnt_menu_get_item(menu, id) != NULL);
+				if (id) {
+					GntMenuItem *item = gnt_menu_get_item(menu, id);
+					if (item)
+						ret = gnt_menuitem_activate(item);
+				}
 			}
 		}
 		if (!ret)
--- a/finch/plugins/gnthistory.c	Wed Nov 14 12:42:23 2007 +0000
+++ b/finch/plugins/gnthistory.c	Wed Nov 14 12:44:45 2007 +0000
@@ -25,13 +25,14 @@
 #include "conversation.h"
 #include "debug.h"
 #include "log.h"
-#include "notify.h"
+#include "request.h"
 #include "prefs.h"
 #include "signals.h"
 #include "util.h"
 #include "version.h"
 
 #include "gntplugin.h"
+#include "gntrequest.h"
 
 #define HISTORY_PLUGIN_ID "gnt-history"
 
@@ -135,10 +136,51 @@
 	if (!purple_prefs_get_bool("/purple/logging/log_ims") &&
 	    !purple_prefs_get_bool("/purple/logging/log_chats"))
 	{
-		purple_notify_warning(plugin, NULL, _("History Plugin Requires Logging"),
+		PurpleRequestFields *fields = purple_request_fields_new();
+		PurpleRequestFieldGroup *group;
+		PurpleRequestField *field;
+		struct {
+			const char *pref;
+			const char *label;
+		} prefs[] = {
+			{"/purple/logging/log_ims", N_("Log IMs")},
+			{"/purple/logging/log_chats", N_("Log chats")},
+			{NULL, NULL}
+		};
+		int iter;
+		GList *list = purple_log_logger_get_options();
+		const char *system = purple_prefs_get_string("/purple/logging/format");
+
+		group = purple_request_field_group_new(_("Logging"));
+
+		field = purple_request_field_list_new("/purple/logging/format", _("Log format"));
+		while (list) {
+			const char *label = _(list->data);
+			list = g_list_delete_link(list, list);
+			purple_request_field_list_add(field, label, list->data);
+			if (system && strcmp(system, list->data) == 0)
+				purple_request_field_list_add_selected(field, label);
+			list = g_list_delete_link(list, list);
+		}
+		purple_request_field_group_add_field(group, field);
+
+		for (iter = 0; prefs[iter].pref; iter++) {
+			field = purple_request_field_bool_new(prefs[iter].pref, _(prefs[iter].label),
+						purple_prefs_get_bool(prefs[iter].pref));
+			purple_request_field_group_add_field(group, field);
+		}
+
+		purple_request_fields_add_group(fields, group);
+
+		purple_request_fields_with_hint(plugin, NULL, _("History Plugin Requires Logging"),
 							_("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)."));
+							  "history for the same conversation type(s)."),
+							fields,
+							_("OK"), G_CALLBACK(finch_request_save_in_prefs),
+							_("Cancel"), NULL,
+							NULL, NULL, NULL,
+							"42. That's your hint. Take it, or leave it.", plugin);
 	}
 }
 
--- a/libpurple/connection.c	Wed Nov 14 12:42:23 2007 +0000
+++ b/libpurple/connection.c	Wed Nov 14 12:44:45 2007 +0000
@@ -664,7 +664,7 @@
 										PURPLE_SUBTYPE_CONNECTION));
 
 	purple_signal_register(handle, "connection-error",
-	                       purple_marshal_VOID__POINTER_INT_POINTER, NULL, 1,
+	                       purple_marshal_VOID__POINTER_INT_POINTER, NULL, 3,
 	                       purple_value_new(PURPLE_TYPE_SUBTYPE,
 	                                        PURPLE_SUBTYPE_CONNECTION),
 	                       purple_value_new(PURPLE_TYPE_ENUM),
--- a/pidgin/gtkdocklet-x11.c	Wed Nov 14 12:42:23 2007 +0000
+++ b/pidgin/gtkdocklet-x11.c	Wed Nov 14 12:44:45 2007 +0000
@@ -139,9 +139,9 @@
 static void
 docklet_x11_resize_icon(GtkWidget *widget)
 {
-	if (docklet_height == widget->allocation.height)
+	if (docklet_height == MIN(widget->allocation.height, widget->allocation.width))
 		return;
-	docklet_height = widget->allocation.height;
+	docklet_height = MIN(widget->allocation.height, widget->allocation.width);
 	pidgin_docklet_update_icon();
 }
 
--- a/pidgin/gtkimhtml.c	Wed Nov 14 12:42:23 2007 +0000
+++ b/pidgin/gtkimhtml.c	Wed Nov 14 12:44:45 2007 +0000
@@ -1165,17 +1165,15 @@
 static void
 gtk_imhtml_undo(GtkIMHtml *imhtml) {
 	g_return_if_fail(GTK_IS_IMHTML(imhtml));
-	g_return_if_fail(imhtml->editable);
-	
-	gtk_source_undo_manager_undo(imhtml->undo_manager);
+	if (imhtml->editable)
+		gtk_source_undo_manager_undo(imhtml->undo_manager);
 }
 
 static void
 gtk_imhtml_redo(GtkIMHtml *imhtml) {
 	g_return_if_fail(GTK_IS_IMHTML(imhtml));
-	g_return_if_fail(imhtml->editable);
-	
-	gtk_source_undo_manager_redo(imhtml->undo_manager);
+	if (imhtml->editable)
+		gtk_source_undo_manager_redo(imhtml->undo_manager);
 
 }
 
@@ -2950,8 +2948,10 @@
 		} else if (imhtml->edit.link == NULL &&
 				gtk_imhtml_is_smiley(imhtml, fonts, c, &smilelen)) {
 			GtkIMHtmlFontDetail *fd;
-
 			gchar *sml = NULL;
+
+			br = FALSE;
+
 			if (fonts) {
 				fd = fonts->data;
 				sml = fd->sml;
@@ -2969,6 +2969,7 @@
 			wpos = 0;
 			ws[0] = 0;
 		} else if (*c == '&' && (amp = purple_markup_unescape_entity(c, &tlen))) {
+			br = FALSE;
 			while(*amp) {
 				ws [wpos++] = *amp++;
 			}
@@ -2997,6 +2998,7 @@
 			c++;
 			pos++;
 		} else if ((len_protocol = gtk_imhtml_is_protocol(c)) > 0){
+			br = FALSE;
 			while(len_protocol--){
 				/* Skip the next len_protocol characters, but make sure they're
 				   copied into the ws array.
@@ -3005,6 +3007,7 @@
 				 pos++;
 			}
 		} else if (*c) {
+			br = FALSE;
 			ws [wpos++] = *c++;
 			pos++;
 		} else {
--- a/po/ChangeLog	Wed Nov 14 12:42:23 2007 +0000
+++ b/po/ChangeLog	Wed Nov 14 12:44:45 2007 +0000
@@ -7,6 +7,7 @@
 	* Chinese (Simplified) translation updated (Funda Wang)
 	* Chinese (Traditional) translation updated (Ambrose C. Li)
 	* Estonian translation updated (Ivar Smolin)
+	* Finnish translation updated (Timo Jyrinki)
 	* German translation updated (Jochen Kemnade,Bjoern Voigt)
 	* Hebrew translation updated (Shalom Craimer)
 	* Hungarian translation updated (Gabor Kelemen)
--- a/po/fi.po	Wed Nov 14 12:42:23 2007 +0000
+++ b/po/fi.po	Wed Nov 14 12:44:45 2007 +0000
@@ -10,8 +10,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-11-06 18:44+0200\n"
-"PO-Revision-Date: 2007-11-06 18:45+0200\n"
+"POT-Creation-Date: 2007-11-13 22:54+0200\n"
+"PO-Revision-Date: 2007-11-13 22:54+0200\n"
 "Last-Translator: Timo Jyrinki <timo.jyrinki@iki.fi>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -50,7 +50,7 @@
 "  -n, --nologin       älä kirjaudu automaattisesti\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
 
-#: ../finch/finch.c:328 ../pidgin/gtkmain.c:718
+#: ../finch/finch.c:328 ../pidgin/gtkmain.c:730
 #, c-format
 msgid ""
 "%s encountered errors migrating your settings from %s to %s. Please "
@@ -62,14 +62,14 @@
 "osoitteessa http://developer.pidgin.im/"
 
 #: ../finch/gntaccount.c:124 ../finch/gntaccount.c:484 ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:187
-#: ../finch/gntplugin.c:235 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
+#: ../finch/gntblist.c:433 ../finch/gntblist.c:446 ../finch/gntplugin.c:189
+#: ../finch/gntplugin.c:237 ../finch/gntstatus.c:301 ../finch/gntstatus.c:310
 #: ../finch/plugins/gntclipboard.c:115 ../finch/plugins/gntclipboard.c:121
 #: ../finch/plugins/gntclipboard.c:128
 #: ../libpurple/protocols/jabber/buddy.c:2032
 #: ../libpurple/protocols/jabber/chat.c:677
 #: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1515
+#: ../libpurple/protocols/jabber/jabber.c:1553
 #: ../libpurple/protocols/qq/group_join.c:328
 #: ../libpurple/protocols/qq/im.c:576 ../libpurple/protocols/silc/ops.c:57
 #: ../libpurple/protocols/silc/ops.c:1460
@@ -102,7 +102,7 @@
 msgstr "(Unohdit luultavasti suorittaa \"make install\".)"
 
 #: ../finch/gntaccount.c:496 ../finch/gntconn.c:137
-#: ../pidgin/gtkaccount.c:1478 ../pidgin/gtkblist.c:4371
+#: ../pidgin/gtkaccount.c:1478 ../pidgin/gtkblist.c:4501
 msgid "Modify Account"
 msgstr "Muokkaa tiliä"
 
@@ -132,30 +132,34 @@
 #: ../finch/gntaccount.c:575 ../finch/gntaccount.c:638
 #: ../finch/gntaccount.c:889 ../finch/gntblist.c:344 ../finch/gntblist.c:421
 #: ../finch/gntblist.c:456 ../finch/gntblist.c:803 ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2224 ../finch/gntblist.c:2287
-#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:472 ../finch/gntpounce.c:459
-#: ../finch/gntpounce.c:667 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
+#: ../finch/gntblist.c:1101 ../finch/gntblist.c:2226 ../finch/gntblist.c:2289
+#: ../finch/gntcertmgr.c:91 ../finch/gntplugin.c:475 ../finch/gntpounce.c:472
+#: ../finch/gntpounce.c:680 ../finch/gntprefs.c:265 ../finch/gntsound.c:1058
 #: ../finch/gntstatus.c:145 ../finch/gntstatus.c:485 ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013 ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298 ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51 ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666 ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/gg/gg.c:885
+#: ../finch/plugins/gnthistory.c:181 ../libpurple/account.c:1105
+#: ../libpurple/account.c:1394 ../libpurple/account.c:1429
+#: ../libpurple/conversation.c:1215 ../libpurple/plugins/buddynote.c:51
+#: ../libpurple/protocols/gg/gg.c:508 ../libpurple/protocols/gg/gg.c:667
+#: ../libpurple/protocols/gg/gg.c:804 ../libpurple/protocols/gg/gg.c:886
 #: ../libpurple/protocols/jabber/buddy.c:728
 #: ../libpurple/protocols/jabber/buddy.c:2426
 #: ../libpurple/protocols/jabber/buddy.c:2462
 #: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/jabber/jabber.c:1017
-#: ../libpurple/protocols/jabber/jabber.c:1739
+#: ../libpurple/protocols/jabber/jabber.c:1035
+#: ../libpurple/protocols/jabber/jabber.c:1044
+#: ../libpurple/protocols/jabber/jabber.c:1746
 #: ../libpurple/protocols/jabber/si.c:874
 #: ../libpurple/protocols/jabber/usermood.c:202
 #: ../libpurple/protocols/jabber/usernick.c:78
 #: ../libpurple/protocols/jabber/xdata.c:400
 #: ../libpurple/protocols/msn/msn.c:291 ../libpurple/protocols/msn/msn.c:308
 #: ../libpurple/protocols/msn/msn.c:325 ../libpurple/protocols/msn/msn.c:342
-#: ../libpurple/protocols/msn/msn.c:363
-#: ../libpurple/protocols/oscar/oscar.c:6149
+#: ../libpurple/protocols/msn/msn.c:363 ../libpurple/protocols/msnp9/msn.c:287
+#: ../libpurple/protocols/msnp9/msn.c:304
+#: ../libpurple/protocols/msnp9/msn.c:321
+#: ../libpurple/protocols/msnp9/msn.c:338
+#: ../libpurple/protocols/msnp9/msn.c:359
+#: ../libpurple/protocols/oscar/oscar.c:6144
 #: ../libpurple/protocols/oscar/peer.c:1048
 #: ../libpurple/protocols/qq/buddy_info.c:525
 #: ../libpurple/protocols/qq/buddy_opt.c:214
@@ -168,20 +172,20 @@
 #: ../libpurple/protocols/qq/sys_msg.c:113
 #: ../libpurple/protocols/qq/sys_msg.c:172
 #: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../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:3430
+#: ../libpurple/protocols/sametime/sametime.c:3516
+#: ../libpurple/protocols/sametime/sametime.c:3690
+#: ../libpurple/protocols/sametime/sametime.c:5443
+#: ../libpurple/protocols/sametime/sametime.c:5533
+#: ../libpurple/protocols/sametime/sametime.c:5658
 #: ../libpurple/protocols/silc/buddy.c:455
 #: ../libpurple/protocols/silc/buddy.c:1079
 #: ../libpurple/protocols/silc/buddy.c:1194
 #: ../libpurple/protocols/silc/chat.c:620
 #: ../libpurple/protocols/silc/chat.c:750
 #: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/silc.c:954
-#: ../libpurple/protocols/silc/silc.c:1162
+#: ../libpurple/protocols/silc/silc.c:966
+#: ../libpurple/protocols/silc/silc.c:1174
 #: ../libpurple/protocols/silc10/buddy.c:468
 #: ../libpurple/protocols/silc10/buddy.c:1087
 #: ../libpurple/protocols/silc10/buddy.c:1192
@@ -189,22 +193,22 @@
 #: ../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/silc10/silc.c:943
 #: ../libpurple/protocols/yahoo/yahoo.c:1034
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
-#: ../libpurple/protocols/yahoo/yahoo.c:3511 ../pidgin/gtkaccount.c:1913
-#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:6325
-#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911 ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkdialogs.c:1023 ../pidgin/gtkdialogs.c:1047
-#: ../pidgin/gtkdialogs.c:1069 ../pidgin/gtkdialogs.c:1117
-#: ../pidgin/gtkdialogs.c:1158 ../pidgin/gtkdialogs.c:1214
-#: ../pidgin/gtkdialogs.c:1253 ../pidgin/gtkdialogs.c:1280
-#: ../pidgin/gtkimhtmltoolbar.c:435 ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1113
-#: ../pidgin/gtkprivacy.c:563 ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604 ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271 ../pidgin/gtksavedstatuses.c:345
+#: ../libpurple/protocols/yahoo/yahoo.c:3509
+#: ../libpurple/protocols/yahoo/yahoo.c:3520 ../pidgin/gtkaccount.c:1913
+#: ../pidgin/gtkaccount.c:2501 ../pidgin/gtkblist.c:6668
+#: ../pidgin/gtkcertmgr.c:197 ../pidgin/gtkdialogs.c:788
+#: ../pidgin/gtkdialogs.c:927 ../pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1039 ../pidgin/gtkdialogs.c:1063
+#: ../pidgin/gtkdialogs.c:1085 ../pidgin/gtkdialogs.c:1133
+#: ../pidgin/gtkdialogs.c:1174 ../pidgin/gtkdialogs.c:1230
+#: ../pidgin/gtkdialogs.c:1269 ../pidgin/gtkdialogs.c:1296
+#: ../pidgin/gtkimhtmltoolbar.c:437 ../pidgin/gtklog.c:328
+#: ../pidgin/gtkplugin.c:289 ../pidgin/gtkpounce.c:1121
+#: ../pidgin/gtkprivacy.c:565 ../pidgin/gtkprivacy.c:581
+#: ../pidgin/gtkprivacy.c:606 ../pidgin/gtkprivacy.c:620
+#: ../pidgin/gtkrequest.c:321 ../pidgin/gtksavedstatuses.c:345
 #: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
 msgstr "Peru"
@@ -212,11 +216,11 @@
 #. Save button
 #. Save
 #: ../finch/gntaccount.c:579 ../finch/gntcertmgr.c:311 ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:472 ../finch/gntpounce.c:465 ../finch/gntprefs.c:265
+#: ../finch/gntplugin.c:475 ../finch/gntpounce.c:478 ../finch/gntprefs.c:265
 #: ../finch/gntsound.c:1055 ../finch/gntstatus.c:488 ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1297 ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:277
+#: ../libpurple/account.c:1428 ../libpurple/plugins/buddynote.c:50
+#: ../libpurple/protocols/jabber/buddy.c:727 ../pidgin/gtkdebug.c:754
+#: ../pidgin/gtkrequest.c:327
 msgid "Save"
 msgstr "Tallenna"
 
@@ -232,15 +236,15 @@
 
 #. Delete button
 #: ../finch/gntaccount.c:637 ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:666 ../finch/gntpounce.c:729
+#: ../finch/gntcertmgr.c:319 ../finch/gntpounce.c:679 ../finch/gntpounce.c:742
 #: ../finch/gntstatus.c:144 ../finch/gntstatus.c:210
 #: ../pidgin/gtkaccount.c:1912 ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1112 ../pidgin/gtkrequest.c:274
+#: ../pidgin/gtkpounce.c:1120 ../pidgin/gtkrequest.c:324
 #: ../pidgin/gtksavedstatuses.c:344 ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "Poista"
 
-#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2121 ../finch/gntui.c:82
+#: ../finch/gntaccount.c:669 ../finch/gntblist.c:2123 ../finch/gntui.c:82
 #: ../pidgin/gtkaccount.c:2331 ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "Käyttäjätilit"
@@ -252,22 +256,22 @@
 
 #. Add button
 #: ../finch/gntaccount.c:698 ../finch/gntaccount.c:888 ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2372
-#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:713
-#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:884
+#: ../finch/gntblist.c:421 ../finch/gntblist.c:456 ../finch/gntblist.c:2381
+#: ../finch/gntcertmgr.c:306 ../finch/gntnotify.c:385 ../finch/gntpounce.c:726
+#: ../finch/gntstatus.c:199 ../libpurple/protocols/gg/gg.c:885
 #: ../libpurple/protocols/qq/sys_msg.c:114
 #: ../libpurple/protocols/qq/sys_msg.c:173
 #: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5486
+#: ../libpurple/protocols/sametime/sametime.c:5532
 #: ../libpurple/protocols/silc/chat.c:619
 #: ../libpurple/protocols/silc10/chat.c:599 ../pidgin/gtkaccount.c:2500
-#: ../pidgin/gtkblist.c:6324 ../pidgin/gtkconv.c:1713
-#: ../pidgin/gtkrequest.c:275
+#: ../pidgin/gtkblist.c:6667 ../pidgin/gtkconv.c:1713
+#: ../pidgin/gtkrequest.c:325
 msgid "Add"
 msgstr "Lisää"
 
 #. Modify button
-#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:721
+#: ../finch/gntaccount.c:703 ../finch/gntpounce.c:734
 msgid "Modify"
 msgstr "Muokkaa"
 
@@ -278,12 +282,12 @@
 
 #: ../finch/gntaccount.c:884 ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
-msgstr "Lisää tuttava listalle?"
+msgstr "Lisää tuttava tuttavaluetteloon?"
 
 #: ../finch/gntaccount.c:944 ../pidgin/gtkaccount.c:2557
 #, c-format
 msgid "%s%s%s%s wants to add %s to his or her buddy list%s%s"
-msgstr "%s%s%s%s haluaa lisätä käyttäjän %s tuttavalistalleen%s%s"
+msgstr "%s%s%s%s haluaa lisätä käyttäjän %s tuttavaluetteloonsa%s%s"
 
 #: ../finch/gntaccount.c:969 ../finch/gntaccount.c:972
 #: ../finch/gntaccount.c:999 ../pidgin/gtkaccount.c:2580
@@ -321,20 +325,21 @@
 msgid "Error adding buddy"
 msgstr "Virhe lisättäessä tuttavaa"
 
-#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2903
-#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:980
+#: ../finch/gntblist.c:325 ../libpurple/protocols/oscar/oscar.c:2898
+#: ../pidgin/gtkaccount.c:1986 ../pidgin/gtksavedstatuses.c:986
 msgid "Screen Name"
 msgstr "Näyttönimi"
 
 #: ../finch/gntblist.c:328 ../finch/gntblist.c:410 ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1528
+#: ../libpurple/protocols/msn/msn.c:1551
+#: ../libpurple/protocols/msnp9/msn.c:1402
 #: ../libpurple/protocols/silc/chat.c:610
 #: ../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:1022
-#: ../pidgin/gtkdialogs.c:1046 ../pidgin/gtkdialogs.c:1068
-#: ../pidgin/gtkrequest.c:278
+#: ../libpurple/protocols/zephyr/zephyr.c:1207 ../pidgin/gtkdialogs.c:1038
+#: ../pidgin/gtkdialogs.c:1062 ../pidgin/gtkdialogs.c:1084
+#: ../pidgin/gtkrequest.c:328
 msgid "Alias"
 msgstr "Alias"
 
@@ -343,10 +348,10 @@
 msgstr "Ryhmä"
 
 #: ../finch/gntblist.c:335 ../finch/gntblist.c:401 ../finch/gntblist.c:1305
-#: ../finch/gntblist.c:2210 ../finch/gntblist.c:2274 ../finch/gntnotify.c:174
+#: ../finch/gntblist.c:2212 ../finch/gntblist.c:2276 ../finch/gntnotify.c:174
 #: ../finch/gntstatus.c:576 ../libpurple/plugins/idle.c:153
-#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3209
-#: ../pidgin/gtknotify.c:511 ../pidgin/gtkpounce.c:1280
+#: ../libpurple/plugins/idle.c:190 ../pidgin/gtkblist.c:3242
+#: ../pidgin/gtknotify.c:512 ../pidgin/gtkpounce.c:1288
 #: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Tili"
@@ -360,7 +365,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/buddy.c:1083
 #: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3345 ../pidgin/gtkblist.c:5830
+#: ../libpurple/protocols/yahoo/yahoo.c:3354 ../pidgin/gtkblist.c:6169
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Lisää tuttava"
@@ -374,13 +379,16 @@
 msgstr "Ryhmäkeskustelut"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407 ../finch/gntblist.c:2205
-#: ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1709 ../libpurple/protocols/msn/msn.c:1774
-#: ../libpurple/protocols/msn/msn.c:1801
-#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:582
-#: ../pidgin/gtkroomlist.c:618
+#: ../finch/gntblist.c:407 ../finch/gntblist.c:2207
+#: ../libpurple/protocols/jabber/jabber.c:951
+#: ../libpurple/protocols/jabber/jabber.c:954
+#: ../libpurple/protocols/msn/msn.c:1732 ../libpurple/protocols/msn/msn.c:1797
+#: ../libpurple/protocols/msn/msn.c:1824
+#: ../libpurple/protocols/msnp9/msn.c:1585
+#: ../libpurple/protocols/msnp9/msn.c:1650
+#: ../libpurple/protocols/msnp9/msn.c:1677
+#: ../libpurple/protocols/qq/buddy_info.c:44 ../pidgin/gtkplugin.c:608
+#: ../pidgin/gtkroomlist.c:931
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
@@ -390,7 +398,7 @@
 msgid "Auto-join"
 msgstr "Liity automaattisesti"
 
-#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6212
+#: ../finch/gntblist.c:419 ../finch/gntblist.c:854 ../pidgin/gtkblist.c:6553
 msgid "Add Chat"
 msgstr "Lisää ryhmäkeskustelu"
 
@@ -411,8 +419,8 @@
 msgstr "Valitun niminen ryhmä on jo olemassa"
 
 #: ../finch/gntblist.c:454 ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484 ../pidgin/gtkblist.c:6321
+#: ../libpurple/protocols/sametime/sametime.c:5442
+#: ../libpurple/protocols/sametime/sametime.c:5530 ../pidgin/gtkblist.c:6664
 msgid "Add Group"
 msgstr "Lisää ryhmä"
 
@@ -436,15 +444,15 @@
 msgid "Edit Settings"
 msgstr "Muokkaa asetuksia"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:930
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Information"
 msgstr "Tiedot"
 
-#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:930
+#: ../finch/gntblist.c:864 ../pidgin/gtkutils.c:931
 msgid "Retrieving..."
 msgstr "Haetaan..."
 
-#: ../finch/gntblist.c:904 ../finch/gntconv.c:534
+#: ../finch/gntblist.c:904 ../finch/gntconv.c:528
 #: ../libpurple/protocols/silc/chat.c:903
 #: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
@@ -455,9 +463,9 @@
 msgstr "Lisää tuttavailmoitin"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915 ../finch/gntconv.c:546
+#: ../finch/gntblist.c:915 ../finch/gntconv.c:540
 #: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:587
+#: ../libpurple/protocols/oscar/oscar.c:654 ../libpurple/protocols/qq/qq.c:588
 #: ../pidgin/gtkconv.c:1661
 msgid "Send File"
 msgstr "Lähetä tiedosto"
@@ -502,17 +510,17 @@
 msgstr "Vahvista poistaminen"
 
 #: ../finch/gntblist.c:1100 ../finch/gntblist.c:1252 ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:276
+#: ../pidgin/gtkconv.c:1710 ../pidgin/gtkrequest.c:326
 #: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Poista"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2422 ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2889 ../pidgin/gtkblist.c:4614
+#: ../finch/gntblist.c:1226 ../finch/gntblist.c:2434 ../finch/gntprefs.c:258
+#: ../finch/gntui.c:83 ../pidgin/gtkblist.c:2908 ../pidgin/gtkblist.c:4927
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
-msgstr "Tuttavalista"
+msgstr "Tuttavat"
 
 #: ../finch/gntblist.c:1257
 msgid "Place tagged"
@@ -523,20 +531,22 @@
 msgstr "Merkitse/poista merkintä"
 
 #. General
-#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1051 ../libpurple/protocols/gg/gg.c:1124
-#: ../libpurple/protocols/gg/gg.c:2217
+#: ../finch/gntblist.c:1298 ../libpurple/protocols/gg/gg.c:638
+#: ../libpurple/protocols/gg/gg.c:1052 ../libpurple/protocols/gg/gg.c:1125
+#: ../libpurple/protocols/gg/gg.c:2228
 #: ../libpurple/protocols/jabber/buddy.c:286
 #: ../libpurple/protocols/jabber/buddy.c:1247
 #: ../libpurple/protocols/jabber/buddy.c:2217
 #: ../libpurple/protocols/jabber/buddy.c:2409
-#: ../libpurple/protocols/jabber/jabber.c:937
-#: ../libpurple/protocols/jabber/jabber.c:1544
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1590
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1536 ../libpurple/protocols/msn/msn.c:1712
+#: ../libpurple/protocols/jabber/jabber.c:964
+#: ../libpurple/protocols/jabber/jabber.c:1573
+#: ../libpurple/protocols/jabber/jabber.c:1587
+#: ../libpurple/protocols/jabber/jabber.c:1601
+#: ../libpurple/protocols/jabber/jabber.c:1615
+#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/msn/msn.c:1559 ../libpurple/protocols/msn/msn.c:1735
+#: ../libpurple/protocols/msnp9/msn.c:1410
+#: ../libpurple/protocols/msnp9/msn.c:1588
 #: ../libpurple/protocols/qq/buddy_info.c:43
 #: ../libpurple/protocols/silc/buddy.c:1538
 #: ../libpurple/protocols/silc/ops.c:1002
@@ -546,22 +556,24 @@
 #: ../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:3233
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:1066 ../pidgin/gtkblist.c:3266
 msgid "Nickname"
 msgstr "Kutsumanimi"
 
 #. Idle stuff
 #: ../finch/gntblist.c:1320 ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:354
+#: ../libpurple/protocols/bonjour/bonjour.c:359
 #: ../libpurple/protocols/jabber/buddy.c:787
 #: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/msn.c:593 ../libpurple/protocols/msn/msn.c:611
-#: ../libpurple/protocols/msn/msn.c:619 ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2830
-#: ../libpurple/protocols/oscar/oscar.c:2927
-#: ../libpurple/protocols/yahoo/yahoo.c:3099
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3261
-#: ../pidgin/gtkblist.c:3667 ../pidgin/gtkprefs.c:2025
+#: ../libpurple/protocols/msn/msn.c:611 ../libpurple/protocols/msn/msn.c:629
+#: ../libpurple/protocols/msn/msn.c:637 ../libpurple/protocols/msn/state.c:32
+#: ../libpurple/protocols/msnp9/msn.c:544
+#: ../libpurple/protocols/msnp9/state.c:32
+#: ../libpurple/protocols/novell/novell.c:2842
+#: ../libpurple/protocols/oscar/oscar.c:2922
+#: ../libpurple/protocols/yahoo/yahoo.c:3108
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:710 ../pidgin/gtkblist.c:3294
+#: ../pidgin/gtkblist.c:3700 ../pidgin/gtkprefs.c:2026
 msgid "Idle"
 msgstr "Jouten"
 
@@ -592,26 +604,24 @@
 "\n"
 "Viimeksi nähty: %s sitten"
 
-#: ../finch/gntblist.c:1704 ../pidgin/gtkdocklet.c:582
-#: ../pidgin/gtkstatusbox.c:1072
+#: ../finch/gntblist.c:1706 ../pidgin/gtkdocklet.c:582
 msgid "New..."
 msgstr "Uusi..."
 
-#: ../finch/gntblist.c:1711 ../pidgin/gtkdocklet.c:583
-#: ../pidgin/gtkstatusbox.c:1073
+#: ../finch/gntblist.c:1713 ../pidgin/gtkdocklet.c:583
 msgid "Saved..."
 msgstr "Tallennettu..."
 
-#: ../finch/gntblist.c:2089 ../finch/gntplugin.c:343 ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:531
+#: ../finch/gntblist.c:2091 ../finch/gntplugin.c:345 ../finch/gntui.c:88
+#: ../pidgin/gtkdocklet.c:716 ../pidgin/gtkplugin.c:555
 msgid "Plugins"
 msgstr "Liitännäiset"
 
-#: ../finch/gntblist.c:2218 ../pidgin/gtkdialogs.c:766
+#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:782
 msgid "New Instant Message"
 msgstr "Uusi pikaviesti"
 
-#: ../finch/gntblist.c:2220 ../pidgin/gtkdialogs.c:768
+#: ../finch/gntblist.c:2222 ../pidgin/gtkdialogs.c:784
 msgid ""
 "Please enter the screen name or alias of the person you would like to IM."
 msgstr ""
@@ -621,15 +631,20 @@
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2223 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
-#: ../finch/gntnotify.c:80 ../libpurple/account.c:1012
-#: ../libpurple/account.c:1262 ../libpurple/protocols/gg/gg.c:506
-#: ../libpurple/protocols/gg/gg.c:665 ../libpurple/protocols/gg/gg.c:802
-#: ../libpurple/protocols/jabber/jabber.c:1738
+#: ../finch/gntblist.c:2225 ../finch/gntcertmgr.c:90 ../finch/gntconn.c:136
+#: ../finch/gntnotify.c:80 ../finch/plugins/gnthistory.c:180
+#: ../libpurple/account.c:1104 ../libpurple/account.c:1393
+#: ../libpurple/protocols/gg/gg.c:507 ../libpurple/protocols/gg/gg.c:666
+#: ../libpurple/protocols/gg/gg.c:803
+#: ../libpurple/protocols/jabber/jabber.c:1745
 #: ../libpurple/protocols/jabber/xdata.c:399
 #: ../libpurple/protocols/msn/msn.c:290 ../libpurple/protocols/msn/msn.c:307
 #: ../libpurple/protocols/msn/msn.c:324 ../libpurple/protocols/msn/msn.c:341
-#: ../libpurple/protocols/oscar/oscar.c:6148
+#: ../libpurple/protocols/msnp9/msn.c:286
+#: ../libpurple/protocols/msnp9/msn.c:303
+#: ../libpurple/protocols/msnp9/msn.c:320
+#: ../libpurple/protocols/msnp9/msn.c:337
+#: ../libpurple/protocols/oscar/oscar.c:6143
 #: ../libpurple/protocols/silc/buddy.c:454
 #: ../libpurple/protocols/silc/buddy.c:1193
 #: ../libpurple/protocols/silc/chat.c:449
@@ -637,7 +652,7 @@
 #: ../libpurple/protocols/silc/chat.c:749
 #: ../libpurple/protocols/silc/ops.c:1293
 #: ../libpurple/protocols/silc/ops.c:1819
-#: ../libpurple/protocols/silc/silc.c:953
+#: ../libpurple/protocols/silc/silc.c:965
 #: ../libpurple/protocols/silc10/buddy.c:467
 #: ../libpurple/protocols/silc10/buddy.c:1191
 #: ../libpurple/protocols/silc10/chat.c:425
@@ -647,68 +662,67 @@
 #: ../libpurple/protocols/silc10/ops.c:1903
 #: ../libpurple/protocols/silc10/silc.c:735
 #: ../libpurple/protocols/yahoo/yahoo.c:1033
-#: ../libpurple/protocols/yahoo/yahoo.c:3499
-#: ../libpurple/protocols/yahoo/yahoo.c:3510 ../pidgin/gtkblist.c:4370
-#: ../pidgin/gtkcertmgr.c:195 ../pidgin/gtkdialogs.c:771
-#: ../pidgin/gtkdialogs.c:910 ../pidgin/gtkdialogs.c:1002
-#: ../pidgin/gtkrequest.c:270
+#: ../libpurple/protocols/yahoo/yahoo.c:3508
+#: ../libpurple/protocols/yahoo/yahoo.c:3519 ../pidgin/gtkcertmgr.c:195
+#: ../pidgin/gtkdialogs.c:787 ../pidgin/gtkdialogs.c:926
+#: ../pidgin/gtkdialogs.c:1018 ../pidgin/gtkrequest.c:320
 msgid "OK"
 msgstr "OK"
 
-#: ../finch/gntblist.c:2270
+#: ../finch/gntblist.c:2272
 msgid "Channel"
 msgstr "Kanava"
 
-#: ../finch/gntblist.c:2282 ../pidgin/gtkblist.c:927
+#: ../finch/gntblist.c:2284 ../pidgin/gtkblist.c:940
 msgid "Join a Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../finch/gntblist.c:2284
+#: ../finch/gntblist.c:2286
 msgid "Please enter the name of the chat you want to join."
 msgstr "Syötä liityttävän ryhmäkeskustelun nimi."
 
-#: ../finch/gntblist.c:2286 ../finch/gntnotify.c:394
+#: ../finch/gntblist.c:2288 ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "Liity"
 
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2324 ../finch/gntpounce.c:447 ../pidgin/gtkpounce.c:802
+#: ../finch/gntblist.c:2326 ../finch/gntpounce.c:460 ../pidgin/gtkpounce.c:810
 msgid "Options"
 msgstr "Valinnat"
 
-#: ../finch/gntblist.c:2330
+#: ../finch/gntblist.c:2332
 msgid "Send IM..."
 msgstr "Lähetä pikaviesti..."
 
-#: ../finch/gntblist.c:2334
+#: ../finch/gntblist.c:2337
 msgid "Join Chat..."
 msgstr "Liity ryhmäkeskusteluun..."
 
-#: ../finch/gntblist.c:2338
+#: ../finch/gntblist.c:2342
 msgid "Show"
 msgstr "Näytä"
 
-#: ../finch/gntblist.c:2343
+#: ../finch/gntblist.c:2347
 msgid "Empty groups"
 msgstr "Tyhjät ryhmät"
 
-#: ../finch/gntblist.c:2349
+#: ../finch/gntblist.c:2354
 msgid "Offline buddies"
 msgstr "Poissa linjoilta olevat tuttavat"
 
-#: ../finch/gntblist.c:2355
+#: ../finch/gntblist.c:2361
 msgid "Sort"
 msgstr "Lajittele"
 
-#: ../finch/gntblist.c:2360
+#: ../finch/gntblist.c:2366
 msgid "By Status"
 msgstr "Tilan mukaan"
 
-#: ../finch/gntblist.c:2364 ../pidgin/gtkblist.c:4155
+#: ../finch/gntblist.c:2371 ../pidgin/gtkblist.c:4191
 msgid "Alphabetically"
 msgstr "Aakkosittain"
 
-#: ../finch/gntblist.c:2368
+#: ../finch/gntblist.c:2376
 msgid "By Log Size"
 msgstr "Lokin koon mukaan"
 
@@ -730,7 +744,7 @@
 "File %s could not be imported.\n"
 "Make sure that the file is readable and in PEM format.\n"
 msgstr ""
-"Tiedostoa %s ei voitu tuoda.\n"
+"Tiedostoa %s ei voi tuoda.\n"
 "Varmista että tiedosto on luettavissa ja PEM-muodossa.\n"
 
 #: ../finch/gntcertmgr.c:99 ../pidgin/gtkcertmgr.c:212
@@ -797,29 +811,30 @@
 msgid "Confirm certificate delete"
 msgstr "Vahvista varmenteen poisto"
 
-#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:602
+#: ../finch/gntcertmgr.c:293 ../pidgin/gtkcertmgr.c:603
 msgid "Certificate Manager"
 msgstr "Varmennehallinta"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:666
-#: ../libpurple/protocols/silc/silc.c:1138
+#: ../finch/gntcertmgr.c:298 ../libpurple/protocols/bonjour/bonjour.c:671
+#: ../libpurple/protocols/silc/silc.c:1150
 #: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Isäntä"
 
 #: ../finch/gntcertmgr.c:315 ../finch/gntnotify.c:388 ../pidgin/gtkconv.c:1689
-#: ../pidgin/gtkdebug.c:835
+#: ../pidgin/gtkdebug.c:840
 msgid "Info"
 msgstr "Tiedot"
 
 #. Close button
 #: ../finch/gntcertmgr.c:324 ../finch/gntft.c:237 ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:211 ../finch/gntplugin.c:403 ../finch/gntpounce.c:738
+#: ../finch/gntplugin.c:213 ../finch/gntplugin.c:406 ../finch/gntpounce.c:751
 #: ../finch/gntstatus.c:216 ../libpurple/protocols/msn/msn.c:407
-#: ../libpurple/protocols/silc/util.c:386
+#: ../libpurple/protocols/msnp9/msn.c:403
+#: ../libpurple/protocols/silc/util.c:388
 #: ../libpurple/protocols/silc10/util.c:377 ../pidgin/gtkaccount.c:2474
-#: ../pidgin/gtkrequest.c:273
+#: ../pidgin/gtkrequest.c:323
 msgid "Close"
 msgstr "Sulje"
 
@@ -846,50 +861,50 @@
 "Finch ei yritä uudelleenyhdistää käyttäjätiliä kunnes korjaat virheen ja "
 "otat tilin uudelleen käyttöön."
 
-#: ../finch/gntconn.c:138 ../pidgin/gtkblist.c:4372
+#: ../finch/gntconn.c:138
 msgid "Re-enable Account"
 msgstr "Ota tili uudelleen käyttöön"
 
-#: ../finch/gntconv.c:139
+#: ../finch/gntconv.c:137
 msgid "No such command."
 msgstr "Sellaista komentoa ei ole."
 
-#: ../finch/gntconv.c:143 ../pidgin/gtkconv.c:531
+#: ../finch/gntconv.c:141 ../pidgin/gtkconv.c:531
 msgid "Syntax Error:  You typed the wrong number of arguments to that command."
 msgstr ""
 "Syntaksivirhe: Syötit väärän määrän argumentteja kyseiselle komennolle."
 
-#: ../finch/gntconv.c:148 ../pidgin/gtkconv.c:537
+#: ../finch/gntconv.c:146 ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
 msgstr "Komento epäonnistui tuntemattomasta syystä."
 
-#: ../finch/gntconv.c:153 ../pidgin/gtkconv.c:544
+#: ../finch/gntconv.c:151 ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
 msgstr "Komento toimii vain ryhmäkeskusteluissa, ei pikaviesteissä."
 
-#: ../finch/gntconv.c:156 ../pidgin/gtkconv.c:547
+#: ../finch/gntconv.c:154 ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
 msgstr "Komento toimii vain pikaviesteissä, ei ryhmäkeskusteluissa."
 
-#: ../finch/gntconv.c:160 ../pidgin/gtkconv.c:552
+#: ../finch/gntconv.c:158 ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
 msgstr "Tämä komento ei toimi tälle yhteyskäytännölle."
 
-#: ../finch/gntconv.c:168
+#: ../finch/gntconv.c:166
 msgid "Message was not sent, because you are not signed on."
 msgstr "Viestiä ei lähetetty, koska ei olla kirjauduttu sisään."
 
-#: ../finch/gntconv.c:251
+#: ../finch/gntconv.c:245
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:274
+#: ../finch/gntconv.c:268
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279 ../finch/gntconv.c:801
+#: ../finch/gntconv.c:273 ../finch/gntconv.c:795
 #, c-format
 msgid ""
 "\n"
@@ -898,68 +913,68 @@
 "\n"
 "%s kirjoittaa..."
 
-#: ../finch/gntconv.c:298
+#: ../finch/gntconv.c:292
 msgid "You have left this chat."
 msgstr "Olet poistunut tästä keskustelusta."
 
-#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1416
+#: ../finch/gntconv.c:408 ../pidgin/gtkconv.c:1416
 msgid "Logging started. Future messages in this conversation will be logged."
 msgstr ""
 "Kirjaaminen lokiin aloitettu. Tämän keskustelun viestit kirjataan nyt lokiin."
 
-#: ../finch/gntconv.c:420 ../pidgin/gtkconv.c:1424
+#: ../finch/gntconv.c:414 ../pidgin/gtkconv.c:1424
 msgid ""
 "Logging stopped. Future messages in this conversation will not be logged."
 msgstr ""
 "Kirjaaminen lokiin lopetettu. Tämän keskustelun viestejä ei enää kirjata "
 "lokiin."
 
-#: ../finch/gntconv.c:469
+#: ../finch/gntconv.c:463
 msgid "Send To"
 msgstr "Lähetä käyttäjälle"
 
-#: ../finch/gntconv.c:513
+#: ../finch/gntconv.c:507
 msgid "Conversation"
 msgstr "Keskustelu"
 
-#: ../finch/gntconv.c:519
+#: ../finch/gntconv.c:513
 msgid "Clear Scrollback"
 msgstr "Tyhjennä takaisinvieritys"
 
-#: ../finch/gntconv.c:523 ../finch/gntprefs.c:191
+#: ../finch/gntconv.c:517 ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Näytä aikaleimat"
 
-#: ../finch/gntconv.c:539
+#: ../finch/gntconv.c:533
 msgid "Add Buddy Pounce..."
 msgstr "Lisää tuttavailmoitin..."
 
-#: ../finch/gntconv.c:554
+#: ../finch/gntconv.c:548
 msgid "Enable Logging"
 msgstr "Ota lokiinkirjaus käyttöön"
 
-#: ../finch/gntconv.c:560
+#: ../finch/gntconv.c:554
 msgid "Enable Sounds"
 msgstr "Ota äänet käyttöön"
 
-#: ../finch/gntconv.c:766
+#: ../finch/gntconv.c:760
 msgid "<AUTO-REPLY> "
 msgstr "<AUTOMAATTIVASTAUS> "
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:889
+#: ../finch/gntconv.c:883
 msgid "List of users:\n"
 msgstr "Luettelo käyttäjistä:\n"
 
-#: ../finch/gntconv.c:1051 ../pidgin/gtkconv.c:371
+#: ../finch/gntconv.c:1045 ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
 msgstr "Tuetut vianjäljitysvalinnat ovat: versio"
 
-#: ../finch/gntconv.c:1087 ../pidgin/gtkconv.c:423
+#: ../finch/gntconv.c:1081 ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
 msgstr "Komento ei saatavilla (tässä kontekstissa)."
 
-#: ../finch/gntconv.c:1090 ../pidgin/gtkconv.c:426
+#: ../finch/gntconv.c:1084 ../pidgin/gtkconv.c:426
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -967,7 +982,7 @@
 "Kirjoita \"/help &lt;komento&gt;\" saadaksesi ohjeen tietystä komennosta.\n"
 "Seuraavat komennot ovat saatavilla tässä kontekstissa:\n"
 
-#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7687
+#: ../finch/gntconv.c:1142 ../pidgin/gtkconv.c:7755
 msgid ""
 "say &lt;message&gt;:  Send a message normally as if you weren't using a "
 "command."
@@ -975,61 +990,61 @@
 "say &lt;viesti&gt;: Lähetä viesti normaalisti, niin kuin et olisi "
 "käyttämässä komentoa."
 
-#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7690
+#: ../finch/gntconv.c:1145 ../pidgin/gtkconv.c:7758
 msgid "me &lt;action&gt;:  Send an IRC style action to a buddy or chat."
 msgstr ""
 "me &lt;toiminta&gt;: Lähetä IRC-tyylinen toiminta tuttavalle tai "
 "keskusteluun."
 
-#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7693
+#: ../finch/gntconv.c:1148 ../pidgin/gtkconv.c:7761
 msgid ""
 "debug &lt;option&gt;:  Send various debug information to the current "
 "conversation."
 msgstr ""
 "debug &lt;valinta&gt;: Lähetä eri debug-tietoja senhetkiseen keskusteluun."
 
-#: ../finch/gntconv.c:1157 ../pidgin/gtkconv.c:7696
+#: ../finch/gntconv.c:1151 ../pidgin/gtkconv.c:7764
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Tyhjentää keskustelun"
 
-#: ../finch/gntconv.c:1160 ../pidgin/gtkconv.c:7702
+#: ../finch/gntconv.c:1154 ../pidgin/gtkconv.c:7770
 msgid "help &lt;command&gt;:  Help on a specific command."
 msgstr "help &lt;komento&gt;: Ohje tietylle komennolle."
 
-#: ../finch/gntconv.c:1163
+#: ../finch/gntconv.c:1157
 msgid "users:  Show the list of users in the chat."
 msgstr "users:  Näytä luettelo keskustelussa olevista käyttäjistä"
 
-#: ../finch/gntconv.c:1168
+#: ../finch/gntconv.c:1162
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Näytä liitännäiset-ikkuna."
 
+#: ../finch/gntconv.c:1165
+msgid "buddylist: Show the buddylist."
+msgstr "buddylist: Näytä tuttavaluettelo."
+
+#: ../finch/gntconv.c:1168
+msgid "accounts: Show the accounts window."
+msgstr "accounts: Näytä käyttäjätilit-ikkuna."
+
 #: ../finch/gntconv.c:1171
-msgid "buddylist: Show the buddylist."
-msgstr "buddylist: Näytä tuttavaluettelo."
+msgid "debugwin: Show the debug window."
+msgstr "debugwin: Näytä virheenjäljitysikkuna."
 
 #: ../finch/gntconv.c:1174
-msgid "accounts: Show the accounts window."
-msgstr "accounts: Näytä käyttäjätilit-ikkuna."
+msgid "prefs: Show the preference window."
+msgstr "prefs: Näytä asetukset-ikkuna."
 
 #: ../finch/gntconv.c:1177
-msgid "debugwin: Show the debug window."
-msgstr "debugwin: Näytä virheenjäljitysikkuna."
-
-#: ../finch/gntconv.c:1180
-msgid "prefs: Show the preference window."
-msgstr "prefs: Näytä asetukset-ikkuna."
-
-#: ../finch/gntconv.c:1183
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Näytä tallennetut tilat -ikkuna"
 
 #: ../finch/gntdebug.c:231 ../pidgin/gtkconv.c:989 ../pidgin/gtkconv.c:2663
-#: ../pidgin/gtkdebug.c:219 ../pidgin/gtkft.c:543
+#: ../pidgin/gtkdebug.c:220 ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "Tiedoston avaaminen epäonnistui."
 
-#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:695
+#: ../finch/gntdebug.c:271 ../finch/gntui.c:86 ../pidgin/gtkdebug.c:700
 msgid "Debug Window"
 msgstr "Virheenjäljitysikkuna"
 
@@ -1037,7 +1052,7 @@
 #. * 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:292 ../pidgin/gtkdebug.c:754
+#: ../finch/gntdebug.c:292 ../pidgin/gtkdebug.c:759
 msgid "Clear"
 msgstr "Tyhjennä"
 
@@ -1045,7 +1060,7 @@
 msgid "Filter:"
 msgstr "Suodatin:"
 
-#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:763
+#: ../finch/gntdebug.c:309 ../pidgin/gtkdebug.c:768
 msgid "Pause"
 msgstr "Tauko"
 
@@ -1082,26 +1097,27 @@
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
 #: ../finch/gntft.c:201 ../finch/gntstatus.c:547 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:358
-#: ../libpurple/protocols/gg/gg.c:1040 ../libpurple/protocols/gg/gg.c:1577
-#: ../libpurple/protocols/gg/gg.c:1585
+#: ../libpurple/protocols/bonjour/bonjour.c:363
+#: ../libpurple/protocols/gg/gg.c:1041 ../libpurple/protocols/gg/gg.c:1584
+#: ../libpurple/protocols/gg/gg.c:1592
 #: ../libpurple/protocols/jabber/buddy.c:778
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:603 ../libpurple/protocols/msn/msn.c:613
-#: ../libpurple/protocols/msn/msn.c:618 ../libpurple/protocols/msn/msn.c:621
-#: ../libpurple/protocols/novell/novell.c:2840
+#: ../libpurple/protocols/jabber/jabber.c:1538
+#: ../libpurple/protocols/msn/msn.c:621 ../libpurple/protocols/msn/msn.c:631
+#: ../libpurple/protocols/msn/msn.c:636 ../libpurple/protocols/msn/msn.c:639
+#: ../libpurple/protocols/msnp9/msn.c:543
+#: ../libpurple/protocols/novell/novell.c:2852
 #: ../libpurple/protocols/oscar/oscar.c:821
 #: ../libpurple/protocols/oscar/oscar.c:826
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2715
-#: ../libpurple/protocols/oscar/oscar.c:3795
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3250 ../pidgin/gtkblist.c:3305
-#: ../pidgin/gtkblist.c:3319 ../pidgin/gtkblist.c:3321
-#: ../pidgin/gtksavedstatuses.c:999 ../pidgin/gtksavedstatuses.c:1144
+#: ../libpurple/protocols/oscar/oscar.c:2710
+#: ../libpurple/protocols/oscar/oscar.c:3790
+#: ../libpurple/protocols/sametime/sametime.c:3305
+#: ../libpurple/protocols/sametime/sametime.c:4196
+#: ../libpurple/protocols/yahoo/yahoo.c:3259 ../pidgin/gtkblist.c:3338
+#: ../pidgin/gtkblist.c:3352 ../pidgin/gtkblist.c:3354
+#: ../pidgin/gtksavedstatuses.c:1005 ../pidgin/gtksavedstatuses.c:1150
 msgid "Status"
 msgstr "Tila"
 
@@ -1144,7 +1160,8 @@
 msgid "Finished"
 msgstr "Valmis"
 
-#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:396
+#: ../finch/gntft.c:437 ../libpurple/protocols/msn/session.c:404
+#: ../libpurple/protocols/msnp9/session.c:357
 msgid "Transferring"
 msgstr "Siirtää"
 
@@ -1156,11 +1173,11 @@
 msgid "You have mail!"
 msgstr "Sinulle on postia."
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:518
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:519
 msgid "Sender"
 msgstr "Lähettäjä"
 
-#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:525
+#: ../finch/gntnotify.c:174 ../pidgin/gtknotify.c:526
 msgid "Subject"
 msgstr "Aihe"
 
@@ -1171,17 +1188,17 @@
 msgstr[0] "%s (%s): %d uusi viesti."
 msgstr[1] "%s (%s): %d uutta viestiä."
 
-#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:341
+#: ../finch/gntnotify.c:226 ../pidgin/gtknotify.c:342
 msgid "New Mail"
 msgstr "Uusi sähköposti"
 
-#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:948
+#: ../finch/gntnotify.c:291 ../pidgin/gtknotify.c:949
 #, c-format
 msgid "Info for %s"
 msgstr "%s tiedot"
 
 #: ../finch/gntnotify.c:292 ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:949
+#: ../pidgin/gtknotify.c:950
 msgid "Buddy Information"
 msgstr "Tuttavan tiedot"
 
@@ -1193,7 +1210,7 @@
 msgid "IM"
 msgstr "Pikaviesti"
 
-#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3473
+#: ../finch/gntnotify.c:397 ../libpurple/protocols/sametime/sametime.c:3515
 msgid "Invite"
 msgstr "Kutsu"
 
@@ -1201,19 +1218,19 @@
 msgid "(none)"
 msgstr "(ei mitään)"
 
-#: ../finch/gntplugin.c:76 ../finch/gntplugin.c:85
+#: ../finch/gntplugin.c:77 ../finch/gntplugin.c:86
 msgid "ERROR"
 msgstr "VIRHE"
 
-#: ../finch/gntplugin.c:76
+#: ../finch/gntplugin.c:77
 msgid "loading plugin failed"
 msgstr "liitännäisen lataus epäonnistui"
 
-#: ../finch/gntplugin.c:85
+#: ../finch/gntplugin.c:86
 msgid "unloading plugin failed"
 msgstr "liitännäisen poistaminen käytöstä epäonnistui"
 
-#: ../finch/gntplugin.c:130
+#: ../finch/gntplugin.c:132
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1230,43 +1247,43 @@
 "Sivusto: %s\n"
 "Tiedostonimi: %s\n"
 
-#: ../finch/gntplugin.c:188
+#: ../finch/gntplugin.c:190
 msgid "Plugin need to be loaded before you can configure it."
 msgstr ""
 "Liitännäinen tulee olla käytössä ennen kuin sen asetuksia voidaan muuttaa."
 
-#: ../finch/gntplugin.c:236
+#: ../finch/gntplugin.c:238
 msgid "No configuration options for this plugin."
 msgstr "Tälle liitännäiselle ei ole asetuksia."
 
-#: ../finch/gntplugin.c:257
+#: ../finch/gntplugin.c:259
 msgid "Error loading plugin"
 msgstr "Liitännäistä ladattaessa tapahtui virhe"
 
-#: ../finch/gntplugin.c:258
+#: ../finch/gntplugin.c:260
 msgid "The selected file is not a valid plugin."
 msgstr "Valittu tiedosto ei ole kelvollinen liitännäinen."
 
-#: ../finch/gntplugin.c:259
+#: ../finch/gntplugin.c:261
 msgid ""
 "Please open the debug window and try again to see the exact error message."
 msgstr ""
 "Avaa virheenjäljitysikkuna ja yritä uudelleen nähdäksesi tarkan virheviestin."
 
-#: ../finch/gntplugin.c:322
+#: ../finch/gntplugin.c:324
 msgid "Select plugin to install"
 msgstr "Valitse asennettava liitännäinen"
 
-#: ../finch/gntplugin.c:348
+#: ../finch/gntplugin.c:350
 msgid "You can (un)load plugins from the following list."
 msgstr ""
 "Voit ottaa käyttöön/pois käytöstä liitännäisiä seuraavasta luettelosta."
 
-#: ../finch/gntplugin.c:399
+#: ../finch/gntplugin.c:401
 msgid "Install Plugin..."
 msgstr "Asenna liitännäinen..."
 
-#: ../finch/gntplugin.c:408
+#: ../finch/gntplugin.c:411
 msgid "Configure Plugin"
 msgstr "Liitännäisen asetukset"
 
@@ -1275,186 +1292,186 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:464 ../finch/gntplugin.c:471 ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2168
+#: ../finch/gntplugin.c:467 ../finch/gntplugin.c:474 ../finch/gntprefs.c:264
+#: ../finch/gntui.c:90 ../pidgin/gtkdocklet.c:717 ../pidgin/gtkprefs.c:2169
 msgid "Preferences"
 msgstr "Asetukset"
 
-#: ../finch/gntpounce.c:183 ../pidgin/gtkpounce.c:256
+#: ../finch/gntpounce.c:194 ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Syötä ilmoitettava tuttava."
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:524
+#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
 msgid "New Buddy Pounce"
 msgstr "Uusi tuttavailmoitin"
 
-#: ../finch/gntpounce.c:328 ../pidgin/gtkpounce.c:524
+#: ../finch/gntpounce.c:339 ../pidgin/gtkpounce.c:531
 msgid "Edit Buddy Pounce"
 msgstr "Muokkaa tuttavailmoitinta"
 
-#: ../finch/gntpounce.c:333
+#: ../finch/gntpounce.c:344
 msgid "Pounce Who"
 msgstr "Kenestä ilmoitetaan"
 
 #. Account:
-#: ../finch/gntpounce.c:336 ../finch/gntstatus.c:456
+#: ../finch/gntpounce.c:347 ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Käyttäjätili:"
 
-#: ../finch/gntpounce.c:358
+#: ../finch/gntpounce.c:369
 msgid "Buddy name:"
 msgstr "Tuttavan nimi:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374 ../pidgin/gtkpounce.c:592
+#: ../finch/gntpounce.c:387 ../pidgin/gtkpounce.c:600
 msgid "Pounce When Buddy..."
 msgstr "Ilmoita kun tuttava..."
 
-#: ../finch/gntpounce.c:376
+#: ../finch/gntpounce.c:389
 msgid "Signs on"
 msgstr "kirjautuu sisään"
 
-#: ../finch/gntpounce.c:377
+#: ../finch/gntpounce.c:390
 msgid "Signs off"
 msgstr "kirjautuu ulos"
 
-#: ../finch/gntpounce.c:378
+#: ../finch/gntpounce.c:391
 msgid "Goes away"
 msgstr "poistuu"
 
-#: ../finch/gntpounce.c:379
+#: ../finch/gntpounce.c:392
 msgid "Returns from away"
 msgstr "palaa"
 
-#: ../finch/gntpounce.c:380
+#: ../finch/gntpounce.c:393
 msgid "Becomes idle"
 msgstr "on jouten"
 
-#: ../finch/gntpounce.c:381
+#: ../finch/gntpounce.c:394
 msgid "Is no longer idle"
 msgstr "ei enää ole jouten"
 
-#: ../finch/gntpounce.c:382
+#: ../finch/gntpounce.c:395
 msgid "Starts typing"
 msgstr "alkaa kirjoittaa"
 
-#: ../finch/gntpounce.c:383
+#: ../finch/gntpounce.c:396
 msgid "Pauses while typing"
 msgstr "keskeyttää kirjoittamisen"
 
-#: ../finch/gntpounce.c:384
+#: ../finch/gntpounce.c:397
 msgid "Stops typing"
 msgstr "lopettaa kirjoittamisen"
 
-#: ../finch/gntpounce.c:385
+#: ../finch/gntpounce.c:398
 msgid "Sends a message"
 msgstr "lähettää viestin"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414 ../pidgin/gtkpounce.c:653
+#: ../finch/gntpounce.c:427 ../pidgin/gtkpounce.c:661
 msgid "Action"
 msgstr "Toiminto"
 
-#: ../finch/gntpounce.c:416
+#: ../finch/gntpounce.c:429
 msgid "Open an IM window"
 msgstr "Avaa pikaviesti-ikkuna"
 
-#: ../finch/gntpounce.c:417
+#: ../finch/gntpounce.c:430
 msgid "Pop up a notification"
 msgstr "Ponnahdusilmoitus"
 
-#: ../finch/gntpounce.c:418
+#: ../finch/gntpounce.c:431
 msgid "Send a message"
 msgstr "Lähetä viesti"
 
-#: ../finch/gntpounce.c:419
+#: ../finch/gntpounce.c:432
 msgid "Execute a command"
 msgstr "Suorita komento"
 
-#: ../finch/gntpounce.c:420
+#: ../finch/gntpounce.c:433
 msgid "Play a sound"
 msgstr "Soita ääni"
 
-#: ../finch/gntpounce.c:448
+#: ../finch/gntpounce.c:461
 msgid "Pounce only when my status is not available"
 msgstr "Ilmoita vain kun tilani on \"tavoittamattomissa\""
 
-#: ../finch/gntpounce.c:450 ../pidgin/gtkpounce.c:1293
+#: ../finch/gntpounce.c:463 ../pidgin/gtkpounce.c:1301
 msgid "Recurring"
 msgstr "Toistuva"
 
-#: ../finch/gntpounce.c:618
+#: ../finch/gntpounce.c:631
 msgid "Cannot create pounce"
-msgstr "Ilmoitinta ei voitu luoda"
-
-#: ../finch/gntpounce.c:619
+msgstr "Ilmoitinta ei voi luoda"
+
+#: ../finch/gntpounce.c:632
 msgid "You do not have any accounts."
 msgstr "Yhtäkään käyttäjätiliä ei ole määritelty."
 
-#: ../finch/gntpounce.c:620
+#: ../finch/gntpounce.c:633
 msgid "You must create an account first before you can create a pounce."
 msgstr "Käyttäjätili tulee luoda ennen ilmoittimen luomista."
 
-#: ../finch/gntpounce.c:662 ../pidgin/gtkpounce.c:1108
+#: ../finch/gntpounce.c:675 ../pidgin/gtkpounce.c:1116
 #, c-format
 msgid "Are you sure you want to delete the pounce on %s for %s?"
 msgstr "Haluatko varmasti poistaa ilmoituksen %s käyttäjältä %s?"
 
-#: ../finch/gntpounce.c:696 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1337
+#: ../finch/gntpounce.c:709 ../finch/gntui.c:84 ../pidgin/gtkpounce.c:1352
 msgid "Buddy Pounces"
 msgstr "Tuttavailmoittimet"
 
-#: ../finch/gntpounce.c:810 ../pidgin/gtkpounce.c:1464
+#: ../finch/gntpounce.c:823 ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s alkoi kirjoittaa sinulle (%s)"
 
-#: ../finch/gntpounce.c:812 ../pidgin/gtkpounce.c:1466
+#: ../finch/gntpounce.c:825 ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s keskeytti kirjoittamisen sinulle (%s)"
 
-#: ../finch/gntpounce.c:814 ../pidgin/gtkpounce.c:1468
+#: ../finch/gntpounce.c:827 ../pidgin/gtkpounce.c:1484
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s on kirjautunut sisään (%s)"
 
-#: ../finch/gntpounce.c:816 ../pidgin/gtkpounce.c:1470
+#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1486
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s on palannut oltuaan jouten (%s)"
 
-#: ../finch/gntpounce.c:818 ../pidgin/gtkpounce.c:1472
+#: ../finch/gntpounce.c:831 ../pidgin/gtkpounce.c:1488
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s on palannut oltuaan poissa (%s)"
 
-#: ../finch/gntpounce.c:820 ../pidgin/gtkpounce.c:1474
+#: ../finch/gntpounce.c:833 ../pidgin/gtkpounce.c:1490
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s on lopettanut kirjoittamisen sinulle (%s)"
 
-#: ../finch/gntpounce.c:822 ../pidgin/gtkpounce.c:1476
+#: ../finch/gntpounce.c:835 ../pidgin/gtkpounce.c:1492
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s on kirjautunut ulos (%s)"
 
-#: ../finch/gntpounce.c:824 ../pidgin/gtkpounce.c:1478
+#: ../finch/gntpounce.c:837 ../pidgin/gtkpounce.c:1494
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s on jouten (%s)"
 
-#: ../finch/gntpounce.c:826 ../pidgin/gtkpounce.c:1480
+#: ../finch/gntpounce.c:839 ../pidgin/gtkpounce.c:1496
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s on poissa. (%s)"
 
-#: ../finch/gntpounce.c:828 ../pidgin/gtkpounce.c:1482
+#: ../finch/gntpounce.c:841 ../pidgin/gtkpounce.c:1498
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s on lähettämässä sinulle viestiä. (%s)"
 
-#: ../finch/gntpounce.c:829 ../pidgin/gtkpounce.c:1483
+#: ../finch/gntpounce.c:842 ../pidgin/gtkpounce.c:1499
 #, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Tuntematon ilmoitinviesti. Raportoi tästä!"
@@ -1463,12 +1480,12 @@
 msgid "Based on keyboard use"
 msgstr "Perustuen näppäimistön käyttöön"
 
-#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2030
+#: ../finch/gntprefs.c:94 ../pidgin/gtkprefs.c:2031
 msgid "From last sent message"
 msgstr "Viimeisestä lähetetystä viestistä"
 
-#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:2029 ../pidgin/gtkprefs.c:2043
+#: ../finch/gntprefs.c:96 ../pidgin/gtkprefs.c:900 ../pidgin/gtkprefs.c:908
+#: ../pidgin/gtkprefs.c:2030 ../pidgin/gtkprefs.c:2044
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Ei koskaan"
@@ -1485,15 +1502,15 @@
 msgid "Notify buddies when you are typing"
 msgstr "Ilmoita tuttaville kun kirjoitat heille"
 
-#: ../finch/gntprefs.c:198
+#: ../finch/gntprefs.c:198 ../finch/plugins/gnthistory.c:156
 msgid "Log format"
 msgstr "Lokin muoto"
 
-#: ../finch/gntprefs.c:199
+#: ../finch/gntprefs.c:199 ../finch/plugins/gnthistory.c:146
 msgid "Log IMs"
 msgstr "Kirjaa pikaviestit"
 
-#: ../finch/gntprefs.c:200
+#: ../finch/gntprefs.c:200 ../finch/plugins/gnthistory.c:147
 msgid "Log chats"
 msgstr "Kirjaa ryhmäkeskustelut"
 
@@ -1518,12 +1535,13 @@
 msgstr "Vaihda tila seuraavaksi"
 
 #. Conversations
-#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:994 ../pidgin/gtkprefs.c:2134
+#: ../finch/gntprefs.c:259 ../pidgin/gtkprefs.c:995 ../pidgin/gtkprefs.c:2135
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Keskustelut"
 
-#: ../finch/gntprefs.c:260 ../pidgin/gtkprefs.c:1562 ../pidgin/gtkprefs.c:2145
+#: ../finch/gntprefs.c:260 ../finch/plugins/gnthistory.c:154
+#: ../pidgin/gtkprefs.c:1563 ../pidgin/gtkprefs.c:2146
 msgid "Logging"
 msgstr "Kirjataan lokiin"
 
@@ -1531,13 +1549,13 @@
 msgid "Not implemented yet."
 msgstr "Ominaisuutta ei ole vielä toteutettu."
 
-#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1555
-#: ../pidgin/gtkrequest.c:1601
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1699
+#: ../pidgin/gtkrequest.c:1745
 msgid "Save File..."
 msgstr "Tallenna tiedosto..."
 
-#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
+#: ../finch/gntrequest.c:661 ../pidgin/gtkrequest.c:1700
+#: ../pidgin/gtkrequest.c:1746
 msgid "Open File..."
 msgstr "Avaa tiedosto..."
 
@@ -1587,10 +1605,10 @@
 
 #: ../finch/gntsound.c:362 ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
-msgstr "GStreameria ei voitu alustaa."
-
-#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1686
-#: ../pidgin/gtkprefs.c:1775 ../pidgin/gtkprefs.c:1971
+msgstr "GStreameria ei voi alustaa."
+
+#: ../finch/gntsound.c:716 ../finch/gntsound.c:802 ../pidgin/gtkprefs.c:1687
+#: ../pidgin/gtkprefs.c:1776 ../pidgin/gtkprefs.c:1972
 msgid "(default)"
 msgstr "(oletus)"
 
@@ -1606,7 +1624,7 @@
 msgid "Profiles"
 msgstr "Profiilit"
 
-#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1816
+#: ../finch/gntsound.c:954 ../pidgin/gtkprefs.c:1817
 msgid "Automatic"
 msgstr "Automaattinen"
 
@@ -1614,7 +1632,7 @@
 msgid "Console Beep"
 msgstr "Konsoliäänimerkki"
 
-#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1820
+#: ../finch/gntsound.c:958 ../pidgin/gtkprefs.c:1821
 msgid "Command"
 msgstr "Komento"
 
@@ -1622,7 +1640,7 @@
 msgid "No Sound"
 msgstr "Ei ääntä"
 
-#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1811
+#: ../finch/gntsound.c:961 ../pidgin/gtkprefs.c:1812
 msgid "Sound Method"
 msgstr "Äänimenetelmä"
 
@@ -1640,7 +1658,7 @@
 "(%s tiedostonimeksi)"
 
 #. Sound options
-#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1855
+#: ../finch/gntsound.c:981 ../pidgin/gtkprefs.c:1856
 msgid "Sound Options"
 msgstr "Äänivalinnat"
 
@@ -1648,18 +1666,18 @@
 msgid "Sounds when conversation has focus"
 msgstr "Äänet kun keskusteluikkuna on aktiivinen"
 
-#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:897 ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1862 ../pidgin/plugins/timestamp_format.c:42
+#: ../finch/gntsound.c:990 ../pidgin/gtkprefs.c:898 ../pidgin/gtkprefs.c:910
+#: ../pidgin/gtkprefs.c:1863 ../pidgin/plugins/timestamp_format.c:42
 #: ../pidgin/plugins/timestamp_format.c:51
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Aina"
 
-#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1860
+#: ../finch/gntsound.c:991 ../pidgin/gtkprefs.c:1861
 msgid "Only when available"
 msgstr "Kun tavoitettavissa"
 
-#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1861
+#: ../finch/gntsound.c:992 ../pidgin/gtkprefs.c:1862
 msgid "Only when not available"
 msgstr "Kun tavoittamattomissa"
 
@@ -1668,11 +1686,11 @@
 msgstr "Äänenvoimakkuus(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1897
+#: ../finch/gntsound.c:1018 ../pidgin/gtkprefs.c:1898
 msgid "Sound Events"
 msgstr "Äänitapahtumat"
 
-#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1956
+#: ../finch/gntsound.c:1020 ../pidgin/gtkprefs.c:1957
 msgid "Event"
 msgstr "Tapahtuma"
 
@@ -1680,15 +1698,15 @@
 msgid "File"
 msgstr "Tiedosto"
 
-#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1975
+#: ../finch/gntsound.c:1039 ../pidgin/gtkprefs.c:1976
 msgid "Test"
 msgstr "Kokeile"
 
-#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1979
+#: ../finch/gntsound.c:1042 ../pidgin/gtkprefs.c:1980
 msgid "Reset"
 msgstr "Nollaa"
 
-#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1983
+#: ../finch/gntsound.c:1045 ../pidgin/gtkprefs.c:1984
 msgid "Choose..."
 msgstr "Valitse..."
 
@@ -1708,7 +1726,8 @@
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:539
 #: ../libpurple/protocols/jabber/buddy.c:298
 #: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1486
+#: ../libpurple/protocols/msn/msn.c:725
+#: ../libpurple/protocols/novell/novell.c:1493
 #: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Otsikko"
@@ -1726,44 +1745,44 @@
 #. not independent
 #. Attributes - each status can have a message.
 #: ../finch/gntstatus.c:183 ../finch/gntstatus.c:564 ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:270
-#: ../libpurple/protocols/bonjour/bonjour.c:277
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/gg/gg.c:1078 ../libpurple/protocols/gg/gg.c:1580
-#: ../libpurple/protocols/gg/gg.c:1598 ../libpurple/protocols/gg/gg.c:1608
-#: ../libpurple/protocols/gg/gg.c:1614 ../libpurple/protocols/gg/gg.c:1623
-#: ../libpurple/protocols/gg/gg.c:1628 ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1532
-#: ../libpurple/protocols/jabber/jabber.c:1555
-#: ../libpurple/protocols/jabber/jabber.c:1578
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1649
-#: ../libpurple/protocols/msn/msn.c:658 ../libpurple/protocols/msn/msn.c:665
-#: ../libpurple/protocols/msn/msn.c:672 ../libpurple/protocols/msn/msn.c:679
-#: ../libpurple/protocols/msn/msn.c:685 ../libpurple/protocols/msn/msn.c:691
+#: ../libpurple/protocols/bonjour/bonjour.c:275
+#: ../libpurple/protocols/bonjour/bonjour.c:282
+#: ../libpurple/protocols/bonjour/bonjour.c:365
+#: ../libpurple/protocols/gg/gg.c:1079 ../libpurple/protocols/gg/gg.c:1587
+#: ../libpurple/protocols/gg/gg.c:1605 ../libpurple/protocols/gg/gg.c:1615
+#: ../libpurple/protocols/gg/gg.c:1621 ../libpurple/protocols/gg/gg.c:1630
+#: ../libpurple/protocols/gg/gg.c:1635 ../libpurple/protocols/irc/irc.c:238
+#: ../libpurple/protocols/jabber/jabber.c:1570
+#: ../libpurple/protocols/jabber/jabber.c:1584
+#: ../libpurple/protocols/jabber/jabber.c:1598
+#: ../libpurple/protocols/jabber/jabber.c:1612
+#: ../libpurple/protocols/jabber/jabber.c:1626
+#: ../libpurple/protocols/jabber/jabber.c:1642
+#: ../libpurple/protocols/msn/msn.c:677 ../libpurple/protocols/msn/msn.c:683
+#: ../libpurple/protocols/msn/msn.c:689 ../libpurple/protocols/msn/msn.c:695
+#: ../libpurple/protocols/msn/msn.c:700 ../libpurple/protocols/msn/msn.c:705
 #: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2843
-#: ../libpurple/protocols/novell/novell.c:2946
-#: ../libpurple/protocols/novell/novell.c:2952
+#: ../libpurple/protocols/novell/novell.c:2855
 #: ../libpurple/protocols/novell/novell.c:2958
-#: ../libpurple/protocols/oscar/oscar.c:5609
-#: ../libpurple/protocols/oscar/oscar.c:5827
-#: ../libpurple/protocols/oscar/oscar.c:5841
-#: ../libpurple/protocols/oscar/oscar.c:5857
-#: ../libpurple/protocols/oscar/oscar.c:5864
-#: ../libpurple/protocols/oscar/oscar.c:5871
-#: ../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/novell/novell.c:2964
+#: ../libpurple/protocols/novell/novell.c:2970
+#: ../libpurple/protocols/oscar/oscar.c:5604
+#: ../libpurple/protocols/oscar/oscar.c:5822
+#: ../libpurple/protocols/oscar/oscar.c:5836
+#: ../libpurple/protocols/oscar/oscar.c:5852
+#: ../libpurple/protocols/oscar/oscar.c:5859
+#: ../libpurple/protocols/oscar/oscar.c:5866
+#: ../libpurple/protocols/sametime/sametime.c:3328
+#: ../libpurple/protocols/sametime/sametime.c:3334
+#: ../libpurple/protocols/sametime/sametime.c:3340
+#: ../libpurple/protocols/sametime/sametime.c:3419
 #: ../libpurple/protocols/silc/buddy.c:1554
 #: ../libpurple/protocols/silc10/buddy.c:1554
 #: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3753
-#: ../libpurple/protocols/yahoo/yahoo.c:3759
+#: ../libpurple/protocols/yahoo/yahoo.c:3762
+#: ../libpurple/protocols/yahoo/yahoo.c:3768
 #: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1010
+#: ../pidgin/gtksavedstatuses.c:526 ../pidgin/gtksavedstatuses.c:1016
 msgid "Message"
 msgstr "Viesti"
 
@@ -1817,7 +1836,7 @@
 msgid "Certificates"
 msgstr "Varmenteet"
 
-#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2136
+#: ../finch/gntui.c:89 ../pidgin/gtkprefs.c:2137
 msgid "Sounds"
 msgstr "Äänet"
 
@@ -1919,16 +1938,16 @@
 msgid "Toaster plugin"
 msgstr "Leivänpaahdin-liitännäinen"
 
-#: ../finch/plugins/gnthistory.c:116 ../pidgin/plugins/history.c:125
+#: ../finch/plugins/gnthistory.c:117 ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Keskustelu käyttäjän %s kanssa %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138 ../pidgin/plugins/history.c:153
+#: ../finch/plugins/gnthistory.c:175 ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "Historia-liitännäinen vaatii lokiinkirjauksen käyttöä"
 
-#: ../finch/plugins/gnthistory.c:139 ../pidgin/plugins/history.c:154
+#: ../finch/plugins/gnthistory.c:176 ../pidgin/plugins/history.c:154
 msgid ""
 "Logging can be enabled from Tools -> Preferences -> Logging.\n"
 "\n"
@@ -1941,15 +1960,15 @@
 "Lokien käyttöönotto pikaviesteille ja/tai ryhmäkeskusteluille ottaa käyttöön "
 "historiatoiminnon vastaaville keskustelutyypeille."
 
-#: ../finch/plugins/gnthistory.c:179
+#: ../finch/plugins/gnthistory.c:221
 msgid "GntHistory"
 msgstr "GntHistory"
 
-#: ../finch/plugins/gnthistory.c:181 ../pidgin/plugins/history.c:197
+#: ../finch/plugins/gnthistory.c:223 ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Näyttää osan edellistä keskustelua uudessa keskustelussa."
 
-#: ../finch/plugins/gnthistory.c:182 ../pidgin/plugins/history.c:198
+#: ../finch/plugins/gnthistory.c:224 ../pidgin/plugins/history.c:198
 msgid ""
 "When a new conversation is opened this plugin will insert the last "
 "conversation into the current conversation."
@@ -1974,89 +1993,88 @@
 msgid "Lastlog plugin."
 msgstr "Lastlog-liitännäinen."
 
-#: ../libpurple/account.c:791
+#: ../libpurple/account.c:875
 msgid "accounts"
 msgstr "käyttäjätilit"
 
-#: ../libpurple/account.c:958 ../libpurple/protocols/jabber/auth.c:195
+#: ../libpurple/account.c:1050 ../libpurple/protocols/jabber/auth.c:199
 msgid "Password is required to sign on."
 msgstr "Salasana tarvitaan kirjautumiseen."
 
-#: ../libpurple/account.c:992
+#: ../libpurple/account.c:1084
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Anna salasana käyttäjätilille %s (%s)"
 
-#: ../libpurple/account.c:999
+#: ../libpurple/account.c:1091
 msgid "Enter Password"
 msgstr "Anna salasana"
 
-#: ../libpurple/account.c:1004
+#: ../libpurple/account.c:1096
 msgid "Save password"
 msgstr "Tallenna salasana"
 
-#: ../libpurple/account.c:1039 ../libpurple/connection.c:105
+#: ../libpurple/account.c:1131 ../libpurple/connection.c:105
 #: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "%s-yhteyskäytäntöliitännäinen puuttuu"
 
-#: ../libpurple/account.c:1041 ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4367
+#: ../libpurple/account.c:1133 ../libpurple/connection.c:108
 msgid "Connection Error"
 msgstr "Yhteysvirhe"
 
-#: ../libpurple/account.c:1199 ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1691
+#: ../libpurple/account.c:1330 ../libpurple/protocols/gg/gg.c:708
+#: ../libpurple/protocols/jabber/jabber.c:1698
 msgid "New passwords do not match."
 msgstr "Uudet salasanat eivät täsmää."
 
-#: ../libpurple/account.c:1208
+#: ../libpurple/account.c:1339
 msgid "Fill out all fields completely."
 msgstr "Täytä kaikki kentät kokonaan."
 
-#: ../libpurple/account.c:1231
+#: ../libpurple/account.c:1362
 msgid "Original password"
 msgstr "Vanha salasana"
 
-#: ../libpurple/account.c:1238
+#: ../libpurple/account.c:1369
 msgid "New password"
 msgstr "Uusi salasana"
 
-#: ../libpurple/account.c:1245
+#: ../libpurple/account.c:1376
 msgid "New password (again)"
 msgstr "Uusi salasana (uudelleen)"
 
-#: ../libpurple/account.c:1251
+#: ../libpurple/account.c:1382
 #, c-format
 msgid "Change password for %s"
 msgstr "Vaihda %s:n salasana"
 
-#: ../libpurple/account.c:1259
+#: ../libpurple/account.c:1390
 msgid "Please enter your current password and your new password."
 msgstr "Anna nykyinen sekä uusi salasana."
 
-#: ../libpurple/account.c:1290
+#: ../libpurple/account.c:1421
 #, c-format
 msgid "Change user information for %s"
 msgstr "Vaihda käyttäjätietoja - %s"
 
-#: ../libpurple/account.c:1293 ../libpurple/protocols/toc/toc.c:1670
+#: ../libpurple/account.c:1424 ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Aseta käyttäjätiedot"
 
-#: ../libpurple/account.c:1764 ../libpurple/protocols/gg/gg.c:1018
+#: ../libpurple/account.c:1895 ../libpurple/protocols/gg/gg.c:1019
 #: ../libpurple/protocols/jabber/buddy.c:782
 #: ../libpurple/protocols/jabber/buddy.c:2030
 #: ../libpurple/protocols/jabber/buddy.c:2047
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/qq/qq.c:232 ../pidgin/gtkft.c:160
+#: ../libpurple/protocols/novell/novell.c:2848
+#: ../libpurple/protocols/qq/qq.c:233 ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Tuntematon"
 
 #: ../libpurple/blist.c:521 ../libpurple/blist.c:1321
 #: ../libpurple/blist.c:1531 ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3250 ../pidgin/gtkblist.c:5720
+#: ../libpurple/protocols/myspace/myspace.c:3272 ../pidgin/gtkblist.c:6059
 #: ../pidgin/plugins/gevolution/gevo-util.c:67
 #: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
@@ -2064,7 +2082,7 @@
 
 #: ../libpurple/blist.c:548
 msgid "buddy list"
-msgstr "tuttavalista"
+msgstr "tuttavat"
 
 #: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
@@ -2092,33 +2110,33 @@
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:885
+#: ../libpurple/certificate.c:886
 msgid "Certificate Authorities"
 msgstr "Varmentajat"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1053
+#: ../libpurple/certificate.c:1054
 msgid "SSL Peers Cache"
 msgstr "SSL Peers -välimuisti"
 
 #. Make messages
-#: ../libpurple/certificate.c:1184
+#: ../libpurple/certificate.c:1185
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "Hyväksy varmenne kohteelle %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1190
+#: ../libpurple/certificate.c:1191
 msgid "SSL Certificate Verification"
 msgstr "SSL-varmenteen tarkistus"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1199
+#: ../libpurple/certificate.c:1201
 msgid "Accept"
 msgstr "Hyväksy"
 
-#: ../libpurple/certificate.c:1200 ../libpurple/protocols/qq/buddy_opt.c:214
+#: ../libpurple/certificate.c:1202 ../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:90
@@ -2126,7 +2144,7 @@
 msgid "Reject"
 msgstr "Kieltäydy"
 
-#: ../libpurple/certificate.c:1201
+#: ../libpurple/certificate.c:1203
 msgid "_View Certificate..."
 msgstr "_Näytä varmenne..."
 
@@ -2134,7 +2152,7 @@
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1301
+#: ../libpurple/certificate.c:1303
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
@@ -2145,7 +2163,7 @@
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1326
+#: ../libpurple/certificate.c:1328
 #, c-format
 msgid ""
 "The certificate presented by \"%s\" is self-signed. It cannot be "
@@ -2154,7 +2172,7 @@
 "Kohteen \"%s\" esittämä varmenne on itseallekirjoitettu. Sitä ei voida "
 "automaattisesti tarkistaa."
 
-#: ../libpurple/certificate.c:1344
+#: ../libpurple/certificate.c:1346
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Kohteelle %s esitetty varmenneketju ei ole kelvollinen."
@@ -2164,16 +2182,16 @@
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1352 ../libpurple/certificate.c:1421
+#: ../libpurple/certificate.c:1354 ../libpurple/certificate.c:1423
 msgid "SSL Certificate Error"
 msgstr "SSL-varmennevirhe"
 
-#: ../libpurple/certificate.c:1353
+#: ../libpurple/certificate.c:1355
 msgid "Invalid certificate chain"
 msgstr "Epäkelpo varmenneketju"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1373
+#: ../libpurple/certificate.c:1375
 msgid ""
 "You have no database of root certificates, so this certificate cannot be "
 "validated."
@@ -2181,12 +2199,12 @@
 "Juurivarmennetietokantaa ei ole, joten tätä varmennetta ei voida kelpuuttaa."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1396
+#: ../libpurple/certificate.c:1398
 msgid ""
 "The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr "Tämän varmenteen myöntäjän juurivarmenne on tuntematon Pidginille."
 
-#: ../libpurple/certificate.c:1413
+#: ../libpurple/certificate.c:1415
 #, c-format
 msgid ""
 "The certificate chain presented by %s does not have a valid digital "
@@ -2196,12 +2214,12 @@
 "Kohteen %s esittämällä varmenneketjulla ei ole kelvollista digitaalista "
 "allekirjoitusta varmentajalta jolta se väittää allekirjoituksen olevan."
 
-#: ../libpurple/certificate.c:1422
+#: ../libpurple/certificate.c:1424
 msgid "Invalid certificate authority signature"
 msgstr "Epäkelpo varmentajan allekirjoitus"
 
 #. Make messages
-#: ../libpurple/certificate.c:1886
+#: ../libpurple/certificate.c:1888
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2219,7 +2237,7 @@
 "Vanhenemispäivä: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1895
+#: ../libpurple/certificate.c:1897
 msgid "Certificate Information"
 msgstr "Varmennetiedot"
 
@@ -2241,30 +2259,32 @@
 msgid "+++ %s signed off"
 msgstr "+++ %s kirjautui ulos"
 
-#: ../libpurple/connection.c:497 ../libpurple/plugin.c:282
+#: ../libpurple/connection.c:525 ../libpurple/plugin.c:277
 #: ../libpurple/protocols/jabber/buddy.c:2350
 #: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:371
+#: ../libpurple/protocols/msn/session.c:377
+#: ../libpurple/protocols/msnp9/servconn.c:139
+#: ../libpurple/protocols/msnp9/session.c:330
 msgid "Unknown error"
 msgstr "Tuntematon virhe"
 
 #: ../libpurple/conversation.c:170
 msgid "Unable to send message: The message is too large."
-msgstr "Viestiä ei voitu lähettää: viesti on liian suuri."
+msgstr "Viestiä ei voi lähettää: viesti on liian suuri."
 
 #: ../libpurple/conversation.c:173 ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
-msgstr "Viestiä ei voitu lähettää käyttäjälle %s."
+msgstr "Viestiä ei voi lähettää käyttäjälle %s."
 
 #: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "Viesti on liian suuri."
 
-#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:255
-#: ../libpurple/protocols/bonjour/jabber.c:298
+#: ../libpurple/conversation.c:183 ../libpurple/protocols/bonjour/jabber.c:267
+#: ../libpurple/protocols/bonjour/jabber.c:310
 msgid "Unable to send message."
-msgstr "Viestiä ei voitu lähettää."
+msgstr "Viestiä ei voi lähettää."
 
 #: ../libpurple/conversation.c:1211
 msgid "Send Message"
@@ -2334,7 +2354,7 @@
 
 #: ../libpurple/dnsquery.c:516
 msgid "Unable to send request to resolver process\n"
-msgstr "Pyyntöä ei voitu lähettää selvitysprosessille\n"
+msgstr "Pyyntöä ei voi lähettää selvitysprosessille\n"
 
 #: ../libpurple/dnsquery.c:549 ../libpurple/dnsquery.c:698
 #, c-format
@@ -2725,38 +2745,38 @@
 #: ../libpurple/log.c:1438 ../libpurple/log.c:1568
 #, c-format
 msgid "<font color=\"red\"><b>Could not read file: %s</b></font>"
-msgstr "<font color=\"red\"><b>Ei voitu lukea tiedostoa: %s</b></font>"
+msgstr "<font color=\"red\"><b>Ei voi lukea tiedostoa: %s</b></font>"
 
 #: ../libpurple/log.c:1500
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTOMAATTIVASTAUS>: %s\n"
 
-#: ../libpurple/plugin.c:365
+#: ../libpurple/plugin.c:360
 #, c-format
 msgid "You are using %s, but this plugin requires %s."
 msgstr "Käytät: %s, mutta tämä liitännäinen vaatii: %s."
 
-#: ../libpurple/plugin.c:380
+#: ../libpurple/plugin.c:375
 #, c-format
 msgid "This plugin has not defined an ID."
 msgstr "Tämä liitännäinen ei ole määritellyt tunnistetta (ID)."
 
-#: ../libpurple/plugin.c:448
+#: ../libpurple/plugin.c:443
 #, c-format
 msgid "Plugin magic mismatch %d (need %d)"
 msgstr "Liitännäistaikojen ristiriita %d (tarvitaan %d)"
 
-#: ../libpurple/plugin.c:465
+#: ../libpurple/plugin.c:460
 #, c-format
 msgid "ABI version mismatch %d.%d.x (need %d.%d.x)"
 msgstr "ABI-version ristiriita %d.%d.x (tarvitaan %d.%d.x)"
 
-#: ../libpurple/plugin.c:482
+#: ../libpurple/plugin.c:477
 msgid "Plugin does not implement all required functions"
 msgstr "Liitännäinen ei toteuta kaikkia tarvittavia toimintoja"
 
-#: ../libpurple/plugin.c:547
+#: ../libpurple/plugin.c:542
 #, c-format
 msgid ""
 "The required plugin %s was not found. Please install this plugin and try "
@@ -2764,27 +2784,24 @@
 msgstr ""
 "Vaadittu liitännäinen %s puuttuu. Ole hyvä ja asenna se ja yritä uudelleen."
 
-#: ../libpurple/plugin.c:552
+#: ../libpurple/plugin.c:547
 msgid "Unable to load the plugin"
 msgstr "Liitännäistä ei kyetty lataamaan"
 
-#: ../libpurple/plugin.c:574
+#: ../libpurple/plugin.c:569
 #, c-format
 msgid "The required plugin %s was unable to load."
 msgstr "Vaadittu liitännäinen %s ei latautunut."
 
-#: ../libpurple/plugin.c:578
+#: ../libpurple/plugin.c:573
 msgid "Unable to load your plugin."
 msgstr "Liitännäistä ei kyetty lataamaan"
 
-#: ../libpurple/plugin.c:677
-#, c-format
-msgid "The dependent plugin %s failed to unload."
-msgstr "Riippuvaista liitännäista %s ei voitu poistaa käytöstä."
-
-#: ../libpurple/plugin.c:681
-msgid "There were errors unloading the plugin."
-msgstr "Poistettaessa liitännäistä käytöstä tapahtui virheitä."
+#: ../libpurple/plugin.c:663
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr ""
+"%s vaatii liitännäisen %s, mutta sitä ei onnistuttu poistamaan käytöstä"
 
 #: ../libpurple/plugins/autoaccept.c:23
 msgid "Autoaccept"
@@ -2820,14 +2837,15 @@
 
 #: ../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:1456
-#: ../libpurple/protocols/oscar/oscar.c:2248
-#: ../libpurple/protocols/oscar/oscar.c:2297
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:5996
-#: ../libpurple/protocols/oscar/oscar.c:6222
-#: ../libpurple/protocols/oscar/oscar.c:6292 ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398 ../pidgin/gtkblist.c:530
+#: ../libpurple/protocols/oscar/oscar.c:1451
+#: ../libpurple/protocols/oscar/oscar.c:2243
+#: ../libpurple/protocols/oscar/oscar.c:2292
+#: ../libpurple/protocols/oscar/oscar.c:5936
+#: ../libpurple/protocols/oscar/oscar.c:5991
+#: ../libpurple/protocols/oscar/oscar.c:6217
+#: ../libpurple/protocols/oscar/oscar.c:6287 ../libpurple/request.h:1828
+#: ../libpurple/request.h:1841 ../libpurple/request.h:1854
+#: ../libpurple/request.h:1867 ../pidgin/gtkblist.c:546
 msgid "_Cancel"
 msgstr "_Peru"
 
@@ -2858,7 +2876,7 @@
 
 #: ../libpurple/plugins/autoaccept.c:220
 msgid "Automatically reject from users not in buddy list"
-msgstr "Hylkää automaattisesti käyttäjiltä jotka eivät ole tuttavalistassa"
+msgstr "Hylkää automaattisesti käyttäjiltä jotka eivät ole tuttavia"
 
 #: ../libpurple/plugins/autoaccept.c:224
 msgid ""
@@ -2869,8 +2887,10 @@
 "valmis\n"
 "(vain kun keskustelua lähettäjän kanssa ei avoinna)"
 
-#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1785
-#: ../libpurple/protocols/msn/msn.c:1815
+#: ../libpurple/plugins/buddynote.c:46 ../libpurple/protocols/msn/msn.c:1808
+#: ../libpurple/protocols/msn/msn.c:1838
+#: ../libpurple/protocols/msnp9/msn.c:1661
+#: ../libpurple/protocols/msnp9/msn.c:1691
 msgid "Notes"
 msgstr "Merkinnät"
 
@@ -2903,9 +2923,7 @@
 #. *< summary
 #: ../libpurple/plugins/buddynote.c:93 ../pidgin/plugins/gtkbuddynote.c:77
 msgid "Adds the option to store notes for buddies on your buddy list."
-msgstr ""
-"Lisää valinnan merkintöjen tallentamiseen tuttavalistallasi oleville "
-"tuttaville."
+msgstr "Lisää valinnan merkintöjen tallentamiseen tuttaviesi kohdalle."
 
 #. *< type
 #. *< ui_requirement
@@ -3132,11 +3150,11 @@
 
 #: ../libpurple/plugins/log_reader.c:1620
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "Viestiä ei voitu lähettää koska suurin viestin koko ylitettiin."
+msgstr "Viestiä ei voi lähettää koska suurin viestin koko ylitettiin."
 
 #: ../libpurple/plugins/log_reader.c:1625
 msgid "Message could not be sent."
-msgstr "Viestiäsi ei voitu lähetettää."
+msgstr "Viestiäsi ei voi lähetettää."
 
 #. The names of IM clients are marked for translation at the request of
 #. translators who wanted to transliterate them.  Many translators
@@ -3320,25 +3338,31 @@
 
 #: ../libpurple/plugins/offlinemsg.c:165
 #: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:646
-#: ../libpurple/protocols/novell/novell.c:1919
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msnp9/dialog.c:133
+#: ../libpurple/protocols/msnp9/msn.c:550
+#: ../libpurple/protocols/msnp9/msn.c:564
+#: ../libpurple/protocols/novell/novell.c:1928
 #: ../libpurple/protocols/silc/buddy.c:317
 #: ../libpurple/protocols/silc/pk.c:113 ../libpurple/protocols/silc/wb.c:308
 #: ../libpurple/protocols/silc10/buddy.c:314
 #: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:268
+#: ../libpurple/protocols/silc10/wb.c:307 ../pidgin/gtkrequest.c:318
 msgid "Yes"
 msgstr "Kyllä"
 
 #: ../libpurple/plugins/offlinemsg.c:166
 #: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:646
-#: ../libpurple/protocols/novell/novell.c:1920
+#: ../libpurple/protocols/msn/msn.c:665
+#: ../libpurple/protocols/msnp9/dialog.c:134
+#: ../libpurple/protocols/msnp9/msn.c:550
+#: ../libpurple/protocols/msnp9/msn.c:564
+#: ../libpurple/protocols/novell/novell.c:1929
 #: ../libpurple/protocols/silc/buddy.c:318
 #: ../libpurple/protocols/silc/pk.c:114 ../libpurple/protocols/silc/wb.c:309
 #: ../libpurple/protocols/silc10/buddy.c:315
 #: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:269
+#: ../libpurple/protocols/silc10/wb.c:308 ../pidgin/gtkrequest.c:319
 msgid "No"
 msgstr "Ei"
 
@@ -3390,7 +3414,7 @@
 
 #: ../libpurple/plugins/psychic.c:91
 msgid "Only enable for users on the buddy list"
-msgstr "Salli vain tuttavalistassa oleville käyttäjille"
+msgstr "Salli vain tuttavaluettelossa oleville käyttäjille"
 
 #: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
@@ -3410,7 +3434,7 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:711
+#: ../libpurple/plugins/signals-test.c:753
 msgid "Signals Test"
 msgstr "Signaalitesti"
 
@@ -3418,8 +3442,8 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:714
-#: ../libpurple/plugins/signals-test.c:716
+#: ../libpurple/plugins/signals-test.c:756
+#: ../libpurple/plugins/signals-test.c:758
 msgid "Test to see that all signals are working properly."
 msgstr "Kokeile nähdäksesi että kaikki signaalit toimivat oikein."
 
@@ -3583,7 +3607,7 @@
 "ActiveTCL-asennusta ei havaittu. Jos haluat käyttää TCL-liitännäisiä, asenna "
 "ActiveTCL osoitteesta http://www.activestate.com\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:107
+#: ../libpurple/protocols/bonjour/bonjour.c:108
 msgid ""
 "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
 "developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
@@ -3593,52 +3617,51 @@
 "kysytyt kysymykset osoitteessa http://developer.pidgin.im/wiki/Using%"
 "20Pidgin#CanIusePidginforBonjourLink-LocalMessaging."
 
-#. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:124
+#: ../libpurple/protocols/bonjour/bonjour.c:127
 msgid "Unable to listen for incoming IM connections\n"
-msgstr "Ei voitu kuunnella sisääntulevia pikaviestintäyhteyksiä\n"
-
-#: ../libpurple/protocols/bonjour/bonjour.c:149
+msgstr "Ei voi kuunnella sisääntulevia pikaviestintäyhteyksiä\n"
+
+#: ../libpurple/protocols/bonjour/bonjour.c:154
 msgid ""
 "Unable to establish connection with the local mDNS server.  Is it running?"
 msgstr ""
-"Ei voitu luoda yhteyttä paikalliseen mDNS-palvelimeen. Onko se käynnissä?"
+"Ei voi luoda yhteyttä paikalliseen mDNS-palvelimeen. Onko se käynnissä?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:365
-#: ../libpurple/protocols/bonjour/bonjour.c:670
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/jabber/jabber.c:942
+#: ../libpurple/protocols/bonjour/bonjour.c:370
+#: ../libpurple/protocols/bonjour/bonjour.c:675
+#: ../libpurple/protocols/gg/gg.c:633
+#: ../libpurple/protocols/jabber/jabber.c:969
 msgid "First name"
 msgstr "Etunimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:367
-#: ../libpurple/protocols/bonjour/bonjour.c:673
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:947
+#: ../libpurple/protocols/bonjour/bonjour.c:372
+#: ../libpurple/protocols/bonjour/bonjour.c:678
+#: ../libpurple/protocols/gg/gg.c:628
+#: ../libpurple/protocols/jabber/jabber.c:974
 msgid "Last name"
 msgstr "Sukunimi"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:371
+#: ../libpurple/protocols/bonjour/bonjour.c:376
 #: ../libpurple/protocols/jabber/buddy.c:295
 #: ../libpurple/protocols/jabber/buddy.c:1325
 #: ../libpurple/protocols/jabber/buddy.c:1335
 #: ../libpurple/protocols/jabber/buddy.c:2219
 #: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:559
+#: ../libpurple/protocols/silc/util.c:561
 #: ../libpurple/protocols/silc10/ops.c:1075
 #: ../libpurple/protocols/silc10/util.c:551
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1061
 msgid "E-Mail"
 msgstr "Sähköposti"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:374
-#: ../libpurple/protocols/bonjour/bonjour.c:679
+#: ../libpurple/protocols/bonjour/bonjour.c:379
+#: ../libpurple/protocols/bonjour/bonjour.c:684
 msgid "AIM Account"
 msgstr "AIM-tili"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:377
-#: ../libpurple/protocols/bonjour/bonjour.c:682
+#: ../libpurple/protocols/bonjour/bonjour.c:382
+#: ../libpurple/protocols/bonjour/bonjour.c:687
 msgid "XMPP Account"
 msgstr "XMPP-tili"
 
@@ -3652,20 +3675,20 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:481
-#: ../libpurple/protocols/bonjour/bonjour.c:483
+#: ../libpurple/protocols/bonjour/bonjour.c:486
+#: ../libpurple/protocols/bonjour/bonjour.c:488
 msgid "Bonjour Protocol Plugin"
 msgstr "Bonjour-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:624
+#: ../libpurple/protocols/bonjour/bonjour.c:629
 msgid "Purple Person"
 msgstr "Purple-henkilö"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:676
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:901
-#: ../libpurple/protocols/silc/silc.c:1142
+#: ../libpurple/protocols/bonjour/bonjour.c:681
+#: ../libpurple/protocols/gg/gg.c:478
+#: ../libpurple/protocols/jabber/jabber.c:959
+#: ../libpurple/protocols/silc/silc.c:913
+#: ../libpurple/protocols/silc/silc.c:1154
 #: ../libpurple/protocols/silc10/silc.c:681
 #: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
@@ -3675,32 +3698,32 @@
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:381
+#: ../libpurple/protocols/bonjour/jabber.c:395
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s on sulkenut keskustelun."
 
-#: ../libpurple/protocols/bonjour/jabber.c:439
-#: ../libpurple/protocols/bonjour/jabber.c:664
-#: ../libpurple/protocols/bonjour/jabber.c:682
+#: ../libpurple/protocols/bonjour/jabber.c:453
+#: ../libpurple/protocols/bonjour/jabber.c:686
+#: ../libpurple/protocols/bonjour/jabber.c:704
 msgid "Unable to send the message, the conversation couldn't be started."
-msgstr "Viestiä ei voida lähettää, keskustelua ei voitu aloittaa."
-
-#: ../libpurple/protocols/bonjour/jabber.c:587
+msgstr "Viestiä ei voida lähettää, keskustelua ei voi aloittaa."
+
+#: ../libpurple/protocols/bonjour/jabber.c:603
 msgid "Cannot open socket"
 msgstr "Pistoketta ei voida avata"
 
-#: ../libpurple/protocols/bonjour/jabber.c:595
+#: ../libpurple/protocols/bonjour/jabber.c:613
 msgid "Error setting socket options"
 msgstr "Virhe asetettaessa pistokevalintoja"
 
-#: ../libpurple/protocols/bonjour/jabber.c:619
+#: ../libpurple/protocols/bonjour/jabber.c:639
 msgid "Could not bind socket to port"
-msgstr "Ei voitu liittää pistoketta porttiin"
-
-#: ../libpurple/protocols/bonjour/jabber.c:627
+msgstr "Ei voi liittää pistoketta porttiin"
+
+#: ../libpurple/protocols/bonjour/jabber.c:649
 msgid "Could not listen on socket"
-msgstr "Ei voitu kuunnella pistoketta"
+msgstr "Ei voi kuunnella pistoketta"
 
 #: ../libpurple/protocols/gg/gg.c:76 ../libpurple/proxy.c:1845
 msgid "Invalid proxy settings"
@@ -3721,41 +3744,43 @@
 #: ../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 "Ei voitu hakea polettia.\n"
-
-#: ../libpurple/protocols/gg/gg.c:269 ../libpurple/protocols/gg/gg.c:288
+msgstr "Ei voi hakea polettia.\n"
+
+#: ../libpurple/protocols/gg/gg.c:267 ../libpurple/protocols/gg/gg.c:274
+#: ../libpurple/protocols/gg/gg.c:280
 msgid "Save Buddylist..."
-msgstr "Tallenna tuttavalista..."
-
-#: ../libpurple/protocols/gg/gg.c:270
+msgstr "Tallenna tuttavat..."
+
+#: ../libpurple/protocols/gg/gg.c:268
 msgid "Your buddylist is empty, nothing was written to the file."
-msgstr "Tuttavalistasi on tyhjä, mitään ei kirjoitettu tiedostoon."
-
-#: ../libpurple/protocols/gg/gg.c:276 ../libpurple/protocols/gg/gg.c:278
-msgid "Couldn't open file"
-msgstr "Tiedoston avaus ei onnistunut"
-
-#: ../libpurple/protocols/gg/gg.c:289
+msgstr "Tuttavia ei ole, mitään ei kirjoitettu tiedostoon."
+
+#: ../libpurple/protocols/gg/gg.c:275
 msgid "Buddylist saved successfully!"
-msgstr "Tuttavalista tallennettiin onnistuneesti!"
-
-#: ../libpurple/protocols/gg/gg.c:307 ../libpurple/protocols/gg/gg.c:308
+msgstr "Tuttavat tallennettiin onnistuneesti!"
+
+#: ../libpurple/protocols/gg/gg.c:278
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr "Ei voi kirjoittaa %s-tuttavia kohteeseen %s"
+
+#: ../libpurple/protocols/gg/gg.c:303 ../libpurple/protocols/gg/gg.c:304
 msgid "Couldn't load buddylist"
-msgstr "Tuttavalistan lataus ei onnistunut"
-
-#: ../libpurple/protocols/gg/gg.c:324
+msgstr "Tuttavien lataus ei onnistunut"
+
+#: ../libpurple/protocols/gg/gg.c:320
 msgid "Load Buddylist..."
-msgstr "Avaa tuttavalista..."
-
-#: ../libpurple/protocols/gg/gg.c:325
+msgstr "Lataa tuttavat..."
+
+#: ../libpurple/protocols/gg/gg.c:321
 msgid "Buddylist loaded successfully!"
-msgstr "Tuttavalista avattiin onnistuneesti!"
-
-#: ../libpurple/protocols/gg/gg.c:336
+msgstr "Tuttavat ladattiin onnistuneesti."
+
+#: ../libpurple/protocols/gg/gg.c:332
 msgid "Save buddylist..."
-msgstr "Tallenna tuttavalista..."
-
-#: ../libpurple/protocols/gg/gg.c:384
+msgstr "Tallenna tuttavat..."
+
+#: ../libpurple/protocols/gg/gg.c:382
 msgid "Fill in the registration fields."
 msgstr "Täytä rekisteröitymiskentät."
 
@@ -3763,159 +3788,164 @@
 msgid "Passwords do not match."
 msgstr "Salasanat eivät täsmää."
 
-#: ../libpurple/protocols/gg/gg.c:398
+#: ../libpurple/protocols/gg/gg.c:399
 msgid "Unable to register new account. Error occurred.\n"
 msgstr "Uuden käyttäjätilin rekisteröinti epäonnistui virheen takia.\n"
 
-#: ../libpurple/protocols/gg/gg.c:411
-msgid "New Gadu-Gadu Account Registered"
-msgstr "Uusi Gadu-Gadu-käyttäjätili rekisteröity"
-
 #: ../libpurple/protocols/gg/gg.c:412
+msgid "New Gadu-Gadu Account Registered"
+msgstr "Uusi Gadu-Gadu-käyttäjätili rekisteröity"
+
+#: ../libpurple/protocols/gg/gg.c:413
 msgid "Registration completed successfully!"
 msgstr "Rekisteröinti onnistui!"
 
-#: ../libpurple/protocols/gg/gg.c:482 ../libpurple/protocols/gg/gg.c:775
-#: ../libpurple/protocols/jabber/jabber.c:913
-#: ../libpurple/protocols/jabber/jabber.c:916
-#: ../libpurple/protocols/jabber/jabber.c:1724
+#: ../libpurple/protocols/gg/gg.c:483 ../libpurple/protocols/gg/gg.c:776
+#: ../libpurple/protocols/jabber/jabber.c:940
+#: ../libpurple/protocols/jabber/jabber.c:943
+#: ../libpurple/protocols/jabber/jabber.c:1731
 msgid "Password"
 msgstr "Salasana"
 
-#: ../libpurple/protocols/gg/gg.c:487 ../libpurple/protocols/gg/gg.c:780
+#: ../libpurple/protocols/gg/gg.c:488 ../libpurple/protocols/gg/gg.c:781
 msgid "Password (retype)"
 msgstr "Salasana (uudelleen)"
 
-#: ../libpurple/protocols/gg/gg.c:492 ../libpurple/protocols/gg/gg.c:785
+#: ../libpurple/protocols/gg/gg.c:493 ../libpurple/protocols/gg/gg.c:786
 msgid "Enter current token"
 msgstr "Syötä nykyinen poletti"
 
-#: ../libpurple/protocols/gg/gg.c:498 ../libpurple/protocols/gg/gg.c:791
+#: ../libpurple/protocols/gg/gg.c:499 ../libpurple/protocols/gg/gg.c:792
 msgid "Current token"
 msgstr "Nykyinen poletti"
 
-#: ../libpurple/protocols/gg/gg.c:502 ../libpurple/protocols/gg/gg.c:503
+#: ../libpurple/protocols/gg/gg.c:503 ../libpurple/protocols/gg/gg.c:504
 msgid "Register New Gadu-Gadu Account"
 msgstr "Rekisteröi uusi Gadu-Gadu-käyttäjätili"
 
-#: ../libpurple/protocols/gg/gg.c:504
+#: ../libpurple/protocols/gg/gg.c:505
 msgid "Please, fill in the following fields"
 msgstr "Täytä seuraavat kentät"
 
-#: ../libpurple/protocols/gg/gg.c:642 ../libpurple/protocols/gg/gg.c:1055
-#: ../libpurple/protocols/gg/gg.c:1127
-#: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3804
-#: ../libpurple/protocols/oscar/oscar.c:3817
+#: ../libpurple/protocols/gg/gg.c:643 ../libpurple/protocols/gg/gg.c:1056
+#: ../libpurple/protocols/gg/gg.c:1128
+#: ../libpurple/protocols/jabber/jabber.c:984
+#: ../libpurple/protocols/oscar/oscar.c:3799
+#: ../libpurple/protocols/oscar/oscar.c:3812
 #: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Paikkakunta"
 
-#: ../libpurple/protocols/gg/gg.c:647
+#: ../libpurple/protocols/gg/gg.c:648
 msgid "Year of birth"
 msgstr "Syntymävuosi"
 
-#: ../libpurple/protocols/gg/gg.c:650 ../libpurple/protocols/msn/msn.c:1714
+#: ../libpurple/protocols/gg/gg.c:651 ../libpurple/protocols/msn/msn.c:1737
+#: ../libpurple/protocols/msnp9/msn.c:1590
 #: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/oscar/oscar.c:3747
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:226 ../libpurple/protocols/qq/qq.c:229
-#: ../libpurple/protocols/qq/qq.c:232 ../libpurple/protocols/qq/qq.c:236
+#: ../libpurple/protocols/qq/qq.c:227 ../libpurple/protocols/qq/qq.c:230
+#: ../libpurple/protocols/qq/qq.c:233 ../libpurple/protocols/qq/qq.c:237
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Sukupuoli"
 
-#: ../libpurple/protocols/gg/gg.c:651
+#: ../libpurple/protocols/gg/gg.c:652
 msgid "Male or female"
 msgstr "Mies vai nainen"
 
-#: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3747
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:226
-msgid "Male"
-msgstr "Mies"
-
 #: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3747
+#: ../libpurple/protocols/oscar/oscar.c:3742
+#: ../libpurple/protocols/qq/buddy_info.c:83
+#: ../libpurple/protocols/qq/qq.c:227
+msgid "Male"
+msgstr "Mies"
+
+#: ../libpurple/protocols/gg/gg.c:654
+#: ../libpurple/protocols/oscar/oscar.c:3742
 #: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:229
+#: ../libpurple/protocols/qq/qq.c:230
 msgid "Female"
 msgstr "Nainen"
 
-#: ../libpurple/protocols/gg/gg.c:657
+#: ../libpurple/protocols/gg/gg.c:658
 msgid "Only online"
 msgstr "Vain linjoilla"
 
-#: ../libpurple/protocols/gg/gg.c:661 ../libpurple/protocols/gg/gg.c:662
+#: ../libpurple/protocols/gg/gg.c:662 ../libpurple/protocols/gg/gg.c:663
 msgid "Find buddies"
 msgstr "Etsi tuttavia"
 
-#: ../libpurple/protocols/gg/gg.c:663
+#: ../libpurple/protocols/gg/gg.c:664
 msgid "Please, enter your search criteria below"
 msgstr "Anna hakukriteerisi alla"
 
-#: ../libpurple/protocols/gg/gg.c:701
+#: ../libpurple/protocols/gg/gg.c:702
 msgid "Fill in the fields."
 msgstr "Täytä kentät."
 
-#: ../libpurple/protocols/gg/gg.c:713
+#: ../libpurple/protocols/gg/gg.c:714
 msgid "Your current password is different from the one that you specified."
 msgstr "Nykyinen salasanasi ei ole se jonka kirjoitit."
 
-#: ../libpurple/protocols/gg/gg.c:727
+#: ../libpurple/protocols/gg/gg.c:728
 msgid "Unable to change password. Error occurred.\n"
-msgstr "Salasanaa ei voitu muuttaa. Tapahtui virhe.\n"
-
-#: ../libpurple/protocols/gg/gg.c:736
-msgid "Change password for the Gadu-Gadu account"
-msgstr "Vaihda Gadu-Gadu-käyttäjätilin salasana"
+msgstr "Salasanaa ei voi muuttaa. Tapahtui virhe.\n"
 
 #: ../libpurple/protocols/gg/gg.c:737
+msgid "Change password for the Gadu-Gadu account"
+msgstr "Vaihda Gadu-Gadu-käyttäjätilin salasana"
+
+#: ../libpurple/protocols/gg/gg.c:738
 msgid "Password was changed successfully!"
 msgstr "Salasanan vaihto onnistui!"
 
-#: ../libpurple/protocols/gg/gg.c:770
+#: ../libpurple/protocols/gg/gg.c:771
 msgid "Current password"
 msgstr "Nykyinen salasana"
 
-#: ../libpurple/protocols/gg/gg.c:795
+#: ../libpurple/protocols/gg/gg.c:796
 msgid "Please, enter your current password and your new password for UIN: "
 msgstr "Syötä sekä nykyinen että uusi salasana tunnukselle: "
 
-#: ../libpurple/protocols/gg/gg.c:799 ../libpurple/protocols/gg/gg.c:800
+#: ../libpurple/protocols/gg/gg.c:800 ../libpurple/protocols/gg/gg.c:801
 msgid "Change Gadu-Gadu Password"
 msgstr "Muuta Gadu-Gadu-salasana"
 
-#: ../libpurple/protocols/gg/gg.c:877
+#: ../libpurple/protocols/gg/gg.c:878
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Valitse ryhmäkeskustelu tuttavalle: %s"
 
-#: ../libpurple/protocols/gg/gg.c:880 ../libpurple/protocols/gg/gg.c:881
+#: ../libpurple/protocols/gg/gg.c:881 ../libpurple/protocols/gg/gg.c:882
 msgid "Add to chat..."
 msgstr "Lisää ryhmäkeskusteluun..."
 
-#: ../libpurple/protocols/gg/gg.c:1009
+#: ../libpurple/protocols/gg/gg.c:1010
 #: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/novell/novell.c:2845
 #: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5659
-#: ../libpurple/protocols/qq/qq.c:170 ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3101 ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3305 ../pidgin/gtkblist.c:3643
+#: ../libpurple/protocols/oscar/oscar.c:5654
+#: ../libpurple/protocols/qq/qq.c:171 ../libpurple/protocols/qq/qq.c:178
+#: ../libpurple/protocols/qq/qq.c:293
+#: ../libpurple/protocols/yahoo/yahoo.c:3110 ../libpurple/status.c:154
+#: ../pidgin/gtkblist.c:3338 ../pidgin/gtkblist.c:3676
 #: ../pidgin/gtkdocklet.c:561 ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "Poissa linjoilta"
 
-#: ../libpurple/protocols/gg/gg.c:1012
+#: ../libpurple/protocols/gg/gg.c:1013
 #: ../libpurple/protocols/jabber/buddy.c:2036
 #: ../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:2821
-#: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3103 ../libpurple/status.c:155
+#: ../libpurple/protocols/msnp9/state.c:29
+#: ../libpurple/protocols/msnp9/state.c:30
+#: ../libpurple/protocols/msnp9/state.c:37
+#: ../libpurple/protocols/msnp9/state.c:38
+#: ../libpurple/protocols/novell/novell.c:2833
+#: ../libpurple/protocols/qq/qq.c:281
+#: ../libpurple/protocols/yahoo/yahoo.c:3112 ../libpurple/status.c:155
 #: ../pidgin/gtkdocklet.c:545 ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Tavoitettavissa"
@@ -3923,147 +3953,148 @@
 #. 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/gg/gg.c:1015 ../libpurple/protocols/irc/irc.c:528
+#: ../libpurple/protocols/gg/gg.c:1016 ../libpurple/protocols/irc/irc.c:537
 #: ../libpurple/protocols/irc/msgs.c:310
 #: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../libpurple/protocols/novell/novell.c:2824
+#: ../libpurple/protocols/novell/novell.c:2836
 #: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4562
-#: ../libpurple/protocols/oscar/oscar.c:5687
-#: ../libpurple/protocols/qq/qq.c:180 ../libpurple/protocols/qq/qq.c:284
+#: ../libpurple/protocols/oscar/oscar.c:4557
+#: ../libpurple/protocols/oscar/oscar.c:5682
+#: ../libpurple/protocols/qq/qq.c:181 ../libpurple/protocols/qq/qq.c:285
 #: ../libpurple/protocols/silc/buddy.c:1479
 #: ../libpurple/protocols/silc10/buddy.c:1479
-#: ../libpurple/protocols/yahoo/yahoo.c:3655
-#: ../libpurple/protocols/yahoo/yahoo.c:3729 ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2039
+#: ../libpurple/protocols/yahoo/yahoo.c:3664
+#: ../libpurple/protocols/yahoo/yahoo.c:3738 ../libpurple/status.c:158
+#: ../pidgin/gtkdocklet.c:549 ../pidgin/gtkprefs.c:2040
 #: ../pidgin/gtkstatusbox.c:1058
 #, c-format
 msgid "Away"
 msgstr "Poissa"
 
-#: ../libpurple/protocols/gg/gg.c:1044 ../libpurple/protocols/gg/gg.c:1118
-#: ../libpurple/protocols/oscar/oscar.c:2714
-#: ../libpurple/protocols/oscar/oscar.c:3714
+#: ../libpurple/protocols/gg/gg.c:1045 ../libpurple/protocols/gg/gg.c:1119
+#: ../libpurple/protocols/oscar/oscar.c:2709
+#: ../libpurple/protocols/oscar/oscar.c:3709
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1047 ../libpurple/protocols/gg/gg.c:1121
+#: ../libpurple/protocols/gg/gg.c:1048 ../libpurple/protocols/gg/gg.c:1122
 #: ../libpurple/protocols/jabber/buddy.c:2213
 #: ../libpurple/protocols/jabber/buddy.c:2399
-#: ../libpurple/protocols/oscar/oscar.c:3725
+#: ../libpurple/protocols/oscar/oscar.c:3720
 #: ../libpurple/protocols/silc/ops.c:990
 #: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Etunimi"
 
-#: ../libpurple/protocols/gg/gg.c:1060 ../libpurple/protocols/gg/gg.c:1130
+#: ../libpurple/protocols/gg/gg.c:1061 ../libpurple/protocols/gg/gg.c:1131
 msgid "Birth Year"
 msgstr "Syntymävuosi"
 
-#: ../libpurple/protocols/gg/gg.c:1112 ../libpurple/protocols/gg/gg.c:1181
-#: ../libpurple/protocols/oscar/oscar.c:3926
+#: ../libpurple/protocols/gg/gg.c:1113 ../libpurple/protocols/gg/gg.c:1182
+#: ../libpurple/protocols/oscar/oscar.c:3921
 msgid "Unable to display the search results."
 msgstr "Ei voida näyttää hakutuloksia."
 
-#: ../libpurple/protocols/gg/gg.c:1172
+#: ../libpurple/protocols/gg/gg.c:1173
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadun julkinen hakemisto"
 
-#: ../libpurple/protocols/gg/gg.c:1173
+#: ../libpurple/protocols/gg/gg.c:1174
 msgid "Search results"
 msgstr "Hakutulokset"
 
-#: ../libpurple/protocols/gg/gg.c:1216
+#: ../libpurple/protocols/gg/gg.c:1217
 msgid "No matching users found"
 msgstr "Käyttäjistä ei löytynyt osumia"
 
-#: ../libpurple/protocols/gg/gg.c:1217
+#: ../libpurple/protocols/gg/gg.c:1218
 msgid "There are no users matching your search criteria."
 msgstr "Hakuvalintojasi vastaavia käyttäjiä ei ole."
 
-#: ../libpurple/protocols/gg/gg.c:1311 ../libpurple/protocols/gg/gg.c:1464
+#: ../libpurple/protocols/gg/gg.c:1314 ../libpurple/protocols/gg/gg.c:1469
 msgid "Unable to read socket"
 msgstr "Ei kyetty lukemaan pistoketta"
 
-#: ../libpurple/protocols/gg/gg.c:1396
+#: ../libpurple/protocols/gg/gg.c:1399
 msgid "Buddy list downloaded"
-msgstr "Tuttavalista ladattu"
-
-#: ../libpurple/protocols/gg/gg.c:1397
+msgstr "Tuttavat ladattu"
+
+#: ../libpurple/protocols/gg/gg.c:1400
 msgid "Your buddy list was downloaded from the server."
-msgstr "Tuttavalistasi ladattiin palvelimelta."
-
-#: ../libpurple/protocols/gg/gg.c:1404
+msgstr "Tuttavasi ladattiin palvelimelta."
+
+#: ../libpurple/protocols/gg/gg.c:1407
 msgid "Buddy list uploaded"
-msgstr "Tuttavalista lähetettiin"
-
-#: ../libpurple/protocols/gg/gg.c:1405
+msgstr "Tuttavat lähetettiin"
+
+#: ../libpurple/protocols/gg/gg.c:1408
 msgid "Your buddy list was stored on the server."
-msgstr "Tuttavalistasi tallennettiin palvelimelle."
-
-#: ../libpurple/protocols/gg/gg.c:1510 ../libpurple/protocols/gg/gg.c:1716
+msgstr "Tuttavasi tallennettiin palvelimelle."
+
+#: ../libpurple/protocols/gg/gg.c:1517 ../libpurple/protocols/gg/gg.c:1725
 msgid "Connection failed."
 msgstr "Yhteys epäonnistui."
 
-#: ../libpurple/protocols/gg/gg.c:1622 ../libpurple/protocols/msn/msn.c:645
+#: ../libpurple/protocols/gg/gg.c:1629 ../libpurple/protocols/msn/msn.c:664
+#: ../libpurple/protocols/msnp9/msn.c:563
 msgid "Blocked"
 msgstr "Estetty"
 
-#: ../libpurple/protocols/gg/gg.c:1645
+#: ../libpurple/protocols/gg/gg.c:1652
 msgid "Add to chat"
 msgstr "Lisää ryhmäkeskusteluun"
 
-#: ../libpurple/protocols/gg/gg.c:1654
+#: ../libpurple/protocols/gg/gg.c:1661
 msgid "Unblock"
 msgstr "Poista esto"
 
-#: ../libpurple/protocols/gg/gg.c:1658
+#: ../libpurple/protocols/gg/gg.c:1665
 msgid "Block"
 msgstr "Estä"
 
-#: ../libpurple/protocols/gg/gg.c:1675
+#: ../libpurple/protocols/gg/gg.c:1682
 msgid "Chat _name:"
 msgstr "Keskustelunimi:"
 
-#: ../libpurple/protocols/gg/gg.c:1924
+#: ../libpurple/protocols/gg/gg.c:1933
 msgid "Chat error"
 msgstr "Keskusteluvirhe"
 
-#: ../libpurple/protocols/gg/gg.c:1925
+#: ../libpurple/protocols/gg/gg.c:1934
 msgid "This chat name is already in use"
 msgstr "Tämä keskustelunimi on jo käytössä"
 
-#: ../libpurple/protocols/gg/gg.c:2008
+#: ../libpurple/protocols/gg/gg.c:2019
 msgid "Not connected to the server."
 msgstr "Ei yhdistettynä palvelimeen."
 
-#: ../libpurple/protocols/gg/gg.c:2031
+#: ../libpurple/protocols/gg/gg.c:2042
 msgid "Find buddies..."
 msgstr "Etsi tuttavia..."
 
-#: ../libpurple/protocols/gg/gg.c:2037
+#: ../libpurple/protocols/gg/gg.c:2048
 msgid "Change password..."
 msgstr "Vaihda salasana..."
 
-#: ../libpurple/protocols/gg/gg.c:2043
+#: ../libpurple/protocols/gg/gg.c:2054
 msgid "Upload buddylist to Server"
-msgstr "Vie tuttavalista palvelimelle"
-
-#: ../libpurple/protocols/gg/gg.c:2047
+msgstr "Vie tuttavat palvelimelle"
+
+#: ../libpurple/protocols/gg/gg.c:2058
 msgid "Download buddylist from Server"
-msgstr "Tuo tuttavalista palvelimelta"
-
-#: ../libpurple/protocols/gg/gg.c:2051
+msgstr "Tuo tuttavat palvelimelta"
+
+#: ../libpurple/protocols/gg/gg.c:2062
 msgid "Delete buddylist from Server"
-msgstr "Poista tuttavalista palvelimelta"
-
-#: ../libpurple/protocols/gg/gg.c:2055
+msgstr "Poista tuttavat palvelimelta"
+
+#: ../libpurple/protocols/gg/gg.c:2066
 msgid "Save buddylist to file..."
-msgstr "Vie tuttavalista tiedostoon..."
-
-#: ../libpurple/protocols/gg/gg.c:2059
+msgstr "Vie tuttavat tiedostoon..."
+
+#: ../libpurple/protocols/gg/gg.c:2070
 msgid "Load buddylist from file..."
-msgstr "Tuo tuttavalista tiedostosta..."
+msgstr "Tuo tuttavat tiedostosta..."
 
 #. magic
 #. major_version
@@ -4076,38 +4107,38 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2163
+#: ../libpurple/protocols/gg/gg.c:2174
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Gadu-Gadu-yhteyskäytäntöliitännäinen"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2164
+#: ../libpurple/protocols/gg/gg.c:2175
 msgid "Polish popular IM"
 msgstr "Puolalainen suosittu pikaviestin"
 
-#: ../libpurple/protocols/gg/gg.c:2218
+#: ../libpurple/protocols/gg/gg.c:2229
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-käyttäjä"
 
 #: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1768
-#: ../libpurple/protocols/silc10/silc.c:1566
+#: ../libpurple/protocols/silc/silc.c:1780
+#: ../libpurple/protocols/silc10/silc.c:1569
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Tuntematon komento: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:503
 #: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1476
-#: ../libpurple/protocols/silc10/silc.c:1274
+#: ../libpurple/protocols/silc/silc.c:1488
+#: ../libpurple/protocols/silc10/silc.c:1277
 #, c-format
 msgid "current topic is: %s"
 msgstr "nykyinen aihe on: %s"
 
 #: ../libpurple/protocols/irc/cmds.c:507
 #: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1480
-#: ../libpurple/protocols/silc10/silc.c:1278
+#: ../libpurple/protocols/silc/silc.c:1492
+#: ../libpurple/protocols/silc10/silc.c:1281
 msgid "No topic is set"
 msgstr "Aihetta ei ole asetettu"
 
@@ -4122,7 +4153,7 @@
 #: ../libpurple/protocols/irc/dcc_send.c:297
 #: ../libpurple/protocols/irc/dcc_send.c:338
 msgid "Could not open a listening port."
-msgstr "Kuuntelevaa porttia ei voitu avata."
+msgstr "Kuuntelevaa porttia ei voi avata."
 
 #: ../libpurple/protocols/irc/irc.c:79
 msgid "Error displaying MOTD"
@@ -4141,81 +4172,79 @@
 msgid "MOTD for %s"
 msgstr "MOTD %s:lle"
 
-#: ../libpurple/protocols/irc/irc.c:127 ../libpurple/protocols/irc/irc.c:165
-#: ../libpurple/protocols/irc/irc.c:612 ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2361
+#: ../libpurple/protocols/irc/irc.c:129 ../libpurple/protocols/irc/irc.c:169
+#: ../libpurple/protocols/irc/irc.c:625 ../libpurple/protocols/irc/irc.c:654
+#: ../libpurple/protocols/myspace/myspace.c:2378
 msgid "Server has disconnected"
 msgstr "Palvelin on katkaissut yhteyden"
 
-#: ../libpurple/protocols/irc/irc.c:249
+#: ../libpurple/protocols/irc/irc.c:253
 msgid "View MOTD"
 msgstr "Näytä MOTD"
 
-#: ../libpurple/protocols/irc/irc.c:261 ../libpurple/protocols/silc/chat.c:33
+#: ../libpurple/protocols/irc/irc.c:265 ../libpurple/protocols/silc/chat.c:33
 #: ../libpurple/protocols/silc10/chat.c:33
 msgid "_Channel:"
 msgstr "_Kanava:"
 
-#: ../libpurple/protocols/irc/irc.c:267
+#: ../libpurple/protocols/irc/irc.c:271
 #: ../libpurple/protocols/jabber/chat.c:59 ../pidgin/gtkaccount.c:527
 msgid "_Password:"
 msgstr "_Salasana:"
 
-#: ../libpurple/protocols/irc/irc.c:298
+#: ../libpurple/protocols/irc/irc.c:304
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-kutsumanimissä ei tule olla välilyöntejä"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:394
+#: ../libpurple/protocols/irc/irc.c:325
+#: ../libpurple/protocols/jabber/jabber.c:1311
+#: ../libpurple/protocols/msn/session.c:402
+#: ../libpurple/protocols/msnp9/session.c:355
 #: ../libpurple/protocols/myspace/myspace.c:302
-#: ../libpurple/protocols/novell/novell.c:2187
+#: ../libpurple/protocols/novell/novell.c:2198
 #: ../libpurple/protocols/oscar/oscar.c:1290
 #: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1871
-#: ../libpurple/protocols/yahoo/yahoo.c:2941
+#: ../libpurple/protocols/sametime/sametime.c:3768
+#: ../libpurple/protocols/simple/simple.c:1893
+#: ../libpurple/protocols/yahoo/yahoo.c:2948
 #: ../libpurple/protocols/zephyr/zephyr.c:1621 ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "Yhdistetään"
 
-#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:610
-#: ../libpurple/protocols/jabber/jabber.c:1095
+#: ../libpurple/protocols/irc/irc.c:335
+#: ../libpurple/protocols/jabber/jabber.c:637
+#: ../libpurple/protocols/jabber/jabber.c:1126
 msgid "SSL support unavailable"
 msgstr "SSL-tuki ei saatavilla"
 
-#. TODO: try other ports if in auto mode, then save
-#. * working port and try that first next time.
-#: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:318
-#: ../libpurple/protocols/simple/simple.c:465
-#: ../libpurple/protocols/simple/simple.c:1786
+#: ../libpurple/protocols/irc/irc.c:348
+#: ../libpurple/protocols/myspace/myspace.c:320
+#: ../libpurple/protocols/simple/simple.c:469
+#: ../libpurple/protocols/simple/simple.c:1803
 msgid "Couldn't create socket"
 msgstr "Pistokkeen luominen epäonnistui"
 
-#: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2474
+#: ../libpurple/protocols/irc/irc.c:430
 #: ../libpurple/protocols/oscar/oscar.c:1286
 msgid "Couldn't connect to host"
-msgstr "Yhteyttä isäntään ei voitu muodostaa"
-
-#: ../libpurple/protocols/irc/irc.c:609 ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2357
+msgstr "Yhteyttä isäntään ei voi muodostaa"
+
+#: ../libpurple/protocols/irc/irc.c:620 ../libpurple/protocols/irc/irc.c:649
+#: ../libpurple/protocols/myspace/myspace.c:2372
 msgid "Read error"
 msgstr "Virhe luettaessa"
 
-#: ../libpurple/protocols/irc/irc.c:773
+#: ../libpurple/protocols/irc/irc.c:790
 #: ../libpurple/protocols/silc/chat.c:1398
 #: ../libpurple/protocols/silc10/chat.c:1426
 #: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Käyttäjät"
 
-#: ../libpurple/protocols/irc/irc.c:776
-#: ../libpurple/protocols/sametime/sametime.c:3374
+#: ../libpurple/protocols/irc/irc.c:793
+#: ../libpurple/protocols/sametime/sametime.c:3416
 #: ../libpurple/protocols/silc/chat.c:1401
 #: ../libpurple/protocols/silc/ops.c:1393
 #: ../libpurple/protocols/silc10/chat.c:1429
@@ -4232,54 +4261,56 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:914
+#: ../libpurple/protocols/irc/irc.c:931
 msgid "IRC Protocol Plugin"
 msgstr "IRC-yhteyskäytäntöliitännäinen"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:915
+#: ../libpurple/protocols/irc/irc.c:932
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "IRC-yhteyskäytäntöliitännäinen joka on vähemmän huono..."
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:940 ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2312
-#: ../libpurple/protocols/oscar/oscar.c:6726
-#: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5727
+#: ../libpurple/protocols/irc/irc.c:957 ../libpurple/protocols/irc/msgs.c:323
+#: ../libpurple/protocols/msn/msn.c:2335
+#: ../libpurple/protocols/msnp9/msn.c:2186
+#: ../libpurple/protocols/oscar/oscar.c:6721
+#: ../libpurple/protocols/qq/qq.c:756
+#: ../libpurple/protocols/sametime/sametime.c:5773
 #: ../libpurple/protocols/silc/ops.c:1249
 #: ../libpurple/protocols/silc/ops.c:1343
 #: ../libpurple/protocols/silc10/ops.c:1244
 #: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:2061
+#: ../libpurple/protocols/simple/simple.c:2083
 #: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Palvelin"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943 ../libpurple/protocols/msn/msn.c:2317
-#: ../libpurple/protocols/oscar/oscar.c:6729
-#: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:2049
-#: ../libpurple/protocols/silc10/silc.c:1861
+#: ../libpurple/protocols/irc/irc.c:960 ../libpurple/protocols/msn/msn.c:2340
+#: ../libpurple/protocols/msnp9/msn.c:2191
+#: ../libpurple/protocols/oscar/oscar.c:6724
+#: ../libpurple/protocols/qq/qq.c:759
+#: ../libpurple/protocols/sametime/sametime.c:5778
+#: ../libpurple/protocols/silc/silc.c:2061
+#: ../libpurple/protocols/silc10/silc.c:1864
 #: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Portti"
 
-#: ../libpurple/protocols/irc/irc.c:946
+#: ../libpurple/protocols/irc/irc.c:963
 msgid "Encodings"
 msgstr "Merkistöt"
 
-#: ../libpurple/protocols/irc/irc.c:949 ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:904
-#: ../libpurple/protocols/jabber/jabber.c:907
+#: ../libpurple/protocols/irc/irc.c:966 ../libpurple/protocols/irc/msgs.c:316
+#: ../libpurple/protocols/jabber/jabber.c:931
+#: ../libpurple/protocols/jabber/jabber.c:934
 #: ../libpurple/protocols/silc/buddy.c:1542
 #: ../libpurple/protocols/silc/ops.c:1197
 #: ../libpurple/protocols/silc/ops.c:1200
 #: ../libpurple/protocols/silc/ops.c:1336
 #: ../libpurple/protocols/silc/ops.c:1339
-#: ../libpurple/protocols/silc/silc.c:1136
+#: ../libpurple/protocols/silc/silc.c:1148
 #: ../libpurple/protocols/silc10/buddy.c:1542
 #: ../libpurple/protocols/silc10/ops.c:1191
 #: ../libpurple/protocols/silc10/ops.c:1194
@@ -4289,8 +4320,8 @@
 msgid "Username"
 msgstr "Käyttäjänimi"
 
-#: ../libpurple/protocols/irc/irc.c:952 ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1140
+#: ../libpurple/protocols/irc/irc.c:969 ../libpurple/protocols/irc/msgs.c:317
+#: ../libpurple/protocols/silc/silc.c:1152
 #: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Oikea nimi"
@@ -4299,7 +4330,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:960
+#: ../libpurple/protocols/irc/irc.c:977
 msgid "Use SSL"
 msgstr "Käytä SSL:ää"
 
@@ -4330,7 +4361,7 @@
 msgstr "<i>(tunnistettu)</i>"
 
 #: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3715
+#: ../libpurple/protocols/oscar/oscar.c:3710
 #: ../libpurple/protocols/silc/ops.c:1422
 #: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
@@ -4418,7 +4449,7 @@
 
 #: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
-msgstr "Ei voitu lähettää"
+msgstr "Ei voi lähettää"
 
 #: ../libpurple/protocols/irc/msgs.c:682
 #, c-format
@@ -4491,7 +4522,7 @@
 #: ../libpurple/protocols/irc/msgs.c:1113
 #, c-format
 msgid "Cannot join %s: Registration is required."
-msgstr "Ei voitu liittyä kohteeseen %s: Vaatii rekisteröinnin."
+msgstr "Ei voi liittyä kohteeseen %s: Vaatii rekisteröinnin."
 
 #: ../libpurple/protocols/irc/msgs.c:1114
 #: ../libpurple/protocols/silc/ops.c:1093
@@ -4579,7 +4610,7 @@
 "list:  Display a list of chat rooms on the network. <i>Warning, some servers "
 "may disconnect you upon doing this.</i>"
 msgstr ""
-"list: Näytä lista keskusteluhuoneista verkossa. <i>Varoitus, jotkut "
+"list: Näytä luettelo keskusteluhuoneista verkossa. <i>Varoitus, jotkut "
 "palvelimet saattavat katkaista yhteytesi jos teet näin.</i>"
 
 #: ../libpurple/protocols/irc/parse.c:132
@@ -4611,7 +4642,7 @@
 msgstr "names [kanava]: Listaa kanavalla olevat käyttäjät."
 
 #: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2306
+#: ../libpurple/protocols/jabber/jabber.c:2321
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;uusi nimi&gt;: Muuta nimesi."
 
@@ -4732,40 +4763,40 @@
 msgid "CTCP PING reply"
 msgstr "CTCP PING:n vastaus"
 
-#: ../libpurple/protocols/irc/parse.c:632
-#: ../libpurple/protocols/irc/parse.c:636 ../libpurple/protocols/toc/toc.c:191
+#: ../libpurple/protocols/irc/parse.c:633
+#: ../libpurple/protocols/irc/parse.c:640 ../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 "Yhteys katkennut."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:137
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:701
-#: ../libpurple/protocols/jabber/jabber.c:1889
+#: ../libpurple/protocols/jabber/adhoccommands.c:143
+#: ../libpurple/protocols/jabber/jabber.c:698
+#: ../libpurple/protocols/jabber/jabber.c:728
+#: ../libpurple/protocols/jabber/jabber.c:1901
 msgid "Unknown Error"
 msgstr "Tuntematon virhe"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:139
-#: ../libpurple/protocols/jabber/adhoccommands.c:140
+#: ../libpurple/protocols/jabber/adhoccommands.c:145
+#: ../libpurple/protocols/jabber/adhoccommands.c:146
 msgid "Ad-Hoc Command Failed"
 msgstr "Ad-Hoc-komento epäonnistui"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:176
+#: ../libpurple/protocols/jabber/adhoccommands.c:182
 msgid "execute"
 msgstr "suorita"
 
-#: ../libpurple/protocols/jabber/auth.c:53
+#: ../libpurple/protocols/jabber/auth.c:55
 msgid "Server requires TLS/SSL for login.  No TLS/SSL support found."
 msgstr "Palvelin vaatii TSL/SSL-tuen kirjautumiseen. TLS/SSL tukea ei löydy."
 
-#: ../libpurple/protocols/jabber/auth.c:116
+#: ../libpurple/protocols/jabber/auth.c:120
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr ""
 "Palvelin vaatii salaamattoman tunnistautumisen salaamattoman yhteyden yli"
 
-#: ../libpurple/protocols/jabber/auth.c:319
-#: ../libpurple/protocols/jabber/auth.c:508
+#: ../libpurple/protocols/jabber/auth.c:323
+#: ../libpurple/protocols/jabber/auth.c:518
 #, c-format
 msgid ""
 "%s requires plaintext authentication over an unencrypted connection.  Allow "
@@ -4774,33 +4805,32 @@
 "%s vaatii tekstipohjaisen tunnistautumisen salaamattoman yhteyden yli. "
 "Sallitaanko tämä ja jatketaan?"
 
-#: ../libpurple/protocols/jabber/auth.c:321
-#: ../libpurple/protocols/jabber/auth.c:322
-#: ../libpurple/protocols/jabber/auth.c:510
-#: ../libpurple/protocols/jabber/auth.c:511
-#: ../libpurple/protocols/jabber/auth.c:598
-#: ../libpurple/protocols/jabber/auth.c:599
+#: ../libpurple/protocols/jabber/auth.c:325
+#: ../libpurple/protocols/jabber/auth.c:326
+#: ../libpurple/protocols/jabber/auth.c:520
+#: ../libpurple/protocols/jabber/auth.c:521
+#: ../libpurple/protocols/jabber/auth.c:614
+#: ../libpurple/protocols/jabber/auth.c:615
 msgid "Plaintext Authentication"
 msgstr "Tekstipohjainen tunnistus"
 
-#: ../libpurple/protocols/jabber/auth.c:334
-#: ../libpurple/protocols/jabber/auth.c:523
-#: ../libpurple/protocols/jabber/auth.c:610
+#: ../libpurple/protocols/jabber/auth.c:340
+#: ../libpurple/protocols/jabber/auth.c:534
+#: ../libpurple/protocols/jabber/auth.c:627
 msgid "Server does not use any supported authentication method"
-msgstr "Palvelin ei käytä mitään tuettuista tunnistautumismenetelmistä"
-
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:462
-#: ../libpurple/protocols/jabber/auth.c:561
-#: ../libpurple/protocols/jabber/auth.c:776
-#: ../libpurple/protocols/jabber/auth.c:917
-#: ../libpurple/protocols/jabber/auth.c:942
-#: ../libpurple/protocols/jabber/auth.c:961
-#: ../libpurple/protocols/jabber/jabber.c:123
+msgstr "Palvelin ei käytä mitään tuetuista tunnistautumismenetelmistä"
+
+#: ../libpurple/protocols/jabber/auth.c:472
+#: ../libpurple/protocols/jabber/auth.c:576
+#: ../libpurple/protocols/jabber/auth.c:795
+#: ../libpurple/protocols/jabber/auth.c:944
+#: ../libpurple/protocols/jabber/auth.c:971
+#: ../libpurple/protocols/jabber/auth.c:993
+#: ../libpurple/protocols/jabber/jabber.c:127
 msgid "Invalid response from server."
 msgstr "Kelvoton vastaus palvelimelta."
 
-#: ../libpurple/protocols/jabber/auth.c:600
+#: ../libpurple/protocols/jabber/auth.c:616
 msgid ""
 "This server requires plaintext authentication over an unencrypted "
 "connection.  Allow this and continue authentication?"
@@ -4808,18 +4838,18 @@
 "Tämä palvelin vaatii tekstipohjaisen tunnistautumisen salaamattoman yhteyden "
 "yli. Sallitaanko tämä ja jatketaan?"
 
-#: ../libpurple/protocols/jabber/auth.c:797
-#: ../libpurple/protocols/jabber/auth.c:820
+#: ../libpurple/protocols/jabber/auth.c:818
+#: ../libpurple/protocols/jabber/auth.c:843
 msgid "Invalid challenge from server"
 msgstr "Virheellinen tunnistushaaste palvelimelta"
 
-#: ../libpurple/protocols/jabber/auth.c:892
+#: ../libpurple/protocols/jabber/auth.c:917
 msgid "SASL error"
 msgstr "SASL-virhe"
 
 #: ../libpurple/protocols/jabber/buddy.c:283
 #: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4128
+#: ../libpurple/protocols/sametime/sametime.c:4174
 #: ../libpurple/protocols/silc/ops.c:986
 #: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
@@ -4838,7 +4868,7 @@
 msgstr "Etunimi"
 
 #: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:977
+#: ../libpurple/protocols/jabber/jabber.c:1004
 msgid "URL"
 msgstr "URL"
 
@@ -4869,7 +4899,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:293
 #: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1146
+#: ../libpurple/protocols/silc/silc.c:1158
 #: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Maa"
@@ -4897,16 +4927,17 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:300
 #: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1783
-#: ../libpurple/protocols/oscar/oscar.c:3764
+#: ../libpurple/protocols/msn/msn.c:1806
+#: ../libpurple/protocols/msnp9/msn.c:1659
+#: ../libpurple/protocols/oscar/oscar.c:3759
 msgid "Birthday"
 msgstr "Syntymäpäivä"
 
 #: ../libpurple/protocols/jabber/buddy.c:301
 #: ../libpurple/protocols/jabber/buddy.c:1365
 #: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3317
-#: ../pidgin/gtkprefs.c:739
+#: ../libpurple/protocols/jabber/usermood.c:193 ../pidgin/gtkblist.c:3350
+#: ../pidgin/gtkprefs.c:740
 msgid "Description"
 msgstr "Kuvaus"
 
@@ -5025,7 +5056,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:851
 #: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3235
+#: ../libpurple/protocols/sametime/sametime.c:3277
 msgid "File Transfer"
 msgstr "Tiedostonsiirto"
 
@@ -5190,7 +5221,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:921
 #: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2921
+#: ../libpurple/protocols/oscar/oscar.c:2916
 msgid "Capabilities"
 msgstr "Kyvyt"
 
@@ -5201,11 +5232,11 @@
 msgstr "Sijainti"
 
 #: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../libpurple/protocols/jabber/jabber.c:1577
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1623
+#: ../libpurple/protocols/jabber/jabber.c:1569
+#: ../libpurple/protocols/jabber/jabber.c:1583
+#: ../libpurple/protocols/jabber/jabber.c:1597
+#: ../libpurple/protocols/jabber/jabber.c:1611
+#: ../libpurple/protocols/jabber/jabber.c:1625
 msgid "Priority"
 msgstr "Tärkeys"
 
@@ -5216,9 +5247,9 @@
 msgstr "Muut etunimet"
 
 #: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3803
-#: ../libpurple/protocols/oscar/oscar.c:3816
+#: ../libpurple/protocols/jabber/jabber.c:979
+#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3811
 #: ../libpurple/protocols/qq/buddy_info.c:56
 #: ../libpurple/protocols/silc/ops.c:1030
 #: ../libpurple/protocols/silc10/ops.c:1064
@@ -5270,7 +5301,7 @@
 msgstr "Kirjaudu ulos"
 
 #: ../libpurple/protocols/jabber/buddy.c:2038
-#: ../libpurple/protocols/jabber/jabber.c:1553
+#: ../libpurple/protocols/jabber/jabber.c:1582
 msgid "Chatty"
 msgstr "Juttelutuulella"
 
@@ -5279,10 +5310,10 @@
 msgstr "Pidennetty poissaolo"
 
 #: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/jabber/jabber.c:1622
+#: ../libpurple/protocols/jabber/jabber.c:1624
 #: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5863
-#: ../libpurple/protocols/sametime/sametime.c:3297
+#: ../libpurple/protocols/oscar/oscar.c:5858
+#: ../libpurple/protocols/sametime/sametime.c:3339
 #, c-format
 msgid "Do Not Disturb"
 msgstr "Älä häiritse"
@@ -5293,7 +5324,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:2215
 #: ../libpurple/protocols/jabber/buddy.c:2404
-#: ../libpurple/protocols/oscar/oscar.c:3726
+#: ../libpurple/protocols/oscar/oscar.c:3721
 msgid "Last Name"
 msgstr "Sukunimi"
 
@@ -5316,7 +5347,7 @@
 
 #: ../libpurple/protocols/jabber/buddy.c:2353
 msgid "Could not query the directory server."
-msgstr "Ei voitu hakea hakemistopalvelimelta."
+msgstr "Ei voi hakea hakemistopalvelimelta."
 
 #. Try to translate the message (see static message
 #. list in jabber_user_dir_comments[])
@@ -5330,9 +5361,9 @@
 msgstr "Täytä yksi tai useampia kentistä etsiäksesi XMPP-käyttäjiä."
 
 #: ../libpurple/protocols/jabber/buddy.c:2414
-#: ../libpurple/protocols/novell/novell.c:1490
-#: ../libpurple/protocols/oscar/oscar.c:3729
-#: ../libpurple/protocols/oscar/oscar.c:3738
+#: ../libpurple/protocols/novell/novell.c:1497
+#: ../libpurple/protocols/oscar/oscar.c:3724
+#: ../libpurple/protocols/oscar/oscar.c:3733
 msgid "E-Mail Address"
 msgstr "Sähköpostiosoite"
 
@@ -5348,7 +5379,7 @@
 #: ../libpurple/protocols/qq/sys_msg.c:174
 #: ../libpurple/protocols/qq/sys_msg.c:250
 #: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5611
+#: ../libpurple/protocols/sametime/sametime.c:5657
 #: ../pidgin/plugins/gevolution/add_buddy_dialog.c:470
 #: ../pidgin/plugins/gevolution/assoc-buddy.c:356
 msgid "Search"
@@ -5371,7 +5402,7 @@
 msgstr "Etsi hakemistosta"
 
 #: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5347
+#: ../libpurple/protocols/oscar/oscar.c:5342
 #: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Huone:"
@@ -5444,7 +5475,7 @@
 #: ../libpurple/protocols/silc/ops.c:1460
 #: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
-msgstr "Virhe haettaessa huonelistaa"
+msgstr "Virhe haettaessa huoneluetteloa"
 
 #: ../libpurple/protocols/jabber/chat.c:737
 msgid "Invalid Server"
@@ -5462,224 +5493,221 @@
 msgid "Find Rooms"
 msgstr "Etsi huoneita"
 
-#: ../libpurple/protocols/jabber/jabber.c:92
-msgid "Error initializing session"
-msgstr "Virhe istunnon alustuksessa"
-
-#: ../libpurple/protocols/jabber/jabber.c:145
+#: ../libpurple/protocols/jabber/jabber.c:151
 msgid "You require encryption, but it is not available on this server."
 msgstr "Salausta vaadittu, mutta sitä ei tueta tällä palvelimella."
 
-#: ../libpurple/protocols/jabber/jabber.c:259
-#: ../libpurple/protocols/jabber/jabber.c:312
-#: ../libpurple/protocols/jabber/jabber.c:340
+#: ../libpurple/protocols/jabber/jabber.c:269
+#: ../libpurple/protocols/jabber/jabber.c:324
+#: ../libpurple/protocols/jabber/jabber.c:354
 msgid "Write error"
 msgstr "Virhe kirjoituksessa"
 
-#: ../libpurple/protocols/jabber/jabber.c:408
-#: ../libpurple/protocols/jabber/jabber.c:445
+#: ../libpurple/protocols/jabber/jabber.c:424
+#: ../libpurple/protocols/jabber/jabber.c:463
 msgid "Read Error"
 msgstr "Virhe luettaessa"
 
-#: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/protocols/yahoo/yahoo.c:2560
-#: ../libpurple/protocols/yahoo/yahoo.c:2592
+#: ../libpurple/protocols/jabber/jabber.c:500
+#: ../libpurple/protocols/oscar/flap_connection.c:398
+#: ../libpurple/protocols/yahoo/yahoo.c:2562
+#: ../libpurple/protocols/yahoo/yahoo.c:2594
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
 "%s"
 msgstr ""
-"Ei voitu muodostaa yhteyttä palvelimeen:\n"
+"Ei voi muodostaa yhteyttä palvelimeen:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:529
+#: ../libpurple/protocols/jabber/jabber.c:550
 msgid "Unable to create socket"
 msgstr "Pistokkeen luonti epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:575
-#: ../libpurple/protocols/jabber/jabber.c:1063
+#: ../libpurple/protocols/jabber/jabber.c:598
+#: ../libpurple/protocols/jabber/jabber.c:1092
 msgid "Invalid XMPP ID"
 msgstr "Epäkelpo XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:580
+#: ../libpurple/protocols/jabber/jabber.c:605
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Epäkelpo XMPP-ID. Verkkoalue pitää olla asetettu."
 
-#: ../libpurple/protocols/jabber/jabber.c:656
+#: ../libpurple/protocols/jabber/jabber.c:683
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "%s@%s:n rekisteröinti onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:662
+#: ../libpurple/protocols/jabber/jabber.c:689
 #, c-format
 msgid "Registration to %s successful"
 msgstr "Rekisteröinti kohteesen %s onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:665
+#: ../libpurple/protocols/jabber/jabber.c:691
+#: ../libpurple/protocols/jabber/jabber.c:692
 msgid "Registration Successful"
 msgstr "Rekisteröinti onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:674
+#: ../libpurple/protocols/jabber/jabber.c:700
+#: ../libpurple/protocols/jabber/jabber.c:701
 msgid "Registration Failed"
 msgstr "Rekisteröinti epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:692
+#: ../libpurple/protocols/jabber/jabber.c:719
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "Rekisteröinti kohteesta %s onnistuneesti poistettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:694
-#: ../libpurple/protocols/jabber/jabber.c:695
+#: ../libpurple/protocols/jabber/jabber.c:721
+#: ../libpurple/protocols/jabber/jabber.c:722
 msgid "Unregistration Successful"
 msgstr "Rekisteröinnin poisto onnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:703
-#: ../libpurple/protocols/jabber/jabber.c:704
+#: ../libpurple/protocols/jabber/jabber.c:730
+#: ../libpurple/protocols/jabber/jabber.c:731
 msgid "Unregistration Failed"
 msgstr "Rekisteröinnin poisto epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
-#: ../libpurple/protocols/jabber/jabber.c:865
+#: ../libpurple/protocols/jabber/jabber.c:891
+#: ../libpurple/protocols/jabber/jabber.c:892
 msgid "Already Registered"
 msgstr "Valmiiksi rekisteröity"
 
-#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3805
-#: ../libpurple/protocols/oscar/oscar.c:3818
+#: ../libpurple/protocols/jabber/jabber.c:989
+#: ../libpurple/protocols/oscar/oscar.c:3800
+#: ../libpurple/protocols/oscar/oscar.c:3813
 msgid "State"
 msgstr "Lääni"
 
-#: ../libpurple/protocols/jabber/jabber.c:967
+#: ../libpurple/protocols/jabber/jabber.c:994
 msgid "Postal code"
 msgstr "Postinumero"
 
-#: ../libpurple/protocols/jabber/jabber.c:972
+#: ../libpurple/protocols/jabber/jabber.c:999
 #: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:903
-#: ../libpurple/protocols/silc/util.c:561
+#: ../libpurple/protocols/silc/silc.c:915
+#: ../libpurple/protocols/silc/util.c:563
 #: ../libpurple/protocols/silc10/ops.c:1069
 #: ../libpurple/protocols/silc10/silc.c:683
 #: ../libpurple/protocols/silc10/util.c:553
 msgid "Phone"
 msgstr "Puhelin"
 
-#: ../libpurple/protocols/jabber/jabber.c:982
+#: ../libpurple/protocols/jabber/jabber.c:1009
 msgid "Date"
 msgstr "Päiväys"
 
-#: ../libpurple/protocols/jabber/jabber.c:987
+#: ../libpurple/protocols/jabber/jabber.c:1014
 msgid "Unregister"
 msgstr "Rekisteröinnin poisto"
 
-#: ../libpurple/protocols/jabber/jabber.c:994
+#: ../libpurple/protocols/jabber/jabber.c:1021
 msgid ""
 "Please fill out the information below to change your account registration."
 msgstr "Syötä alla olevat tiedot muuttaaksesi käyttäjätilin rekisteröimistä."
 
-#: ../libpurple/protocols/jabber/jabber.c:997
+#: ../libpurple/protocols/jabber/jabber.c:1024
 msgid "Please fill out the information below to register your new account."
 msgstr "Syötä alla olevat tiedot rekisteröidäksesi uuden tilin."
 
-#: ../libpurple/protocols/jabber/jabber.c:1005
-#: ../libpurple/protocols/jabber/jabber.c:1006
+#: ../libpurple/protocols/jabber/jabber.c:1032
+#: ../libpurple/protocols/jabber/jabber.c:1033
 msgid "Register New XMPP Account"
 msgstr "Rekisteröi uusi XMPP-tili"
 
-#: ../libpurple/protocols/jabber/jabber.c:1007
-#: ../libpurple/protocols/jabber/jabber.c:1016
+#: ../libpurple/protocols/jabber/jabber.c:1034
+#: ../libpurple/protocols/jabber/jabber.c:1043
 msgid "Register"
 msgstr "Rekisteröi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
+#: ../libpurple/protocols/jabber/jabber.c:1039
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "Vaihda tilin rekisteröitymistä kohteessa %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1013
+#: ../libpurple/protocols/jabber/jabber.c:1040
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Rekisteröi uusi tili kohteessa %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1016
+#: ../libpurple/protocols/jabber/jabber.c:1043
 msgid "Change Registration"
 msgstr "Muuta rekisteröitymistä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1120
-#: ../libpurple/protocols/jabber/jabber.c:1121
+#: ../libpurple/protocols/jabber/jabber.c:1151
+#: ../libpurple/protocols/jabber/jabber.c:1152
 msgid "Error unregistering account"
 msgstr "Virhe poistettaessa käyttäjätilin rekisteröitymistä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1127
+#: ../libpurple/protocols/jabber/jabber.c:1157
+#: ../libpurple/protocols/jabber/jabber.c:1158
 msgid "Account successfully unregistered"
 msgstr "Käyttäjätilin rekisteröinti poistettiin onnistuneesti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1284
+#: ../libpurple/protocols/jabber/jabber.c:1315
 msgid "Initializing Stream"
 msgstr "Alustetaan datavirtaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1289
+#: ../libpurple/protocols/jabber/jabber.c:1320
 msgid "Initializing SSL/TLS"
 msgstr "Alustetaan SSL/TLS-salausta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:400
+#: ../libpurple/protocols/jabber/jabber.c:1324
+#: ../libpurple/protocols/msn/session.c:408
+#: ../libpurple/protocols/msnp9/session.c:361
 msgid "Authenticating"
 msgstr "Todennetaan"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
+#: ../libpurple/protocols/jabber/jabber.c:1333
 msgid "Re-initializing Stream"
 msgstr "Uudelleenalustetaan datavirtaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1396
-#: ../libpurple/protocols/jabber/jabber.c:1867
-#: ../libpurple/protocols/jabber/jabber.c:1911
-#: ../libpurple/protocols/jabber/jabber.c:1947
+#: ../libpurple/protocols/jabber/jabber.c:1427
+#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1960
 #: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5657
+#: ../libpurple/protocols/oscar/oscar.c:5652
 msgid "Not Authorized"
 msgstr "Ei valtuuksia"
 
-#: ../libpurple/protocols/jabber/jabber.c:1442
+#: ../libpurple/protocols/jabber/jabber.c:1475
 msgid "Both"
 msgstr "molemmille"
 
-#: ../libpurple/protocols/jabber/jabber.c:1444
+#: ../libpurple/protocols/jabber/jabber.c:1477
 msgid "From (To pending)"
 msgstr "vain sinulle (odottaa lupaa)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1446
+#: ../libpurple/protocols/jabber/jabber.c:1479
 msgid "From"
 msgstr "Lähettäjä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1449
+#: ../libpurple/protocols/jabber/jabber.c:1482
 msgid "To"
 msgstr "vain sinulta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1451
+#: ../libpurple/protocols/jabber/jabber.c:1484
 msgid "None (To pending)"
 msgstr "Ei mitään (odottaa lupaa)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1453
+#: ../libpurple/protocols/jabber/jabber.c:1486
 #: ../pidgin/plugins/gevolution/eds-utils.c:73
 #: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Ei mitään"
 
-#: ../libpurple/protocols/jabber/jabber.c:1456
+#: ../libpurple/protocols/jabber/jabber.c:1489
 msgid "Subscription"
 msgstr "Tilailmoitus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1466
-#: ../libpurple/protocols/jabber/jabber.c:1469
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1556
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1625
+#: ../libpurple/protocols/jabber/jabber.c:1499
+#: ../libpurple/protocols/jabber/jabber.c:1502
+#: ../libpurple/protocols/jabber/jabber.c:1571
+#: ../libpurple/protocols/jabber/jabber.c:1585
+#: ../libpurple/protocols/jabber/jabber.c:1599
+#: ../libpurple/protocols/jabber/jabber.c:1613
+#: ../libpurple/protocols/jabber/jabber.c:1627
 #: ../libpurple/protocols/jabber/usermood.c:184
 #: ../libpurple/protocols/silc/buddy.c:1560
 #: ../libpurple/protocols/silc/ops.c:1212
@@ -5688,434 +5716,403 @@
 msgid "Mood"
 msgstr "Mieliala"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/jabber/jabber.c:1580
-#: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1626
+#: ../libpurple/protocols/jabber/jabber.c:1507
+#: ../libpurple/protocols/msn/msn.c:647
+msgid "Current media"
+msgstr "Nykyinen media"
+
+#: ../libpurple/protocols/jabber/jabber.c:1572
+#: ../libpurple/protocols/jabber/jabber.c:1586
+#: ../libpurple/protocols/jabber/jabber.c:1600
+#: ../libpurple/protocols/jabber/jabber.c:1614
+#: ../libpurple/protocols/jabber/jabber.c:1628
 msgid "Mood Text"
 msgstr "Mielialan teksti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
-#: ../libpurple/protocols/jabber/jabber.c:1558
-#: ../libpurple/protocols/jabber/jabber.c:1581
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1627
+#: ../libpurple/protocols/jabber/jabber.c:1574
+#: ../libpurple/protocols/jabber/jabber.c:1588
+#: ../libpurple/protocols/jabber/jabber.c:1602
+#: ../libpurple/protocols/jabber/jabber.c:1616
+#: ../libpurple/protocols/jabber/jabber.c:1630
+msgid "Allow Buzz"
+msgstr "Salli äänimerkki"
+
+#: ../libpurple/protocols/jabber/jabber.c:1648
 msgid "Tune Artist"
 msgstr "Kappaleen esittäjä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1536
-#: ../libpurple/protocols/jabber/jabber.c:1559
-#: ../libpurple/protocols/jabber/jabber.c:1582
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1628
+#: ../libpurple/protocols/jabber/jabber.c:1649
 msgid "Tune Title"
 msgstr "Kappaleen nimi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1560
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1606
-#: ../libpurple/protocols/jabber/jabber.c:1629
+#: ../libpurple/protocols/jabber/jabber.c:1650
 msgid "Tune Album"
 msgstr "Kappaleen levy"
 
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1630
+#: ../libpurple/protocols/jabber/jabber.c:1651
 msgid "Tune Genre"
 msgstr "Kappaleen tyylilaji"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1562
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1631
+#: ../libpurple/protocols/jabber/jabber.c:1652
 msgid "Tune Comment"
 msgstr "Kappaleen kommentti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1632
+#: ../libpurple/protocols/jabber/jabber.c:1653
 msgid "Tune Track"
 msgstr "Kappaleen numero"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1633
+#: ../libpurple/protocols/jabber/jabber.c:1654
 msgid "Tune Time"
 msgstr "Kappaleen kesto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1542
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1634
+#: ../libpurple/protocols/jabber/jabber.c:1655
 msgid "Tune Year"
 msgstr "Kappaleen vuosi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1589
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1635
+#: ../libpurple/protocols/jabber/jabber.c:1656
 msgid "Tune URL"
 msgstr "Kappaleen URL"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
-#: ../libpurple/protocols/jabber/jabber.c:1568
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1637
-msgid "Allow Buzz"
-msgstr "Salli äänimerkki"
-
-#: ../libpurple/protocols/jabber/jabber.c:1665
+#: ../libpurple/protocols/jabber/jabber.c:1672
 msgid "Password Changed"
 msgstr "Salasana muutettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
+#: ../libpurple/protocols/jabber/jabber.c:1673
 msgid "Your password has been changed."
 msgstr "Salasana vaihdettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1672
-#: ../libpurple/protocols/jabber/jabber.c:1673
+#: ../libpurple/protocols/jabber/jabber.c:1679
+#: ../libpurple/protocols/jabber/jabber.c:1680
 msgid "Error changing password"
 msgstr "Virhe vaihdettaessa salasanaa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1730
+#: ../libpurple/protocols/jabber/jabber.c:1737
 msgid "Password (again)"
 msgstr "Salasana (uudelleen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1736
-#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/jabber.c:1743
+#: ../libpurple/protocols/jabber/jabber.c:1744
 msgid "Change XMPP Password"
 msgstr "Vaihda XMPP-salasana"
 
-#: ../libpurple/protocols/jabber/jabber.c:1737
+#: ../libpurple/protocols/jabber/jabber.c:1744
 msgid "Please enter your new password"
 msgstr "Anna uusi salasanasi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1751
-#: ../libpurple/protocols/oscar/oscar.c:6443
-#: ../libpurple/protocols/silc/silc.c:1224
-#: ../libpurple/protocols/silc10/silc.c:1004
+#: ../libpurple/protocols/jabber/jabber.c:1758
+#: ../libpurple/protocols/oscar/oscar.c:6438
+#: ../libpurple/protocols/silc/silc.c:1236
+#: ../libpurple/protocols/silc10/silc.c:1007
 msgid "Set User Info..."
 msgstr "Aseta käyttäjätiedot..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1756
-#: ../libpurple/protocols/oscar/oscar.c:6454
-#: ../libpurple/protocols/silc/silc.c:1220
-#: ../libpurple/protocols/silc10/silc.c:1000
+#: ../libpurple/protocols/jabber/jabber.c:1763
+#: ../libpurple/protocols/oscar/oscar.c:6449
+#: ../libpurple/protocols/silc/silc.c:1232
+#: ../libpurple/protocols/silc10/silc.c:1003
 msgid "Change Password..."
 msgstr "Vaihda salasana..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1761
+#: ../libpurple/protocols/jabber/jabber.c:1768
 msgid "Search for Users..."
 msgstr "Etsi käyttäjiä..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
+#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Bad Request"
 msgstr "Virheellinen pyyntö"
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
+#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Conflict"
 msgstr "Ristiriita"
 
-#: ../libpurple/protocols/jabber/jabber.c:1851
+#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Feature Not Implemented"
 msgstr "Ominaisuutta ei ole implementoitu."
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
+#: ../libpurple/protocols/jabber/jabber.c:1865
 msgid "Forbidden"
 msgstr "Estetty"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
+#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "Gone"
 msgstr "Poistunut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
-#: ../libpurple/protocols/jabber/jabber.c:1937
+#: ../libpurple/protocols/jabber/jabber.c:1869
+#: ../libpurple/protocols/jabber/jabber.c:1950
 msgid "Internal Server Error"
 msgstr "Sisäinen palvelinvirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
+#: ../libpurple/protocols/jabber/jabber.c:1871
 msgid "Item Not Found"
 msgstr "Kohdetta ei löytynyt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
+#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Malformed XMPP ID"
 msgstr "Muodoltaan virheellinen XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
+#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Not Acceptable"
 msgstr "Ei kelvollinen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1865
+#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Not Allowed"
 msgstr "Ei sallittu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
+#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Payment Required"
 msgstr "Vaatii maksun"
 
-#: ../libpurple/protocols/jabber/jabber.c:1871
+#: ../libpurple/protocols/jabber/jabber.c:1883
 msgid "Recipient Unavailable"
 msgstr "Vastaanottaja ei saatavilla."
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
+#: ../libpurple/protocols/jabber/jabber.c:1887
 msgid "Registration Required"
 msgstr "Vaatii rekisteröinnin"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
+#: ../libpurple/protocols/jabber/jabber.c:1889
 msgid "Remote Server Not Found"
 msgstr "Palvelinta ei löytynyt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1879
+#: ../libpurple/protocols/jabber/jabber.c:1891
 msgid "Remote Server Timeout"
 msgstr "Palvelin aikakatkaisi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
+#: ../libpurple/protocols/jabber/jabber.c:1893
 msgid "Server Overloaded"
 msgstr "Palvelin ylikuormitettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1883
+#: ../libpurple/protocols/jabber/jabber.c:1895
 msgid "Service Unavailable"
 msgstr "Palvelu ei käytettävissä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1885
+#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Subscription Required"
 msgstr "Vaatii tilailmoitukset"
 
-#: ../libpurple/protocols/jabber/jabber.c:1887
+#: ../libpurple/protocols/jabber/jabber.c:1899
 msgid "Unexpected Request"
 msgstr "Odottamaton pyyntö"
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
+#: ../libpurple/protocols/jabber/jabber.c:1907
 msgid "Authorization Aborted"
 msgstr "Valtuutus keskeytetty"
 
-#: ../libpurple/protocols/jabber/jabber.c:1896
+#: ../libpurple/protocols/jabber/jabber.c:1909
 msgid "Incorrect encoding in authorization"
 msgstr "Väärä merkistö valtuutusviestissä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1899
+#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Invalid authzid"
 msgstr "Epäkelpo authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1902
+#: ../libpurple/protocols/jabber/jabber.c:1913
 msgid "Invalid Authorization Mechanism"
 msgstr "Epäkelpo tunnistautumismekanismi"
 
-#: ../libpurple/protocols/jabber/jabber.c:1905
+#: ../libpurple/protocols/jabber/jabber.c:1916
 msgid "Authorization mechanism too weak"
 msgstr "Tunnistautumismekanismi liian heikko"
 
-#: ../libpurple/protocols/jabber/jabber.c:1913
+#: ../libpurple/protocols/jabber/jabber.c:1924
 msgid "Temporary Authentication Failure"
 msgstr "Väliaikainen todennusvirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1916
+#: ../libpurple/protocols/jabber/jabber.c:1927
 msgid "Authentication Failure"
 msgstr "Todennus epäonnistui"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
+#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Bad Format"
 msgstr "Väärä muoto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1924
+#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Bad Namespace Prefix"
 msgstr "Väärä nimiavaruuden etuliite"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
+#: ../libpurple/protocols/jabber/jabber.c:1940
 msgid "Resource Conflict"
 msgstr "Sijaintikonflikti"
 
-#: ../libpurple/protocols/jabber/jabber.c:1929
-#: ../libpurple/protocols/silc/silc.c:344
+#: ../libpurple/protocols/jabber/jabber.c:1942
+#: ../libpurple/protocols/silc/silc.c:350
 #: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Ei yhteyttä määräajassa"
 
-#: ../libpurple/protocols/jabber/jabber.c:1931
+#: ../libpurple/protocols/jabber/jabber.c:1944
 msgid "Host Gone"
 msgstr "Verkkoisäntä kadonnut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
+#: ../libpurple/protocols/jabber/jabber.c:1946
 msgid "Host Unknown"
 msgstr "Tuntematon isäntä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1935
+#: ../libpurple/protocols/jabber/jabber.c:1948
 msgid "Improper Addressing"
 msgstr "Vääränlainen osoitus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1939
+#: ../libpurple/protocols/jabber/jabber.c:1952
 msgid "Invalid ID"
 msgstr "Epäkelpo ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
+#: ../libpurple/protocols/jabber/jabber.c:1954
 msgid "Invalid Namespace"
 msgstr "Väärä nimiavaruus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1943
+#: ../libpurple/protocols/jabber/jabber.c:1956
 msgid "Invalid XML"
 msgstr "Epäkelpo XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1945
+#: ../libpurple/protocols/jabber/jabber.c:1958
 msgid "Non-matching Hosts"
 msgstr "Verkkoisännät eivät täsmää"
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
+#: ../libpurple/protocols/jabber/jabber.c:1962
 msgid "Policy Violation"
 msgstr "Menettelykäytäntörikkomus"
 
-#: ../libpurple/protocols/jabber/jabber.c:1951
+#: ../libpurple/protocols/jabber/jabber.c:1964
 msgid "Remote Connection Failed"
 msgstr "Etäyhteydessä yhteydessä virhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:1953
+#: ../libpurple/protocols/jabber/jabber.c:1966
 msgid "Resource Constraint"
 msgstr "Sijaintirajoite"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
+#: ../libpurple/protocols/jabber/jabber.c:1968
 msgid "Restricted XML"
 msgstr "Rajoitettu XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
+#: ../libpurple/protocols/jabber/jabber.c:1970
 msgid "See Other Host"
 msgstr "Etsi toinen isäntä"
 
-#: ../libpurple/protocols/jabber/jabber.c:1959
+#: ../libpurple/protocols/jabber/jabber.c:1972
 msgid "System Shutdown"
 msgstr "Järjestelmän alasajo"
 
-#: ../libpurple/protocols/jabber/jabber.c:1961
+#: ../libpurple/protocols/jabber/jabber.c:1974
 msgid "Undefined Condition"
 msgstr "Määrittelemätön tila"
 
-#: ../libpurple/protocols/jabber/jabber.c:1963
+#: ../libpurple/protocols/jabber/jabber.c:1976
 msgid "Unsupported Encoding"
 msgstr "Merkistöä ei tueta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
+#: ../libpurple/protocols/jabber/jabber.c:1978
 msgid "Unsupported Stanza Type"
 msgstr "Säkeistötyyppiä(stanza type) ei tuettu"
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
+#: ../libpurple/protocols/jabber/jabber.c:1980
 msgid "Unsupported Version"
 msgstr "Versiota ei tueta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
+#: ../libpurple/protocols/jabber/jabber.c:1982
 msgid "XML Not Well Formed"
 msgstr "Huonosti muotoiltua XML:ää"
 
-#: ../libpurple/protocols/jabber/jabber.c:1971
+#: ../libpurple/protocols/jabber/jabber.c:1984
 msgid "Stream Error"
 msgstr "Datavirtavirhe"
 
-#: ../libpurple/protocols/jabber/jabber.c:2054
+#: ../libpurple/protocols/jabber/jabber.c:2069
 #, c-format
 msgid "Unable to ban user %s"
-msgstr "Ei voitu kieltää käyttäjää %s."
-
-#: ../libpurple/protocols/jabber/jabber.c:2074
+msgstr "Ei voi kieltää käyttäjää %s."
+
+#: ../libpurple/protocols/jabber/jabber.c:2089
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Tuntematon kytkös: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2079
+#: ../libpurple/protocols/jabber/jabber.c:2094
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
-msgstr "Ei voitua tehdä käyttäjälle %s kytköstä \"%s\""
-
-#: ../libpurple/protocols/jabber/jabber.c:2098
+msgstr "Ei voi tehdä käyttäjälle %s kytköstä \"%s\""
+
+#: ../libpurple/protocols/jabber/jabber.c:2113
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Tuntematon rooli: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2103
+#: ../libpurple/protocols/jabber/jabber.c:2118
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
-msgstr "Ei voitu asettaa roolia \"%s\" käyttäjälle: %s"
-
-#: ../libpurple/protocols/jabber/jabber.c:2156
+msgstr "Ei voi asettaa roolia \"%s\" käyttäjälle: %s"
+
+#: ../libpurple/protocols/jabber/jabber.c:2171
 #, c-format
 msgid "Unable to kick user %s"
-msgstr "Ei voitu potkaista käyttäjää %s ulos."
-
-#: ../libpurple/protocols/jabber/jabber.c:2187
+msgstr "Ei voi potkaista käyttäjää %s ulos."
+
+#: ../libpurple/protocols/jabber/jabber.c:2202
 #, c-format
 msgid "Unable to ping user %s"
-msgstr "Ei voitu pingata käyttäjää %s."
-
-#: ../libpurple/protocols/jabber/jabber.c:2205
-#: ../libpurple/protocols/jabber/jabber.c:2216
+msgstr "Ei voi pingata käyttäjää %s."
+
+#: ../libpurple/protocols/jabber/jabber.c:2220
+#: ../libpurple/protocols/jabber/jabber.c:2231
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr "Äänimerkkiä ei voitu lähettää, koska mitään ei tiedetä käyttäjästä %s."
-
-#: ../libpurple/protocols/jabber/jabber.c:2211
+msgstr "Äänimerkkiä ei voi lähettää, koska mitään ei tiedetä käyttäjästä %s."
+
+#: ../libpurple/protocols/jabber/jabber.c:2226
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
 msgstr ""
-"Äänimerkkiä ei voitu lähettää, koska käyttäjä %s voi olla poissa linjoilta."
-
-#: ../libpurple/protocols/jabber/jabber.c:2242
+"Äänimerkkiä ei voi lähettää, koska käyttäjä %s voi olla poissa linjoilta."
+
+#: ../libpurple/protocols/jabber/jabber.c:2257
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
-msgstr "Äänimerkkiä ei voitu lähettää, koska käyttäjä %s ei tue sitä."
-
-#: ../libpurple/protocols/jabber/jabber.c:2264
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
+msgstr "Äänimerkkiä ei voi lähettää, koska käyttäjä %s ei tue sitä."
+
+#: ../libpurple/protocols/jabber/jabber.c:2279
+#: ../libpurple/protocols/yahoo/yahoo.c:4130
 msgid "Buzz"
 msgstr "Tööttää"
 
-#: ../libpurple/protocols/jabber/jabber.c:2265
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4122
+#: ../libpurple/protocols/jabber/jabber.c:2280
+#: ../libpurple/protocols/jabber/message.c:308
+#: ../libpurple/protocols/yahoo/yahoo.c:4131
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "%s on töötännyt sinulle."
 
-#: ../libpurple/protocols/jabber/jabber.c:2266
-#: ../libpurple/protocols/yahoo/yahoo.c:4123
+#: ../libpurple/protocols/jabber/jabber.c:2281
+#: ../libpurple/protocols/yahoo/yahoo.c:4132
 #, c-format
 msgid "Buzzing %s..."
 msgstr "Töötätään tuttavalle %s..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2298
+#: ../libpurple/protocols/jabber/jabber.c:2313
 msgid "config:  Configure a chat room."
-msgstr "config: Configuroi ryhmäkeskusteluhuone."
-
-#: ../libpurple/protocols/jabber/jabber.c:2302
+msgstr "config: Konfiguroi ryhmäkeskusteluhuone."
+
+#: ../libpurple/protocols/jabber/jabber.c:2317
 msgid "configure:  Configure a chat room."
-msgstr "configure: Configuroi ryhmäkeskusteluhuone."
-
-#: ../libpurple/protocols/jabber/jabber.c:2311
+msgstr "configure: Konfiguroi ryhmäkeskusteluhuone."
+
+#: ../libpurple/protocols/jabber/jabber.c:2326
 msgid "part [room]:  Leave the room."
 msgstr "part [huone]: Poistu huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:2316
+#: ../libpurple/protocols/jabber/jabber.c:2331
 msgid "register:  Register with a chat room."
 msgstr "register: Rekisteröidy ryhmäkeskusteluhuoneeseen."
 
-#: ../libpurple/protocols/jabber/jabber.c:2322
+#: ../libpurple/protocols/jabber/jabber.c:2337
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [uusi aihe]: Näytä tai vaihda aihe."
 
-#: ../libpurple/protocols/jabber/jabber.c:2328
+#: ../libpurple/protocols/jabber/jabber.c:2343
 msgid "ban &lt;user&gt; [room]:  Ban a user from the room."
 msgstr "ban &lt;käyttäjä&gt; [huone]: Kiellä käyttäjä huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:2334
+#: ../libpurple/protocols/jabber/jabber.c:2349
 msgid ""
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Set a user's "
 "affiliation with the room."
@@ -6123,7 +6120,7 @@
 "affiliate &lt;user&gt; &lt;owner|admin|member|outcast|none&gt;: Aseta "
 "käyttäjän käyttäjäluokka tälle huoneelle."
 
-#: ../libpurple/protocols/jabber/jabber.c:2340
+#: ../libpurple/protocols/jabber/jabber.c:2355
 msgid ""
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Set a user's "
 "role in the room."
@@ -6131,31 +6128,31 @@
 "role &lt;user&gt; &lt;moderator|participant|visitor|none&gt;: Aseta "
 "käyttäjän rooli huoneessa."
 
-#: ../libpurple/protocols/jabber/jabber.c:2346
+#: ../libpurple/protocols/jabber/jabber.c:2361
 msgid "invite &lt;user&gt; [message]:  Invite a user to the room."
 msgstr "invite &lt;käyttäjä&gt; [viesti]: Kutsu käyttäjä huoneeseen."
 
-#: ../libpurple/protocols/jabber/jabber.c:2352
+#: ../libpurple/protocols/jabber/jabber.c:2367
 msgid "join: &lt;room&gt; [server]:  Join a chat on this server."
 msgstr ""
 "join: &lt;huone&gt; [palvelin]: Liity ryhmäkeskusteluun tällä palvelimella."
 
-#: ../libpurple/protocols/jabber/jabber.c:2358
+#: ../libpurple/protocols/jabber/jabber.c:2373
 msgid "kick &lt;user&gt; [room]:  Kick a user from the room."
 msgstr "kick &lt;käyttäjä&gt; [huone]: Potkaise käyttäjä ulos huoneesta."
 
-#: ../libpurple/protocols/jabber/jabber.c:2363
+#: ../libpurple/protocols/jabber/jabber.c:2378
 msgid ""
 "msg &lt;user&gt; &lt;message&gt;:  Send a private message to another user."
 msgstr ""
 "msh &lt;käyttäjä&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle."
 
-#: ../libpurple/protocols/jabber/jabber.c:2369
+#: ../libpurple/protocols/jabber/jabber.c:2384
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\tPingaa käyttäjää/komponenttia/palvelinta."
 
-#: ../libpurple/protocols/jabber/jabber.c:2374
-#: ../libpurple/protocols/yahoo/yahoo.c:4147
+#: ../libpurple/protocols/jabber/jabber.c:2389
+#: ../libpurple/protocols/yahoo/yahoo.c:4156
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Tööttää tuttavalle äänimerkki huomion saamiseksi"
 
@@ -6192,8 +6189,8 @@
 msgstr "Salli salaamaton tunnistautuminen salaamattoman yhteyden yli"
 
 #: ../libpurple/protocols/jabber/libxmpp.c:227
-#: ../libpurple/protocols/myspace/myspace.c:3283
-#: ../libpurple/protocols/simple/simple.c:2067
+#: ../libpurple/protocols/myspace/myspace.c:3305
+#: ../libpurple/protocols/simple/simple.c:2089
 msgid "Connect port"
 msgstr "Yhdistä porttiin"
 
@@ -6201,9 +6198,9 @@
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
 #: ../libpurple/protocols/jabber/libxmpp.c:231
-#: ../libpurple/protocols/myspace/myspace.c:3280
-#: ../libpurple/protocols/silc/silc.c:2045
-#: ../libpurple/protocols/silc10/silc.c:1857 ../pidgin/gtkaccount.c:840
+#: ../libpurple/protocols/myspace/myspace.c:3302
+#: ../libpurple/protocols/silc/silc.c:2057
+#: ../libpurple/protocols/silc10/silc.c:1860 ../pidgin/gtkaccount.c:840
 msgid "Connect server"
 msgstr "Yhdistä palvelimeen"
 
@@ -6212,49 +6209,49 @@
 msgid "%s has left the conversation."
 msgstr "%s on lähtenyt keskustelusta."
 
-#: ../libpurple/protocols/jabber/message.c:161
+#: ../libpurple/protocols/jabber/message.c:162
 #, c-format
 msgid "Message from %s"
 msgstr "Viesti %s:lta"
 
-#: ../libpurple/protocols/jabber/message.c:225
+#: ../libpurple/protocols/jabber/message.c:226
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s vaihtoi aiheeksi: %s"
 
-#: ../libpurple/protocols/jabber/message.c:227
+#: ../libpurple/protocols/jabber/message.c:228
 #, c-format
 msgid "The topic is: %s"
 msgstr "Aihe on: %s"
 
-#: ../libpurple/protocols/jabber/message.c:275
+#: ../libpurple/protocols/jabber/message.c:276
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Viestin toimitus %s:lle epäonnistui: %s"
 
-#: ../libpurple/protocols/jabber/message.c:278
+#: ../libpurple/protocols/jabber/message.c:279
 msgid "XMPP Message Error"
 msgstr "XMPP-viestivirhe"
 
-#: ../libpurple/protocols/jabber/message.c:407
+#: ../libpurple/protocols/jabber/message.c:408
 #, c-format
 msgid " (Code %s)"
 msgstr " (Koodi %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:196
+#: ../libpurple/protocols/jabber/parser.c:198
 msgid "XML Parse error"
 msgstr "Virhe XML-jäsennyksessä"
 
-#: ../libpurple/protocols/jabber/presence.c:423
+#: ../libpurple/protocols/jabber/presence.c:435
 msgid "Unknown Error in presence"
 msgstr "Tuntematon virhe tavoitettavuudessa"
 
-#: ../libpurple/protocols/jabber/presence.c:504
-#: ../libpurple/protocols/jabber/presence.c:505
+#: ../libpurple/protocols/jabber/presence.c:516
+#: ../libpurple/protocols/jabber/presence.c:517
 msgid "Create New Room"
 msgstr "Luo uusi huone"
 
-#: ../libpurple/protocols/jabber/presence.c:506
+#: ../libpurple/protocols/jabber/presence.c:518
 msgid ""
 "You are creating a new room.  Would you like to configure it, or accept the "
 "default settings?"
@@ -6262,20 +6259,20 @@
 "Olet luomassa uutta huonetta. Haluatko muuttaa asetuksia vai käytetäänkö "
 "oletusasetuksia?"
 
-#: ../libpurple/protocols/jabber/presence.c:512
+#: ../libpurple/protocols/jabber/presence.c:524
 msgid "_Configure Room"
 msgstr "_Aseta huoneen asetuksia"
 
-#: ../libpurple/protocols/jabber/presence.c:513
+#: ../libpurple/protocols/jabber/presence.c:525
 msgid "_Accept Defaults"
 msgstr "_Hyväksy oletusasetukset"
 
-#: ../libpurple/protocols/jabber/presence.c:555
+#: ../libpurple/protocols/jabber/presence.c:567
 #, c-format
 msgid "Error in chat %s"
 msgstr "Virhe ryhmäkeskustelussa: %s"
 
-#: ../libpurple/protocols/jabber/presence.c:559
+#: ../libpurple/protocols/jabber/presence.c:571
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Virhe liityttäessä ryhmäkeskusteluun %s"
@@ -6295,7 +6292,7 @@
 #: ../libpurple/protocols/jabber/si.c:838
 #, c-format
 msgid "Unable to send file to %s, invalid JID"
-msgstr "Tiedostoa ei voitu lähettää käyttäjälle %s, virheellinen JID."
+msgstr "Tiedostoa ei voi lähettää käyttäjälle %s, virheellinen JID."
 
 #: ../libpurple/protocols/jabber/si.c:840
 #, c-format
@@ -6348,8 +6345,8 @@
 "This information is visible to all contacts on your contact list, so choose "
 "something appropriate."
 msgstr ""
-"Tämä tieto on näkyville kaikille tuttavalistalla oleville kontakteille, "
-"joten valitse jotain sopivaa."
+"Tämä tieto on näkyvillä kaikille tuttavissa oleville kontakteille, joten "
+"valitse jotain soveliasta."
 
 #: ../libpurple/protocols/jabber/usernick.c:100
 msgid "Set Nickname..."
@@ -6368,186 +6365,221 @@
 msgstr "MSN-osoitekirjaa ei onnistuttu noutamaan"
 
 #: ../libpurple/protocols/msn/dialog.c:118
+#: ../libpurple/protocols/msnp9/dialog.c:110
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
-msgstr "Tuttavalistan synkronointiongelma käyttäjätilillä %s (%s)"
+msgstr "Tuttavien synkronointiongelma käyttäjätilillä %s (%s)"
 
 #: ../libpurple/protocols/msn/dialog.c:124
+#: ../libpurple/protocols/msnp9/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 paikallisella listalla on ryhmässä \"%s\" mutta ei ole palvelimen "
-"listalla. Haluatko että tämä tuttava lisätään?"
+"%s paikallisissa tuttavissa on ryhmässä \"%s\" mutta ei ole palvelimen "
+"tuttavissa. Haluatko että tämä tuttava lisätään?"
 
 #: ../libpurple/protocols/msn/dialog.c:132
+#: ../libpurple/protocols/msnp9/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 paikallisella listalla mutta ei palvelimen listalla. Haluatko että tämä "
-"tuttava lisätään?"
+"%s paikallisella tuttavissa mutta ei palvelimen. Haluatko että tämä tuttava "
+"lisätään?"
 
 #: ../libpurple/protocols/msn/error.c:36
+#: ../libpurple/protocols/msnp9/error.c:36
 #, c-format
 msgid "Unable to parse message"
 msgstr "Viestin jäsennys epäonnistui"
 
 #: ../libpurple/protocols/msn/error.c:41
+#: ../libpurple/protocols/msnp9/error.c:41
 #, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaksivirhe (todennäköisesti ohjelmistovirhe)"
 
 #: ../libpurple/protocols/msn/error.c:46
+#: ../libpurple/protocols/msnp9/error.c:46
 #, c-format
 msgid "Invalid e-mail address"
 msgstr "Epäkelpo sähköpostiosoite"
 
 #: ../libpurple/protocols/msn/error.c:49
+#: ../libpurple/protocols/msnp9/error.c:49
 #, c-format
 msgid "User does not exist"
 msgstr "Käyttäjää ei ole"
 
 #: ../libpurple/protocols/msn/error.c:53
+#: ../libpurple/protocols/msnp9/error.c:53
 #, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Täysin kelvollinen verkkoalueen nimi puuttuu"
 
 #: ../libpurple/protocols/msn/error.c:56
+#: ../libpurple/protocols/msnp9/error.c:56
 #, c-format
 msgid "Already logged in"
 msgstr "Olet jo kirjautuneena sisään"
 
 #: ../libpurple/protocols/msn/error.c:59
+#: ../libpurple/protocols/msnp9/error.c:59
 #, c-format
 msgid "Invalid screen name"
 msgstr "Epäkelpo näyttönimi"
 
 #: ../libpurple/protocols/msn/error.c:62
+#: ../libpurple/protocols/msnp9/error.c:62
 #, c-format
 msgid "Invalid friendly name"
 msgstr "Epäkelpo lempinimi"
 
 #: ../libpurple/protocols/msn/error.c:65
+#: ../libpurple/protocols/msnp9/error.c:65
 #, c-format
 msgid "List full"
 msgstr "Lista täynnä"
 
 #: ../libpurple/protocols/msn/error.c:68
+#: ../libpurple/protocols/msnp9/error.c:68
 #, c-format
 msgid "Already there"
 msgstr "On jo siellä"
 
 #: ../libpurple/protocols/msn/error.c:72
+#: ../libpurple/protocols/msnp9/error.c:72
 #, c-format
 msgid "Not on list"
-msgstr "Ei listalla"
+msgstr "Ei tuttavissa"
 
 #: ../libpurple/protocols/msn/error.c:75
+#: ../libpurple/protocols/msnp9/error.c:75
 #: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "User is offline"
 msgstr "Käyttäjä on poissa linjoilta"
 
 #: ../libpurple/protocols/msn/error.c:78
+#: ../libpurple/protocols/msnp9/error.c:78
 #, c-format
 msgid "Already in the mode"
 msgstr "Olet jo kyseisessä tilassa"
 
 #: ../libpurple/protocols/msn/error.c:82
+#: ../libpurple/protocols/msnp9/error.c:82
 #, c-format
 msgid "Already in opposite list"
 msgstr "On jo vastakkaisessa listassa"
 
 #: ../libpurple/protocols/msn/error.c:86
+#: ../libpurple/protocols/msnp9/error.c:86
 #, c-format
 msgid "Too many groups"
 msgstr "Liian monta ryhmää"
 
 #: ../libpurple/protocols/msn/error.c:89
+#: ../libpurple/protocols/msnp9/error.c:89
 #, c-format
 msgid "Invalid group"
 msgstr "Epäkelpo ryhmä"
 
 #: ../libpurple/protocols/msn/error.c:92
+#: ../libpurple/protocols/msnp9/error.c:92
 #, c-format
 msgid "User not in group"
 msgstr "Käyttäjä ei ole ryhmässä"
 
 #: ../libpurple/protocols/msn/error.c:95
+#: ../libpurple/protocols/msnp9/error.c:95
 #, c-format
 msgid "Group name too long"
 msgstr "Ryhmän nimi liian pitkä"
 
 #: ../libpurple/protocols/msn/error.c:98
+#: ../libpurple/protocols/msnp9/error.c:98
 #, c-format
 msgid "Cannot remove group zero"
 msgstr "Ei voida poistaa ryhmää nolla"
 
 #: ../libpurple/protocols/msn/error.c:103
+#: ../libpurple/protocols/msnp9/error.c:103
 #, c-format
 msgid "Tried to add a user to a group that doesn't exist"
 msgstr "Yritettiin lisätä käyttäjää ryhmään jota ei ole"
 
 #: ../libpurple/protocols/msn/error.c:107
+#: ../libpurple/protocols/msnp9/error.c:107
 #, c-format
 msgid "Switchboard failed"
 msgstr "Kytkentä epäonnistui"
 
 #: ../libpurple/protocols/msn/error.c:111
+#: ../libpurple/protocols/msnp9/error.c:111
 #, c-format
 msgid "Notify transfer failed"
 msgstr "Siirrosta tiedottaminen epäonnistui"
 
 #: ../libpurple/protocols/msn/error.c:116
+#: ../libpurple/protocols/msnp9/error.c:116
 #, c-format
 msgid "Required fields missing"
 msgstr "Vaadittuja kenttiä puuttuu"
 
 #: ../libpurple/protocols/msn/error.c:120
+#: ../libpurple/protocols/msnp9/error.c:120
 #, c-format
 msgid "Too many hits to a FND"
 msgstr "Liian monta osumaa FND:hen"
 
 #: ../libpurple/protocols/msn/error.c:124
+#: ../libpurple/protocols/msnp9/error.c:124
 #: ../libpurple/protocols/oscar/oscar.c:120
 #, c-format
 msgid "Not logged in"
 msgstr "Et ole kirjautunut sisään."
 
 #: ../libpurple/protocols/msn/error.c:128
+#: ../libpurple/protocols/msnp9/error.c:128
 #, c-format
 msgid "Service temporarily unavailable"
 msgstr "Palvelu ei tilapäisesti ole käytettävissä"
 
 #: ../libpurple/protocols/msn/error.c:131
+#: ../libpurple/protocols/msnp9/error.c:131
 #, c-format
 msgid "Database server error"
 msgstr "Tietokantapalvelimen virhe"
 
 #: ../libpurple/protocols/msn/error.c:135
+#: ../libpurple/protocols/msnp9/error.c:135
 #, c-format
 msgid "Command disabled"
 msgstr "Komento poistettu käytöstä"
 
 #: ../libpurple/protocols/msn/error.c:139
+#: ../libpurple/protocols/msnp9/error.c:139
 #, c-format
 msgid "File operation error"
 msgstr "Tiedostotoiminnossa virhe"
 
 #: ../libpurple/protocols/msn/error.c:143
+#: ../libpurple/protocols/msnp9/error.c:143
 #, c-format
 msgid "Memory allocation error"
 msgstr "Muistin varaamisessa virhe"
 
 #: ../libpurple/protocols/msn/error.c:147
+#: ../libpurple/protocols/msnp9/error.c:147
 #, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Väärä CHL-arvo lähetetty palvelimelle"
 
 #: ../libpurple/protocols/msn/error.c:152
+#: ../libpurple/protocols/msnp9/error.c:152
 #, c-format
 msgid "Server busy"
 msgstr "Palvelimella ruuhkaa"
@@ -6555,83 +6587,101 @@
 #: ../libpurple/protocols/msn/error.c:155
 #: ../libpurple/protocols/msn/error.c:170
 #: ../libpurple/protocols/msn/error.c:230
+#: ../libpurple/protocols/msnp9/error.c:155
+#: ../libpurple/protocols/msnp9/error.c:170
+#: ../libpurple/protocols/msnp9/error.c:230
 #, c-format
 msgid "Server unavailable"
 msgstr "Palvelin on tavoittamattomissa"
 
 #: ../libpurple/protocols/msn/error.c:158
+#: ../libpurple/protocols/msnp9/error.c:158
 #, c-format
 msgid "Peer notification server down"
 msgstr "Vastapään ilmoituspalvelin ei toiminnassa"
 
 #: ../libpurple/protocols/msn/error.c:162
+#: ../libpurple/protocols/msnp9/error.c:162
 #, c-format
 msgid "Database connect error"
 msgstr "Tietokantayhteysvirhe"
 
 #: ../libpurple/protocols/msn/error.c:167
+#: ../libpurple/protocols/msnp9/error.c:167
 #, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Palvelin on poistumassa toiminnasta (jättäkää laiva)"
 
 #: ../libpurple/protocols/msn/error.c:174
+#: ../libpurple/protocols/msnp9/error.c:174
 #, c-format
 msgid "Error creating connection"
 msgstr "Virhe luotaessa yhteyttä"
 
 #: ../libpurple/protocols/msn/error.c:179
+#: ../libpurple/protocols/msnp9/error.c:179
 #, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parametrit ovat joko tuntemattomat tai ne eivät ole sallittuja"
 
 #: ../libpurple/protocols/msn/error.c:183
+#: ../libpurple/protocols/msnp9/error.c:183
 #, c-format
 msgid "Unable to write"
 msgstr "Ei kyetty kirjoittamaan"
 
 #: ../libpurple/protocols/msn/error.c:186
+#: ../libpurple/protocols/msnp9/error.c:186
 #, c-format
 msgid "Session overload"
 msgstr "Istunnon ylikuormitus"
 
 #: ../libpurple/protocols/msn/error.c:190
+#: ../libpurple/protocols/msnp9/error.c:190
 #, c-format
 msgid "User is too active"
 msgstr "Käyttäjä on liian aktiivinen"
 
 #: ../libpurple/protocols/msn/error.c:193
+#: ../libpurple/protocols/msnp9/error.c:193
 #, c-format
 msgid "Too many sessions"
 msgstr "Liian monta istuntoa"
 
 #: ../libpurple/protocols/msn/error.c:196
+#: ../libpurple/protocols/msnp9/error.c:196
 #, c-format
 msgid "Passport not verified"
 msgstr "Passport-tiliä ei ole varmistettu"
 
 #: ../libpurple/protocols/msn/error.c:199
+#: ../libpurple/protocols/msnp9/error.c:199
 #, c-format
 msgid "Bad friend file"
 msgstr "Virheellinen tuttavatiedosto"
 
 #: ../libpurple/protocols/msn/error.c:203
+#: ../libpurple/protocols/msnp9/error.c:203
 #, c-format
 msgid "Not expected"
 msgstr "Odottamaton"
 
 #: ../libpurple/protocols/msn/error.c:209
+#: ../libpurple/protocols/msnp9/error.c:209
 #, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Tuttavanimi vaihtuu liian usein"
 
 #: ../libpurple/protocols/msn/error.c:218
+#: ../libpurple/protocols/msnp9/error.c:218
 #, c-format
 msgid "Server too busy"
 msgstr "Palvelimella liikaa ruuhkaa "
 
 #: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1383
-#: ../libpurple/protocols/silc/silc.c:333
+#: ../libpurple/protocols/msnp9/error.c:222
+#: ../libpurple/protocols/oscar/oscar.c:1377
+#: ../libpurple/protocols/silc/silc.c:338
 #: ../libpurple/protocols/silc10/ops.c:1709
 #: ../libpurple/protocols/toc/toc.c:728 ../libpurple/proxy.c:1393
 #, c-format
@@ -6639,408 +6689,481 @@
 msgstr "Todennus epäonnistui"
 
 #: ../libpurple/protocols/msn/error.c:225
+#: ../libpurple/protocols/msnp9/error.c:225
 #, c-format
 msgid "Not allowed when offline"
 msgstr "Ei sallittu kun poissa linjoilta"
 
 #: ../libpurple/protocols/msn/error.c:233
+#: ../libpurple/protocols/msnp9/error.c:233
 #, c-format
 msgid "Not accepting new users"
 msgstr "Ei ota vastaan uusia käyttäjiä"
 
 #: ../libpurple/protocols/msn/error.c:237
+#: ../libpurple/protocols/msnp9/error.c:237
 #, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Kids Passport - ilman vanhempien hyväksyntää"
 
 #: ../libpurple/protocols/msn/error.c:241
+#: ../libpurple/protocols/msnp9/error.c:241
 #, c-format
 msgid "Passport account not yet verified"
 msgstr "Passport-tiliä ei ole verifioitu"
 
 #: ../libpurple/protocols/msn/error.c:244
+#: ../libpurple/protocols/msnp9/error.c:244
 #, c-format
 msgid "Bad ticket"
 msgstr "Bad ticket"
 
 #: ../libpurple/protocols/msn/error.c:249
+#: ../libpurple/protocols/msnp9/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Tuntematon virhekoodi %d"
 
 #: ../libpurple/protocols/msn/error.c:263
+#: ../libpurple/protocols/msnp9/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN-virhe: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130
+#: ../libpurple/protocols/msn/msn.c:130 ../libpurple/protocols/msnp9/msn.c:130
 msgid "Nudge"
 msgstr "Tönäise"
 
-#: ../libpurple/protocols/msn/msn.c:131
+#: ../libpurple/protocols/msn/msn.c:131 ../libpurple/protocols/msnp9/msn.c:131
 #, c-format
 msgid "%s has nudged you!"
 msgstr "%s on tönäissyt sinua."
 
-#: ../libpurple/protocols/msn/msn.c:132
+#: ../libpurple/protocols/msn/msn.c:132 ../libpurple/protocols/msnp9/msn.c:132
 #, c-format
 msgid "Nudging %s..."
 msgstr "Tönäistään tuttavaa %s..."
 
-#: ../libpurple/protocols/msn/msn.c:174
+#: ../libpurple/protocols/msn/msn.c:174 ../libpurple/protocols/msnp9/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "Uusi MSN-tuttavanimesi on liian pitkä."
 
-#: ../libpurple/protocols/msn/msn.c:286
+#: ../libpurple/protocols/msn/msn.c:286 ../libpurple/protocols/msnp9/msn.c:282
 msgid "Set your friendly name."
 msgstr "Aseta tuttavanimesi."
 
-#: ../libpurple/protocols/msn/msn.c:287
+#: ../libpurple/protocols/msn/msn.c:287 ../libpurple/protocols/msnp9/msn.c:283
 msgid "This is the name that other MSN buddies will see you as."
 msgstr "Tämä on nimi jona MSN-tuttavasi sinut näkevät."
 
-#: ../libpurple/protocols/msn/msn.c:305
+#: ../libpurple/protocols/msn/msn.c:305 ../libpurple/protocols/msnp9/msn.c:301
 msgid "Set your home phone number."
 msgstr "Aseta kotipuhelinnumerosi"
 
-#: ../libpurple/protocols/msn/msn.c:322
+#: ../libpurple/protocols/msn/msn.c:322 ../libpurple/protocols/msnp9/msn.c:318
 msgid "Set your work phone number."
 msgstr "Aseta työpuhelinnumerosi"
 
-#: ../libpurple/protocols/msn/msn.c:339
+#: ../libpurple/protocols/msn/msn.c:339 ../libpurple/protocols/msnp9/msn.c:335
 msgid "Set your mobile phone number."
 msgstr "Aseta matkapuhelinnumerosi"
 
-#: ../libpurple/protocols/msn/msn.c:354
+#: ../libpurple/protocols/msn/msn.c:354 ../libpurple/protocols/msnp9/msn.c:350
 msgid "Allow MSN Mobile pages?"
 msgstr "Salli MSN-mobiilihaut"
 
-#: ../libpurple/protocols/msn/msn.c:355
+#: ../libpurple/protocols/msn/msn.c:355 ../libpurple/protocols/msnp9/msn.c:351
 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 ""
-"Haluatko sallia tai estää henkilöitä tuttavalistallasi lähettää MSN- "
+"Haluatko sallia tai estää henkilöitä tuttavissasi lähettämästä MSN- "
 "mobiilihakuja matkapuhelimeesi tai muuhun mobiililaitteeseen?"
 
-#: ../libpurple/protocols/msn/msn.c:361
+#: ../libpurple/protocols/msn/msn.c:361 ../libpurple/protocols/msnp9/msn.c:357
 msgid "Allow"
 msgstr "Salli"
 
-#: ../libpurple/protocols/msn/msn.c:362
+#: ../libpurple/protocols/msn/msn.c:362 ../libpurple/protocols/msnp9/msn.c:358
 msgid "Disallow"
 msgstr "Kiellä"
 
-#: ../libpurple/protocols/msn/msn.c:378
+#: ../libpurple/protocols/msn/msn.c:378 ../libpurple/protocols/msnp9/msn.c:374
 msgid "This Hotmail account may not be active."
 msgstr "Tämä Hotmail-tili ei välttämättä ole aktiivinen."
 
-#: ../libpurple/protocols/msn/msn.c:404
+#: ../libpurple/protocols/msn/msn.c:404 ../libpurple/protocols/msnp9/msn.c:400
 msgid "Send a mobile message."
 msgstr "Lähetä mobiiliviestinä"
 
-#: ../libpurple/protocols/msn/msn.c:406
+#: ../libpurple/protocols/msn/msn.c:406 ../libpurple/protocols/msnp9/msn.c:402
 msgid "Page"
 msgstr "Lähetä"
 
-#: ../libpurple/protocols/msn/msn.c:629 ../libpurple/protocols/msn/msn.c:659
-#: ../libpurple/protocols/msn/msn.c:666 ../libpurple/protocols/msn/msn.c:673
-#: ../libpurple/protocols/msn/msn.c:680 ../libpurple/protocols/msn/msn.c:686
-#: ../libpurple/protocols/msn/msn.c:692
-msgid "Current media"
-msgstr "Nykyinen media"
-
-#: ../libpurple/protocols/msn/msn.c:671 ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3763
+#: ../libpurple/protocols/msn/msn.c:688 ../libpurple/protocols/msn/state.c:33
+#: ../libpurple/protocols/msnp9/msn.c:583
+#: ../libpurple/protocols/msnp9/state.c:33
+#: ../libpurple/protocols/yahoo/yahoo.c:3088
+#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Be Right Back"
 msgstr "Tulen pian takaisin"
 
-#: ../libpurple/protocols/msn/msn.c:678 ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2827
-#: ../libpurple/protocols/novell/novell.c:2957
+#: ../libpurple/protocols/msn/msn.c:694 ../libpurple/protocols/msn/state.c:31
+#: ../libpurple/protocols/msnp9/msn.c:587
+#: ../libpurple/protocols/msnp9/state.c:31
+#: ../libpurple/protocols/novell/novell.c:2839
+#: ../libpurple/protocols/novell/novell.c:2969
 #: ../libpurple/protocols/silc/buddy.c:1483
 #: ../libpurple/protocols/silc/silc.c:56
 #: ../libpurple/protocols/silc10/buddy.c:1483
 #: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3766
+#: ../libpurple/protocols/yahoo/yahoo.c:3090
+#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Busy"
 msgstr "Varattu"
 
-#: ../libpurple/protocols/msn/msn.c:684
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3778
+#: ../libpurple/protocols/msn/msn.c:699 ../libpurple/protocols/msnp9/msn.c:591
+#: ../libpurple/protocols/yahoo/yahoo.c:3098
+#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "On the Phone"
 msgstr "Puhelimessa"
 
-#: ../libpurple/protocols/msn/msn.c:690
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3784
+#: ../libpurple/protocols/msn/msn.c:704 ../libpurple/protocols/msnp9/msn.c:595
+#: ../libpurple/protocols/yahoo/yahoo.c:3102
+#: ../libpurple/protocols/yahoo/yahoo.c:3793
 msgid "Out to Lunch"
 msgstr "Lounaalla"
 
-#: ../libpurple/protocols/msn/msn.c:721
+#: ../libpurple/protocols/msn/msn.c:723
+msgid "Artist"
+msgstr "Esittäjä"
+
+#: ../libpurple/protocols/msn/msn.c:724
+msgid "Album"
+msgstr "Levy"
+
+#: ../libpurple/protocols/msn/msn.c:742 ../libpurple/protocols/msnp9/msn.c:623
 msgid "Set Friendly Name..."
 msgstr "Aseta tuttavanimi..."
 
-#: ../libpurple/protocols/msn/msn.c:726
+#: ../libpurple/protocols/msn/msn.c:747 ../libpurple/protocols/msnp9/msn.c:628
 msgid "Set Home Phone Number..."
 msgstr "Aseta kotipuhelinnumero..."
 
-#: ../libpurple/protocols/msn/msn.c:730
+#: ../libpurple/protocols/msn/msn.c:751 ../libpurple/protocols/msnp9/msn.c:632
 msgid "Set Work Phone Number..."
 msgstr "Aseta työpuhelinnumero..."
 
-#: ../libpurple/protocols/msn/msn.c:734
+#: ../libpurple/protocols/msn/msn.c:755 ../libpurple/protocols/msnp9/msn.c:636
 msgid "Set Mobile Phone Number..."
 msgstr "Aseta matkapuhelinnumero..."
 
-#: ../libpurple/protocols/msn/msn.c:740
+#: ../libpurple/protocols/msn/msn.c:761 ../libpurple/protocols/msnp9/msn.c:642
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Aseta päälle/pois mobiililaitteet..."
 
-#: ../libpurple/protocols/msn/msn.c:745
+#: ../libpurple/protocols/msn/msn.c:766 ../libpurple/protocols/msnp9/msn.c:647
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Salli/estä mobiilihaut..."
 
-#: ../libpurple/protocols/msn/msn.c:756
+#: ../libpurple/protocols/msn/msn.c:777 ../libpurple/protocols/msnp9/msn.c:658
 msgid "Open Hotmail Inbox"
 msgstr "Avaa Hotmailin saapuneet-kansio"
 
-#: ../libpurple/protocols/msn/msn.c:780
+#: ../libpurple/protocols/msn/msn.c:801 ../libpurple/protocols/msnp9/msn.c:682
 msgid "Send to Mobile"
 msgstr "Lähetä mobiililaitteeseen"
 
-#: ../libpurple/protocols/msn/msn.c:790
-#: ../libpurple/protocols/novell/novell.c:3413
+#: ../libpurple/protocols/msn/msn.c:811 ../libpurple/protocols/msnp9/msn.c:692
+#: ../libpurple/protocols/novell/novell.c:3425
 msgid "Initiate _Chat"
 msgstr "Aloita _ryhmäkeskustelu"
 
-#: ../libpurple/protocols/msn/msn.c:828
+#: ../libpurple/protocols/msn/msn.c:849 ../libpurple/protocols/msnp9/msn.c:731
 msgid "SSL support is needed for MSN. Please install a supported SSL library."
 msgstr "MSN vaatii SSL-tuen. Asenna tuettu SSL-kirjasto."
 
-#: ../libpurple/protocols/msn/msn.c:856
+#: ../libpurple/protocols/msn/msn.c:879 ../libpurple/protocols/msnp9/msn.c:761
 msgid "Failed to connect to server."
 msgstr "Palvelimeen ei saatu yhteyttä."
 
-#: ../libpurple/protocols/msn/msn.c:1640 ../libpurple/protocols/msn/msn.c:1983
+#: ../libpurple/protocols/msn/msn.c:1663 ../libpurple/protocols/msn/msn.c:2006
+#: ../libpurple/protocols/msnp9/msn.c:1516
+#: ../libpurple/protocols/msnp9/msn.c:1859
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Virhe haettaessa profiilia"
 
-#: ../libpurple/protocols/msn/msn.c:1706 ../pidgin/plugins/convcolors.c:309
+#: ../libpurple/protocols/msn/msn.c:1729
+#: ../libpurple/protocols/msnp9/msn.c:1582 ../pidgin/plugins/convcolors.c:309
 #: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "Yleinen"
 
-#: ../libpurple/protocols/msn/msn.c:1713
+#: ../libpurple/protocols/msn/msn.c:1736
+#: ../libpurple/protocols/msnp9/msn.c:1589
 #: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3770
+#: ../libpurple/protocols/oscar/oscar.c:3765
 #: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:221
+#: ../libpurple/protocols/qq/qq.c:222
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Ikä"
 
-#: ../libpurple/protocols/msn/msn.c:1715
+#: ../libpurple/protocols/msn/msn.c:1738
+#: ../libpurple/protocols/msnp9/msn.c:1591
 #: ../libpurple/protocols/qq/buddy_info.c:51
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Ammatti"
 
-#: ../libpurple/protocols/msn/msn.c:1716
+#: ../libpurple/protocols/msn/msn.c:1739
+#: ../libpurple/protocols/msnp9/msn.c:1592
 #: ../libpurple/protocols/myspace/user.c:123
-#: ../libpurple/protocols/novell/novell.c:1480
+#: ../libpurple/protocols/novell/novell.c:1487
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
 #: ../libpurple/protocols/zephyr/zephyr.c:798
 #: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Sijainti"
 
-#: ../libpurple/protocols/msn/msn.c:1721 ../libpurple/protocols/msn/msn.c:1913
-#: ../libpurple/protocols/msn/msn.c:1919 ../libpurple/protocols/msn/msn.c:1926
+#: ../libpurple/protocols/msn/msn.c:1744 ../libpurple/protocols/msn/msn.c:1936
+#: ../libpurple/protocols/msn/msn.c:1942 ../libpurple/protocols/msn/msn.c:1949
+#: ../libpurple/protocols/msnp9/msn.c:1597
+#: ../libpurple/protocols/msnp9/msn.c:1789
+#: ../libpurple/protocols/msnp9/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1802
 msgid "Hobbies and Interests"
 msgstr "Harrastukset"
 
-#: ../libpurple/protocols/msn/msn.c:1727 ../libpurple/protocols/msn/msn.c:1847
-#: ../libpurple/protocols/msn/msn.c:1853 ../libpurple/protocols/msn/msn.c:1860
-#: ../libpurple/protocols/msn/msn.c:1868 ../libpurple/protocols/msn/msn.c:1875
+#: ../libpurple/protocols/msn/msn.c:1750 ../libpurple/protocols/msn/msn.c:1870
+#: ../libpurple/protocols/msn/msn.c:1876 ../libpurple/protocols/msn/msn.c:1883
+#: ../libpurple/protocols/msn/msn.c:1891 ../libpurple/protocols/msn/msn.c:1898
+#: ../libpurple/protocols/msnp9/msn.c:1603
+#: ../libpurple/protocols/msnp9/msn.c:1723
+#: ../libpurple/protocols/msnp9/msn.c:1729
+#: ../libpurple/protocols/msnp9/msn.c:1736
+#: ../libpurple/protocols/msnp9/msn.c:1744
+#: ../libpurple/protocols/msnp9/msn.c:1751
 msgid "A Little About Me"
 msgstr "Oma kuvaus"
 
-#: ../libpurple/protocols/msn/msn.c:1744
+#: ../libpurple/protocols/msn/msn.c:1767
+#: ../libpurple/protocols/msnp9/msn.c:1620
 msgid "Social"
 msgstr "Vapaa-aika"
 
-#: ../libpurple/protocols/msn/msn.c:1746
+#: ../libpurple/protocols/msn/msn.c:1769
+#: ../libpurple/protocols/msnp9/msn.c:1622
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Siviilisääty"
 
-#: ../libpurple/protocols/msn/msn.c:1747
+#: ../libpurple/protocols/msn/msn.c:1770
+#: ../libpurple/protocols/msnp9/msn.c:1623
 msgid "Interests"
 msgstr "Kiinnostukset"
 
-#: ../libpurple/protocols/msn/msn.c:1748
+#: ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msnp9/msn.c:1624
 msgid "Pets"
 msgstr "Lemmikit"
 
-#: ../libpurple/protocols/msn/msn.c:1749
+#: ../libpurple/protocols/msn/msn.c:1772
+#: ../libpurple/protocols/msnp9/msn.c:1625
 msgid "Hometown"
 msgstr "Kotikunta"
 
-#: ../libpurple/protocols/msn/msn.c:1750
+#: ../libpurple/protocols/msn/msn.c:1773
+#: ../libpurple/protocols/msnp9/msn.c:1626
 msgid "Places Lived"
 msgstr "Asumispaikat"
 
-#: ../libpurple/protocols/msn/msn.c:1751
+#: ../libpurple/protocols/msn/msn.c:1774
+#: ../libpurple/protocols/msnp9/msn.c:1627
 msgid "Fashion"
 msgstr "Tyyli"
 
-#: ../libpurple/protocols/msn/msn.c:1752
+#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msnp9/msn.c:1628
 msgid "Humor"
 msgstr "Huumorintaju"
 
-#: ../libpurple/protocols/msn/msn.c:1753
+#: ../libpurple/protocols/msn/msn.c:1776
+#: ../libpurple/protocols/msnp9/msn.c:1629
 msgid "Music"
 msgstr "Musiikki"
 
-#: ../libpurple/protocols/msn/msn.c:1754 ../libpurple/protocols/msn/msn.c:1935
-#: ../libpurple/protocols/msn/msn.c:1941
+#: ../libpurple/protocols/msn/msn.c:1777 ../libpurple/protocols/msn/msn.c:1958
+#: ../libpurple/protocols/msn/msn.c:1964
+#: ../libpurple/protocols/msnp9/msn.c:1630
+#: ../libpurple/protocols/msnp9/msn.c:1811
+#: ../libpurple/protocols/msnp9/msn.c:1817
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Lempisanonta"
 
-#: ../libpurple/protocols/msn/msn.c:1771
+#: ../libpurple/protocols/msn/msn.c:1794
+#: ../libpurple/protocols/msnp9/msn.c:1647
 msgid "Contact Info"
 msgstr "Yhteystiedot"
 
-#: ../libpurple/protocols/msn/msn.c:1772
+#: ../libpurple/protocols/msn/msn.c:1795
+#: ../libpurple/protocols/msnp9/msn.c:1648
 msgid "Personal"
 msgstr "Koti"
 
-#: ../libpurple/protocols/msn/msn.c:1775
+#: ../libpurple/protocols/msn/msn.c:1798
+#: ../libpurple/protocols/msnp9/msn.c:1651
 msgid "Significant Other"
 msgstr "Elämänkumppani"
 
-#: ../libpurple/protocols/msn/msn.c:1776
+#: ../libpurple/protocols/msn/msn.c:1799
+#: ../libpurple/protocols/msnp9/msn.c:1652
 msgid "Home Phone"
 msgstr "Kotipuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1777
+#: ../libpurple/protocols/msn/msn.c:1800
+#: ../libpurple/protocols/msnp9/msn.c:1653
 msgid "Home Phone 2"
 msgstr "Kotipuhelin 2"
 
-#: ../libpurple/protocols/msn/msn.c:1778
-#: ../libpurple/protocols/oscar/oscar.c:3808
+#: ../libpurple/protocols/msn/msn.c:1801
+#: ../libpurple/protocols/msnp9/msn.c:1654
+#: ../libpurple/protocols/oscar/oscar.c:3803
 msgid "Home Address"
 msgstr "Kotiosoite"
 
-#: ../libpurple/protocols/msn/msn.c:1779
+#: ../libpurple/protocols/msn/msn.c:1802
+#: ../libpurple/protocols/msnp9/msn.c:1655
 msgid "Personal Mobile"
 msgstr "Oma matkapuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1780
+#: ../libpurple/protocols/msn/msn.c:1803
+#: ../libpurple/protocols/msnp9/msn.c:1656
 msgid "Home Fax"
 msgstr "Kotifaksi"
 
-#: ../libpurple/protocols/msn/msn.c:1781
+#: ../libpurple/protocols/msn/msn.c:1804
+#: ../libpurple/protocols/msnp9/msn.c:1657
 msgid "Personal E-Mail"
 msgstr "Oma sähköposti"
 
-#: ../libpurple/protocols/msn/msn.c:1782
+#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msnp9/msn.c:1658
 msgid "Personal IM"
 msgstr "Oma pikaviestin"
 
-#: ../libpurple/protocols/msn/msn.c:1784
+#: ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msnp9/msn.c:1660
 msgid "Anniversary"
 msgstr "Vuosipäivä"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1800
+#: ../libpurple/protocols/msn/msn.c:1823
+#: ../libpurple/protocols/msnp9/msn.c:1676
 msgid "Work"
 msgstr "Työ"
 
-#: ../libpurple/protocols/msn/msn.c:1802
+#: ../libpurple/protocols/msn/msn.c:1825
+#: ../libpurple/protocols/msnp9/msn.c:1678
 #: ../libpurple/protocols/silc/ops.c:1010
 #: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Tehtävänimike"
 
-#: ../libpurple/protocols/msn/msn.c:1803
-#: ../libpurple/protocols/oscar/oscar.c:3829
+#: ../libpurple/protocols/msn/msn.c:1826
+#: ../libpurple/protocols/msnp9/msn.c:1679
+#: ../libpurple/protocols/oscar/oscar.c:3824
 msgid "Company"
 msgstr "Yritys"
 
-#: ../libpurple/protocols/msn/msn.c:1804
-#: ../libpurple/protocols/novell/novell.c:1482
+#: ../libpurple/protocols/msn/msn.c:1827
+#: ../libpurple/protocols/msnp9/msn.c:1680
+#: ../libpurple/protocols/novell/novell.c:1489
 msgid "Department"
 msgstr "Osasto"
 
-#: ../libpurple/protocols/msn/msn.c:1805
+#: ../libpurple/protocols/msn/msn.c:1828
+#: ../libpurple/protocols/msnp9/msn.c:1681
 msgid "Profession"
-msgstr "Asmatti"
-
-#: ../libpurple/protocols/msn/msn.c:1806
+msgstr "Ammatti"
+
+#: ../libpurple/protocols/msn/msn.c:1829
+#: ../libpurple/protocols/msnp9/msn.c:1682
 msgid "Work Phone"
 msgstr "Työpuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1807
+#: ../libpurple/protocols/msn/msn.c:1830
+#: ../libpurple/protocols/msnp9/msn.c:1683
 msgid "Work Phone 2"
 msgstr "Työpuhelin 2"
 
-#: ../libpurple/protocols/msn/msn.c:1808
-#: ../libpurple/protocols/oscar/oscar.c:3821
+#: ../libpurple/protocols/msn/msn.c:1831
+#: ../libpurple/protocols/msnp9/msn.c:1684
+#: ../libpurple/protocols/oscar/oscar.c:3816
 msgid "Work Address"
 msgstr "Työosoite"
 
-#: ../libpurple/protocols/msn/msn.c:1809
+#: ../libpurple/protocols/msn/msn.c:1832
+#: ../libpurple/protocols/msnp9/msn.c:1685
 msgid "Work Mobile"
 msgstr "Työmatkapuhelin"
 
-#: ../libpurple/protocols/msn/msn.c:1810
+#: ../libpurple/protocols/msn/msn.c:1833
+#: ../libpurple/protocols/msnp9/msn.c:1686
 msgid "Work Pager"
 msgstr "Työhakulaite"
 
-#: ../libpurple/protocols/msn/msn.c:1811
+#: ../libpurple/protocols/msn/msn.c:1834
+#: ../libpurple/protocols/msnp9/msn.c:1687
 msgid "Work Fax"
 msgstr "Työfaksi"
 
-#: ../libpurple/protocols/msn/msn.c:1812
+#: ../libpurple/protocols/msn/msn.c:1835
+#: ../libpurple/protocols/msnp9/msn.c:1688
 msgid "Work E-Mail"
 msgstr "Työsähköposti"
 
-#: ../libpurple/protocols/msn/msn.c:1813
+#: ../libpurple/protocols/msn/msn.c:1836
+#: ../libpurple/protocols/msnp9/msn.c:1689
 msgid "Work IM"
 msgstr "Työ pikaviestin"
 
-#: ../libpurple/protocols/msn/msn.c:1814
+#: ../libpurple/protocols/msn/msn.c:1837
+#: ../libpurple/protocols/msnp9/msn.c:1690
 msgid "Start Date"
 msgstr "Aloituspäivä"
 
-#: ../libpurple/protocols/msn/msn.c:1884 ../libpurple/protocols/msn/msn.c:1890
-#: ../libpurple/protocols/msn/msn.c:1897 ../libpurple/protocols/msn/msn.c:1904
+#: ../libpurple/protocols/msn/msn.c:1907 ../libpurple/protocols/msn/msn.c:1913
+#: ../libpurple/protocols/msn/msn.c:1920 ../libpurple/protocols/msn/msn.c:1927
+#: ../libpurple/protocols/msnp9/msn.c:1760
+#: ../libpurple/protocols/msnp9/msn.c:1766
+#: ../libpurple/protocols/msnp9/msn.c:1773
+#: ../libpurple/protocols/msnp9/msn.c:1780
 msgid "Favorite Things"
 msgstr "Lempiasiat"
 
-#: ../libpurple/protocols/msn/msn.c:1949
+#: ../libpurple/protocols/msn/msn.c:1972
+#: ../libpurple/protocols/msnp9/msn.c:1825
 msgid "Last Updated"
 msgstr "Edellinen päivitys"
 
-#: ../libpurple/protocols/msn/msn.c:1960
+#: ../libpurple/protocols/msn/msn.c:1983
+#: ../libpurple/protocols/msnp9/msn.c:1836
 #: ../libpurple/protocols/qq/buddy_info.c:60
 #: ../libpurple/protocols/silc/ops.c:1026
 #: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Kotisivu"
 
-#: ../libpurple/protocols/msn/msn.c:1984
+#: ../libpurple/protocols/msn/msn.c:2007
+#: ../libpurple/protocols/msnp9/msn.c:1860
 msgid "The user has not created a public profile."
 msgstr "Käyttäjällä ei ole julkista profiilia."
 
-#: ../libpurple/protocols/msn/msn.c:1985
+#: ../libpurple/protocols/msn/msn.c:2008
+#: ../libpurple/protocols/msnp9/msn.c:1861
 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 "
@@ -7049,7 +7172,8 @@
 "MSN ilmoitti ettei voida löytää käyttäjän profiilia. Tämä tarkoittaa joko "
 "sitä että käyttäjää ei ole tai käyttäjä ei ole luonut julkista profiilia."
 
-#: ../libpurple/protocols/msn/msn.c:1989
+#: ../libpurple/protocols/msn/msn.c:2012
+#: ../libpurple/protocols/msnp9/msn.c:1865
 msgid ""
 "Could not find any information in the user's profile. The user most likely "
 "does not exist."
@@ -7057,7 +7181,8 @@
 "Käyttäjän profiilista ei löytynyt mitään tietoja. Käyttäjää ei "
 "todennäköisesti ole olemassa."
 
-#: ../libpurple/protocols/msn/msn.c:1997
+#: ../libpurple/protocols/msn/msn.c:2020
+#: ../libpurple/protocols/msnp9/msn.c:1873
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
 msgid "Profile URL"
 msgstr "Profiilin URL"
@@ -7072,23 +7197,27 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2284 ../libpurple/protocols/msn/msn.c:2286
+#: ../libpurple/protocols/msn/msn.c:2307 ../libpurple/protocols/msn/msn.c:2309
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "Windows Live Messenger -yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/msn/msn.c:2321
+#: ../libpurple/protocols/msn/msn.c:2344
+#: ../libpurple/protocols/msnp9/msn.c:2195
 msgid "Use HTTP Method"
 msgstr "Käytä HTTP-yhteystapaa"
 
-#: ../libpurple/protocols/msn/msn.c:2326
+#: ../libpurple/protocols/msn/msn.c:2349
+#: ../libpurple/protocols/msnp9/msn.c:2200
 msgid "HTTP Method Server"
 msgstr "HTTP-yhteystavan palvelin"
 
-#: ../libpurple/protocols/msn/msn.c:2331
+#: ../libpurple/protocols/msn/msn.c:2354
+#: ../libpurple/protocols/msnp9/msn.c:2205
 msgid "Show custom smileys"
 msgstr "Näytä itse tehdyt / lisätyt hymiöt"
 
-#: ../libpurple/protocols/msn/msn.c:2339
+#: ../libpurple/protocols/msn/msn.c:2362
+#: ../libpurple/protocols/msnp9/msn.c:2213
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: tönäise tuttavaa huomion saamiseksi"
 
@@ -7110,17 +7239,22 @@
 msgstr "Windows Live ID -tunnistautuminen epäonnistui"
 
 #: ../libpurple/protocols/msn/notification.c:185
+#: ../libpurple/protocols/msnp9/notification.c:178
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s ei ole kelvollinen ryhmä."
 
 #: ../libpurple/protocols/msn/notification.c:191
 #: ../libpurple/protocols/msn/notification.c:931
-#: ../libpurple/protocols/msn/session.c:379
+#: ../libpurple/protocols/msn/session.c:387
+#: ../libpurple/protocols/msnp9/notification.c:184
+#: ../libpurple/protocols/msnp9/notification.c:532
+#: ../libpurple/protocols/msnp9/session.c:340
 msgid "Unknown error."
 msgstr "Tuntematon virhe."
 
 #: ../libpurple/protocols/msn/notification.c:194
+#: ../libpurple/protocols/msnp9/notification.c:187
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s tilillä %s (%s)"
@@ -7136,48 +7270,57 @@
 msgstr "Tuntematon virhe (%d)"
 
 #: ../libpurple/protocols/msn/notification.c:837
-#: ../libpurple/protocols/sametime/sametime.c:4425
+#: ../libpurple/protocols/sametime/sametime.c:4471
 msgid "Unable to add user"
-msgstr "Ei voitu lisätä käyttäjää"
+msgstr "Ei voi lisätä käyttäjää"
 
 #: ../libpurple/protocols/msn/notification.c:897
+#: ../libpurple/protocols/msnp9/notification.c:498
 #, c-format
 msgid "Unable to add user on %s (%s)"
-msgstr "Ei voitu lisätä käyttäjää %s (%s)"
+msgstr "Ei voi lisätä käyttäjää %s (%s)"
 
 #: ../libpurple/protocols/msn/notification.c:901
+#: ../libpurple/protocols/msnp9/notification.c:502
 #, c-format
 msgid "Unable to block user on %s (%s)"
-msgstr "Ei voitu estää käyttäjää %s (%s)"
+msgstr "Ei voi estää käyttäjää %s (%s)"
 
 #: ../libpurple/protocols/msn/notification.c:905
+#: ../libpurple/protocols/msnp9/notification.c:506
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Ei voida sallia käyttäjää %s (%s)"
 
 #: ../libpurple/protocols/msn/notification.c:913
+#: ../libpurple/protocols/msnp9/notification.c:514
 #, c-format
 msgid "%s could not be added because your buddy list is full."
-msgstr "Käyttäjää %s ei voitu lisätä koska tuttavalista on täynnä."
+msgstr "Käyttäjää %s ei voi lisätä koska tuttavia on liikaa."
 
 #: ../libpurple/protocols/msn/notification.c:922
+#: ../libpurple/protocols/msnp9/notification.c:523
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s ei ole kelvollinen passport-tili"
 
 #: ../libpurple/protocols/msn/notification.c:927
+#: ../libpurple/protocols/msnp9/notification.c:528
 msgid "Service Temporarily Unavailable."
 msgstr "Palvelu ei tilapäisesti ole käytettävissä."
 
 #: ../libpurple/protocols/msn/notification.c:1263
+#: ../libpurple/protocols/msnp9/notification.c:851
 msgid "Unable to rename group"
 msgstr "Ryhmän uudelleen nimeäminen epäonnistui"
 
 #: ../libpurple/protocols/msn/notification.c:1318
+#: ../libpurple/protocols/msnp9/notification.c:906
 msgid "Unable to delete group"
-msgstr "Ryhmää ei voitu poistaa"
-
-#: ../libpurple/protocols/msn/notification.c:1932
+msgstr "Ryhmää ei voi poistaa"
+
+#: ../libpurple/protocols/msn/notification.c:1931
+#: ../libpurple/protocols/msnp9/notification.c:1325
 #, c-format
 msgid ""
 "The MSN server will shut down for maintenance in %d minute. You will "
@@ -7207,6 +7350,8 @@
 "Kun huolto on suoritettu voit taas kirjautua palveluun."
 
 #: ../libpurple/protocols/msn/servconn.c:135
+#: ../libpurple/protocols/msnp9/nexus.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:133
 #: ../libpurple/protocols/qq/qq_proxy.c:242
 #: ../libpurple/protocols/qq/qq_proxy.c:324
 #: ../libpurple/protocols/qq/qq_proxy.c:369
@@ -7226,14 +7371,17 @@
 msgstr "Yhteyden muodostaminen epäonnistui"
 
 #: ../libpurple/protocols/msn/servconn.c:137
+#: ../libpurple/protocols/msnp9/servconn.c:135
 msgid "Writing error"
 msgstr "Virhe kirjoitettaessa"
 
 #: ../libpurple/protocols/msn/servconn.c:139
+#: ../libpurple/protocols/msnp9/servconn.c:137
 msgid "Reading error"
 msgstr "Virhe luettaessa"
 
 #: ../libpurple/protocols/msn/servconn.c:146
+#: ../libpurple/protocols/msnp9/servconn.c:144
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7242,136 +7390,181 @@
 "Yhteysvirhe palvelimelta %s:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:346
+#: ../libpurple/protocols/msn/session.c:349
+#: ../libpurple/protocols/msnp9/session.c:302
 msgid "Our protocol is not supported by the server."
 msgstr "Palvelin ei tue yhteyskäytäntöä."
 
-#: ../libpurple/protocols/msn/session.c:350
+#: ../libpurple/protocols/msn/session.c:354
+#: ../libpurple/protocols/msnp9/session.c:307
 msgid "Error parsing HTTP."
 msgstr "Virhe jäsennettäessä HTTP:tä."
 
-#: ../libpurple/protocols/msn/session.c:354
-#: ../libpurple/protocols/oscar/flap_connection.c:384
+#: ../libpurple/protocols/msn/session.c:358
+#: ../libpurple/protocols/msnp9/session.c:311
+#: ../libpurple/protocols/oscar/flap_connection.c:387
 #: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "Olet kirjautunut sisään toisesta paikasta."
 
-#: ../libpurple/protocols/msn/session.c:359
+#: ../libpurple/protocols/msn/session.c:364
+#: ../libpurple/protocols/msnp9/session.c:317
 msgid "The MSN servers are temporarily unavailable. Please wait and try again."
 msgstr ""
 "MSN-palvelimet ovat väliaikaisesti tavoittamattomissa. Odota ja yritä "
 "uudelleen."
 
-#: ../libpurple/protocols/msn/session.c:364
+#: ../libpurple/protocols/msn/session.c:370
+#: ../libpurple/protocols/msnp9/session.c:323
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN-palvelimet ajetaan alas väliaikaisesti."
 
-#: ../libpurple/protocols/msn/session.c:369
+#: ../libpurple/protocols/msn/session.c:375
+#: ../libpurple/protocols/msnp9/session.c:328
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Ei voida tunnistautua: %s"
 
-#: ../libpurple/protocols/msn/session.c:374
+#: ../libpurple/protocols/msn/session.c:381
+#: ../libpurple/protocols/msnp9/session.c:334
 msgid ""
 "Your MSN buddy list is temporarily unavailable. Please wait and try again."
-msgstr ""
-"MSN-tuttavalistaa ei väliaikaisesti voida hakea. Yritä myöhemmin uudelleen."
-
-#: ../libpurple/protocols/msn/session.c:395
-#: ../libpurple/protocols/msn/session.c:397
+msgstr "MSN-tuttavia ei väliaikaisesti voida hakea. Yritä myöhemmin uudelleen."
+
+#: ../libpurple/protocols/msn/session.c:403
+#: ../libpurple/protocols/msn/session.c:405
+#: ../libpurple/protocols/msnp9/session.c:356
+#: ../libpurple/protocols/msnp9/session.c:358
 msgid "Handshaking"
 msgstr "Kättely"
 
-#: ../libpurple/protocols/msn/session.c:398
+#: ../libpurple/protocols/msn/session.c:406
+#: ../libpurple/protocols/msnp9/session.c:359
 msgid "Starting authentication"
 msgstr "Aloitetaan tunnistautumista"
 
-#: ../libpurple/protocols/msn/session.c:399
+#: ../libpurple/protocols/msn/session.c:407
+#: ../libpurple/protocols/msnp9/session.c:360
 msgid "Getting cookie"
 msgstr "Haetaan evästettä"
 
-#: ../libpurple/protocols/msn/session.c:401
+#: ../libpurple/protocols/msn/session.c:409
+#: ../libpurple/protocols/msnp9/session.c:362
 msgid "Sending cookie"
 msgstr "Lähetetään evästettä"
 
-#: ../libpurple/protocols/msn/session.c:402
+#: ../libpurple/protocols/msn/session.c:410
+#: ../libpurple/protocols/msnp9/session.c:363
 msgid "Retrieving buddy list"
-msgstr "Noudetaan tuttavalista"
+msgstr "Noudetaan tuttavia"
 
 #: ../libpurple/protocols/msn/state.c:34
+#: ../libpurple/protocols/msnp9/state.c:34
 msgid "Away From Computer"
 msgstr "Poissa tietokoneelta"
 
 #: ../libpurple/protocols/msn/state.c:35
+#: ../libpurple/protocols/msnp9/state.c:35
 msgid "On The Phone"
 msgstr "Puhelimessa"
 
 #: ../libpurple/protocols/msn/state.c:36
+#: ../libpurple/protocols/msnp9/state.c:36
 msgid "Out To Lunch"
 msgstr "Lounaalla"
 
 #: ../libpurple/protocols/msn/switchboard.c:398
+#: ../libpurple/protocols/msnp9/switchboard.c:400
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Viestiä ei välttämättä lähetetty koska tapahtui aikakatkaisu:"
 
 #: ../libpurple/protocols/msn/switchboard.c:406
+#: ../libpurple/protocols/msnp9/switchboard.c:408
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Viestien lähetys ei ole sallittu näkymättömänä:"
 
 #: ../libpurple/protocols/msn/switchboard.c:410
+#: ../libpurple/protocols/msnp9/switchboard.c:412
 msgid "Message could not be sent because the user is offline:"
-msgstr "Viestiä ei voitu lähettää koska käyttäjä on poissa linjoilta:"
+msgstr "Viestiä ei voi lähettää koska käyttäjä on poissa linjoilta:"
 
 #: ../libpurple/protocols/msn/switchboard.c:414
+#: ../libpurple/protocols/msnp9/switchboard.c:416
 msgid "Message could not be sent because a connection error occurred:"
-msgstr "Viestiä ei voitu lähettää yhteysvirheen vuoksi:"
+msgstr "Viestiä ei voi lähettää yhteysvirheen vuoksi:"
 
 #: ../libpurple/protocols/msn/switchboard.c:418
+#: ../libpurple/protocols/msnp9/switchboard.c:420
 msgid "Message could not be sent because we are sending too quickly:"
-msgstr "Viestiä ei voitu lähettää koska viestejä lähetetään liian nopeasti:"
+msgstr "Viestiä ei voi lähettää koska viestejä lähetetään liian nopeasti:"
 
 #: ../libpurple/protocols/msn/switchboard.c:422
+#: ../libpurple/protocols/msnp9/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 ""
-"Viestiä ei voitu lähettää koska istuntoa palvelimen kanssa ei voitu "
-"muodostaa. Tämä on luultavasti ongelma palvelimella, yritä uudelleen "
-"muutaman minuutin päästä:"
+"Viestiä ei voi lähettää koska istuntoa palvelimen kanssa ei voi muodostaa. "
+"Tämä on luultavasti ongelma palvelimella, yritä uudelleen muutaman minuutin "
+"päästä:"
 
 #: ../libpurple/protocols/msn/switchboard.c:429
+#: ../libpurple/protocols/msnp9/switchboard.c:431
 msgid ""
 "Message could not be sent because an error with the switchboard occurred:"
 msgstr ""
-"Viestiä ei voitu lähettää kytkentäpalvelimen kanssa tapahtuneen virheen "
-"vuoksi:"
+"Viestiä ei voi lähettää kytkentäpalvelimen kanssa tapahtuneen virheen vuoksi:"
 
 #: ../libpurple/protocols/msn/switchboard.c:437
+#: ../libpurple/protocols/msnp9/switchboard.c:439
 msgid "Message may have not been sent because an unknown error occurred:"
-msgstr "Viestiä ei voitu lähettää tuntemattoman virheen vuoksi:"
+msgstr "Viestiä ei voi lähettää tuntemattoman virheen vuoksi:"
 
 #: ../libpurple/protocols/msn/userlist.c:243
+#: ../libpurple/protocols/msnp9/userlist.c:252
 #, c-format
 msgid "%s has added you to his or her buddy list."
-msgstr "Käyttäjä %s on lisännyt sinut tuttavalistalleen."
+msgstr "Käyttäjä %s on lisännyt sinut tuttaviinsa."
 
 #: ../libpurple/protocols/msn/userlist.c:312
+#: ../libpurple/protocols/msnp9/userlist.c:321
 #, c-format
 msgid "%s has removed you from his or her buddy list."
-msgstr "%s on poistanut sinut tuttavalistaltaan."
+msgstr "%s on poistanut sinut tuttavistaan."
 
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
 #: ../libpurple/protocols/msn/userlist.c:693
+#: ../libpurple/protocols/msnp9/userlist.c:643
 #, c-format
 msgid "Unable to add \"%s\"."
-msgstr "Ei voitu lisätä \"%s\"."
+msgstr "Ei voi lisätä \"%s\"."
 
 #: ../libpurple/protocols/msn/userlist.c:696
+#: ../libpurple/protocols/msnp9/userlist.c:645
 msgid "The screen name specified is invalid."
 msgstr "Syötetty näyttönimi on virheellinen."
 
+#: ../libpurple/protocols/msnp9/msn.c:549
+msgid "Has you"
+msgstr "Olet hänen listallaan"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+#: ../libpurple/protocols/msnp9/msn.c:2159
+#: ../libpurple/protocols/msnp9/msn.c:2161
+msgid "MSN Protocol Plugin"
+msgstr "MSN-yhteyskäytäntöliitännäinen"
+
 #: ../libpurple/protocols/myspace/myspace.c:111
 msgid "Missing Cipher"
 msgstr "Salaus puuttuu"
@@ -7399,66 +7592,66 @@
 
 #. Notify an error message also, because this is important!
 #: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1810
+#: ../libpurple/protocols/myspace/myspace.c:1820
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-virhe"
 
-#: ../libpurple/protocols/myspace/myspace.c:350
+#: ../libpurple/protocols/myspace/myspace.c:352
 msgid "Reading challenge"
 msgstr "Luetaan tunnistushaastetta"
 
-#: ../libpurple/protocols/myspace/myspace.c:356
+#: ../libpurple/protocols/myspace/myspace.c:360
 msgid "Unexpected challenge length from server"
 msgstr "Odottamaton tunnistushaasteen pituus palvelimelta"
 
-#: ../libpurple/protocols/myspace/myspace.c:360
+#: ../libpurple/protocols/myspace/myspace.c:364
 msgid "Logging in"
 msgstr "Kirjaudutaan sisään"
 
-#: ../libpurple/protocols/myspace/myspace.c:1293
+#: ../libpurple/protocols/myspace/myspace.c:1296
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr "Yhteys palvelimelle katkesi (dataa ei vastaanotettu %d sekunnissa)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1335
+#: ../libpurple/protocols/myspace/myspace.c:1339
 msgid "New mail messages"
 msgstr "Uusia viestejä postilaatikossa"
 
-#: ../libpurple/protocols/myspace/myspace.c:1336
+#: ../libpurple/protocols/myspace/myspace.c:1340
 msgid "New blog comments"
 msgstr "Uusia blogikommentteja"
 
-#: ../libpurple/protocols/myspace/myspace.c:1337
+#: ../libpurple/protocols/myspace/myspace.c:1341
 msgid "New profile comments"
 msgstr "Uusia profiilikommentteja"
 
-#: ../libpurple/protocols/myspace/myspace.c:1338
+#: ../libpurple/protocols/myspace/myspace.c:1342
 msgid "New friend requests!"
 msgstr "Uusia kaveripyyntöjä."
 
-#: ../libpurple/protocols/myspace/myspace.c:1339
+#: ../libpurple/protocols/myspace/myspace.c:1343
 msgid "New picture comments"
 msgstr "Uusia kuvakommentteja"
 
-#: ../libpurple/protocols/myspace/myspace.c:1367
+#: ../libpurple/protocols/myspace/myspace.c:1371
 msgid "MySpace"
 msgstr "MySpace"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1550
-#: ../libpurple/protocols/sametime/sametime.c:1544
+#: ../libpurple/protocols/myspace/myspace.c:1554
+#: ../libpurple/protocols/sametime/sametime.c:1546
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: ../libpurple/protocols/myspace/myspace.c:1561
-#: ../libpurple/protocols/myspace/myspace.c:1563
+#: ../libpurple/protocols/myspace/myspace.c:1565
+#: ../libpurple/protocols/myspace/myspace.c:1568
 msgid "No username set"
 msgstr "Käyttäjänimeä ei asetettu"
 
-#: ../libpurple/protocols/myspace/myspace.c:1562
+#: ../libpurple/protocols/myspace/myspace.c:1566
 msgid ""
 "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
 "username and choose a username and try to login again."
@@ -7467,72 +7660,71 @@
 "fuseaction=profile.username ja valitse käyttäjänimesi. Kirjaudu sitten "
 "uudestaan."
 
-#: ../libpurple/protocols/myspace/myspace.c:1789
+#: ../libpurple/protocols/myspace/myspace.c:1794
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Yhteyskäytäntövirhe, virhekoodi %d: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:1981
-#: ../libpurple/protocols/myspace/myspace.c:2015
+#: ../libpurple/protocols/myspace/myspace.c:1990
+#: ../libpurple/protocols/myspace/myspace.c:2024
 msgid "Failed to add buddy"
 msgstr "Tuttavan lisääminen epäonnistui"
 
-#: ../libpurple/protocols/myspace/myspace.c:1981
+#: ../libpurple/protocols/myspace/myspace.c:1990
 msgid "'addbuddy' command failed."
 msgstr "\"addbuddy\"-komento epäonnistui."
 
-#: ../libpurple/protocols/myspace/myspace.c:2015
-#: ../libpurple/protocols/myspace/myspace.c:2252
+#: ../libpurple/protocols/myspace/myspace.c:2024
+#: ../libpurple/protocols/myspace/myspace.c:2261
 msgid "persist command failed"
 msgstr "persist-komento epäonnistui"
 
-#: ../libpurple/protocols/myspace/myspace.c:2120
+#: ../libpurple/protocols/myspace/myspace.c:2129
 #, c-format
 msgid "No such user: %s"
 msgstr "Käyttäjää ei löydy: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2121
+#: ../libpurple/protocols/myspace/myspace.c:2130
 msgid "User lookup"
 msgstr "Käyttäjän haku"
 
-#: ../libpurple/protocols/myspace/myspace.c:2233
-#: ../libpurple/protocols/myspace/myspace.c:2252
-#: ../libpurple/protocols/myspace/myspace.c:2274
+#: ../libpurple/protocols/myspace/myspace.c:2242
+#: ../libpurple/protocols/myspace/myspace.c:2261
+#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "Failed to remove buddy"
 msgstr "Tuttavaa poistaminen epäonnistui"
 
-#: ../libpurple/protocols/myspace/myspace.c:2233
+#: ../libpurple/protocols/myspace/myspace.c:2242
 msgid "'delbuddy' command failed"
 msgstr "\"delbuddy\"-komento epäonnistui"
 
-#: ../libpurple/protocols/myspace/myspace.c:2274
+#: ../libpurple/protocols/myspace/myspace.c:2283
 msgid "blocklist command failed"
 msgstr "blocklist-komento epäonnistui"
 
-#: ../libpurple/protocols/myspace/myspace.c:2320
+#: ../libpurple/protocols/myspace/myspace.c:2331
 msgid "Invalid input condition"
 msgstr "Epäkelpo syötetila"
 
-#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2338
-#: ../libpurple/protocols/myspace/myspace.c:2369
+#: ../libpurple/protocols/myspace/myspace.c:2351
+#: ../libpurple/protocols/myspace/myspace.c:2388
 msgid "Read buffer full"
 msgstr "Lukupuskuri täynnä"
 
-#: ../libpurple/protocols/myspace/myspace.c:2407
+#: ../libpurple/protocols/myspace/myspace.c:2430
 msgid "Unparseable message"
 msgstr "Viestin jäsennys epäonnistui"
 
-#: ../libpurple/protocols/myspace/myspace.c:2476
+#: ../libpurple/protocols/myspace/myspace.c:2499
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
-msgstr "Yhteyttä isäntään ei voitu muodostaa: %s (%d)"
-
-#: ../libpurple/protocols/myspace/myspace.c:2647
+msgstr "Yhteyttä isäntään ei voi muodostaa: %s (%d)"
+
+#: ../libpurple/protocols/myspace/myspace.c:2670
 msgid "IM Friends"
 msgstr "Pikaviestikaverit"
 
-#: ../libpurple/protocols/myspace/myspace.c:2747
+#: ../libpurple/protocols/myspace/myspace.c:2769
 #, c-format
 msgid ""
 "%d buddies were added or updated from the server (including buddies already "
@@ -7541,57 +7733,57 @@
 "%d tuttavaa lisättiin tai päivitettiin palvelimelta (mukaan lukien jo "
 "palvelinpuolen luettelossa olevat)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2748
+#: ../libpurple/protocols/myspace/myspace.c:2770
 msgid "Add contacts from server"
 msgstr "Lisää tuttavia palvelimelta"
 
-#: ../libpurple/protocols/myspace/myspace.c:2800
-#: ../libpurple/protocols/myspace/myspace.c:2865
+#: ../libpurple/protocols/myspace/myspace.c:2822
+#: ../libpurple/protocols/myspace/myspace.c:2887
 msgid "Add friends from MySpace.com"
 msgstr "Lisää kavereita MySpacesta"
 
-#: ../libpurple/protocols/myspace/myspace.c:2801
+#: ../libpurple/protocols/myspace/myspace.c:2823
 msgid "Importing friends failed"
 msgstr "Kavereiden tuonti epäonnistui"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2857
+#: ../libpurple/protocols/myspace/myspace.c:2879
 msgid "Find people..."
 msgstr "Etsi ihmisiä..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2860
+#: ../libpurple/protocols/myspace/myspace.c:2882
 msgid "Change IM name..."
 msgstr "Vaihda pikaviestinnimeä..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3162
+#: ../libpurple/protocols/myspace/myspace.c:3184
 msgid "myim URL handler"
 msgstr "myim-URL-käsittelijä"
 
-#: ../libpurple/protocols/myspace/myspace.c:3163
+#: ../libpurple/protocols/myspace/myspace.c:3185
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
 msgstr "Tämän myim-osoitteen avaamiseen sopivaa MySpaceIM-tiliä ei löytynyt."
 
-#: ../libpurple/protocols/myspace/myspace.c:3164
+#: ../libpurple/protocols/myspace/myspace.c:3186
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Ota sopiva MySpaceIM-käyttäjätili käyttöön ja yritä uudelleen."
 
-#: ../libpurple/protocols/myspace/myspace.c:3287
+#: ../libpurple/protocols/myspace/myspace.c:3309
 msgid "Show display name in status text"
 msgstr "Näytä näyttönimi tilatekstissä"
 
-#: ../libpurple/protocols/myspace/myspace.c:3290
+#: ../libpurple/protocols/myspace/myspace.c:3312
 msgid "Show headline in status text"
 msgstr "Näytä otsikko tilatekstissä"
 
-#: ../libpurple/protocols/myspace/myspace.c:3295
+#: ../libpurple/protocols/myspace/myspace.c:3317
 msgid "Send emoticons"
 msgstr "Lähetä hymiöitä"
 
-#: ../libpurple/protocols/myspace/myspace.c:3300
+#: ../libpurple/protocols/myspace/myspace.c:3322
 msgid "Screen resolution (dots per inch)"
 msgstr "Näytön tarkkuus (pisteitä tuumalla)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3303
+#: ../libpurple/protocols/myspace/myspace.c:3325
 msgid "Base font size (points)"
 msgstr "Peruskirjasinkoko (pisteinä)"
 
@@ -7602,7 +7794,7 @@
 msgstr "Käyttäjä"
 
 #: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/oscar/oscar.c:2979
+#: ../libpurple/protocols/oscar/oscar.c:2974
 msgid "Profile"
 msgstr "Profiili"
 
@@ -7868,7 +8060,7 @@
 
 #: ../libpurple/protocols/novell/nmuser.c:1925
 msgid "Could not recognize the host of the screen name you entered"
-msgstr "Ei voitu tunnistaa syötetyn näyttönimen isäntäpalvelinta"
+msgstr "Ei voi tunnistaa syötetyn näyttönimen isäntäpalvelinta"
 
 #: ../libpurple/protocols/novell/nmuser.c:1928
 msgid ""
@@ -7924,113 +8116,113 @@
 msgid "Login failed (%s)."
 msgstr "Kirjautuminen epäonnistui (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:249
+#: ../libpurple/protocols/novell/novell.c:255
 #, c-format
 msgid "Unable to send message. Could not get details for user (%s)."
-msgstr "Viestiä ei voitu lähettää. Ei saatu yksityiskohtia käyttäjälle (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:398
+msgstr "Viestiä ei voi lähettää. Ei saatu yksityiskohtia käyttäjälle (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:404
 #, c-format
 msgid "Unable to add %s to your buddy list (%s)."
-msgstr "Ei voitu lisätä %s tuttavalistalle (%s)."
+msgstr "Ei voi lisätä %s tuttaviin (%s)."
 
 #. TODO: Improve this! message to who or for what conference?
-#: ../libpurple/protocols/novell/novell.c:424
+#: ../libpurple/protocols/novell/novell.c:430
 #, c-format
 msgid "Unable to send message (%s)."
-msgstr "Viestiä ei voitu lähettää (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:495
-#: ../libpurple/protocols/novell/novell.c:987
+msgstr "Viestiä ei voi lähettää (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:501
+#: ../libpurple/protocols/novell/novell.c:993
 #, c-format
 msgid "Unable to invite user (%s)."
-msgstr "Ei voitu kutsua käyttäjää (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:534
+msgstr "Ei voi kutsua käyttäjää (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:540
 #, c-format
 msgid "Unable to send message to %s. Could not create the conference (%s)."
 msgstr ""
-"Ei voitu lähettää viestiä käyttäjälle %s. Ei voutu luoda konferenssia (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:539
+"Ei voi lähettää viestiä käyttäjälle %s. Ei voutu luoda konferenssia (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:545
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
-msgstr "Viestiä ei voitu lähettää. Ei voitu luoda konferenssia (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:586
+msgstr "Viestiä ei voi lähettää. Ei voi luoda konferenssia (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:592
 #, c-format
 msgid ""
 "Unable to move user %s to folder %s in the server side list. Error while "
 "creating folder (%s)."
 msgstr ""
-"Ei voitu siirtää käyttäjää %s kansioon %s palvelinpuolen listalla. Virhe "
+"Ei voi siirtää käyttäjää %s kansioon %s palvelinpuolen tuttavissa. Virhe "
 "luotaessa kansiota (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:634
+#: ../libpurple/protocols/novell/novell.c:640
 #, c-format
 msgid ""
 "Unable to add %s to your buddy list. Error creating folder in server side "
 "list (%s)."
 msgstr ""
-"Ei voitu lisätä %s tuttavalistalle. Virhe luotaessa kansiota palvelinpuolen "
-"listalle (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:707
+"Ei voi lisätä %s tuttaviin. Virhe luotaessa kansiota palvelinpuolen "
+"tuttaviin (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:713
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Ei saatu yksityiskohtia käyttäjälle %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:753
-#: ../libpurple/protocols/novell/novell.c:899
+#: ../libpurple/protocols/novell/novell.c:759
+#: ../libpurple/protocols/novell/novell.c:905
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
-msgstr "Ei voitu lisätä käyttäjää yksityisyys-listalle (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:800
+msgstr "Ei voi lisätä käyttäjää yksityisyys-listaan (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:806
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
-msgstr "Ei voitu lisätä %s kieltolistalle (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:853
+msgstr "Ei voi lisätä %s kieltolistalle (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:859
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
-msgstr "Ei voitu lisätä %s sallitut-listalle (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:921
+msgstr "Ei voi lisätä %s sallitut-listalle (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:927
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
-msgstr "Ei voitu poistaa %s yksityisyys-listalta (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:944
-#: ../libpurple/protocols/novell/novell.c:1649
+msgstr "Ei voi poistaa %s yksityisyys-listalta (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:950
+#: ../libpurple/protocols/novell/novell.c:1656
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
-msgstr "Ei voitu muuttaa palvelinpuolen yksityisyys-asetuksia (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:1014
+msgstr "Ei voi muuttaa palvelinpuolen yksityisyys-asetuksia (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:1020
 #, c-format
 msgid "Unable to create conference (%s)."
-msgstr "Ei voitu luoda konferenssia (%s)."
-
-#: ../libpurple/protocols/novell/novell.c:1123
-#: ../libpurple/protocols/novell/novell.c:1694
+msgstr "Ei voi luoda konferenssia (%s)."
+
+#: ../libpurple/protocols/novell/novell.c:1131
+#: ../libpurple/protocols/novell/novell.c:1702
 msgid "Error communicating with server. Closing connection."
 msgstr "Virhe kommunikoitaessa palvelimelle. Suljetaan yhteys."
 
-#: ../libpurple/protocols/novell/novell.c:1478
+#: ../libpurple/protocols/novell/novell.c:1485
 msgid "Telephone Number"
 msgstr "Puhelinnumero"
 
-#: ../libpurple/protocols/novell/novell.c:1484
+#: ../libpurple/protocols/novell/novell.c:1491
 msgid "Personal Title"
 msgstr "Titteli"
 
-#: ../libpurple/protocols/novell/novell.c:1488
+#: ../libpurple/protocols/novell/novell.c:1495
 msgid "Mailstop"
 msgstr "Mailstop"
 
-#: ../libpurple/protocols/novell/novell.c:1504
-#: ../libpurple/protocols/sametime/sametime.c:4122
+#: ../libpurple/protocols/novell/novell.c:1511
+#: ../libpurple/protocols/sametime/sametime.c:4168
 msgid "User ID"
 msgstr "Käyttäjän ID"
 
@@ -8040,41 +8232,37 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1517
+#: ../libpurple/protocols/novell/novell.c:1524
 msgid "Full name"
 msgstr "Koko nimi"
 
-#: ../libpurple/protocols/novell/novell.c:1639
+#: ../libpurple/protocols/novell/novell.c:1646
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise-konferenssi %d"
 
-#: ../libpurple/protocols/novell/novell.c:1670
-msgid "Unable to make SSL connection to server."
-msgstr "Palvelimeen ei kyetty muodostamaan SSL-yhteyttä."
-
-#: ../libpurple/protocols/novell/novell.c:1722
+#: ../libpurple/protocols/novell/novell.c:1729
 msgid "Authenticating..."
 msgstr "Todennetaan..."
 
-#: ../libpurple/protocols/novell/novell.c:1734
+#: ../libpurple/protocols/novell/novell.c:1743
 msgid "Unable to connect to server."
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
 
-#: ../libpurple/protocols/novell/novell.c:1737
+#: ../libpurple/protocols/novell/novell.c:1746
 msgid "Waiting for response..."
 msgstr "Odotetaan vastausta..."
 
-#: ../libpurple/protocols/novell/novell.c:1872
+#: ../libpurple/protocols/novell/novell.c:1881
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s on kutsuttu tähän keskusteluun."
 
-#: ../libpurple/protocols/novell/novell.c:1900
+#: ../libpurple/protocols/novell/novell.c:1909
 msgid "Invitation to Conversation"
 msgstr "Keskustelukutsu"
 
-#: ../libpurple/protocols/novell/novell.c:1901
+#: ../libpurple/protocols/novell/novell.c:1910
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8085,38 +8273,34 @@
 "\n"
 "Lähetetty: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1903
+#: ../libpurple/protocols/novell/novell.c:1912
 msgid "Would you like to join the conversation?"
 msgstr "Haluatko liittyä keskusteluun?"
 
-#: ../libpurple/protocols/novell/novell.c:2017
+#: ../libpurple/protocols/novell/novell.c:2027
 msgid "You have been logged out because you logged in at another workstation."
 msgstr ""
 "Sinut on kirjattu ulos koska olet kirjautunut sisään toiselta työasemalta."
 
-#: ../libpurple/protocols/novell/novell.c:2074
+#: ../libpurple/protocols/novell/novell.c:2084
 #, c-format
 msgid ""
 "%s appears to be offline and did not receive the message that you just sent."
 msgstr "%s näyttää olevan poissa eikä saanut viestiä jonka juuri lähetit."
 
-#. TODO: Would be nice to prompt if not set!
-#. *  purple_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2172
+#: ../libpurple/protocols/novell/novell.c:2184
 msgid ""
 "Unable to connect to server. Please enter the address of the server you wish "
 "to connect to."
 msgstr ""
-"Ei voitu yhdistää palvelimeen. Ole hyvä, syötä palvelimen osoite jolle "
-"haluat yhdistää."
-
-#: ../libpurple/protocols/novell/novell.c:2200
+"Ei voi yhdistää palvelimeen. Ole hyvä, syötä palvelimen osoite jolle haluat "
+"yhdistää."
+
+#: ../libpurple/protocols/novell/novell.c:2213
 msgid "Error. SSL support is not installed."
 msgstr "Virhe. SSL-tuki ei ole asennettu."
 
-#: ../libpurple/protocols/novell/novell.c:2509
+#: ../libpurple/protocols/novell/novell.c:2521
 #, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Tämä konferenssi on suljettu. Uusia viestejä ei voi lähettää."
@@ -8131,31 +8315,31 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3523
-#: ../libpurple/protocols/novell/novell.c:3525
+#: ../libpurple/protocols/novell/novell.c:3535
+#: ../libpurple/protocols/novell/novell.c:3537
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger -yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/novell/novell.c:3550
+#: ../libpurple/protocols/novell/novell.c:3562
 msgid "Server address"
 msgstr "Palvelimen osoite"
 
-#: ../libpurple/protocols/novell/novell.c:3554
+#: ../libpurple/protocols/novell/novell.c:3566
 msgid "Server port"
 msgstr "Palvelimen portti"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2471
-#: ../libpurple/protocols/yahoo/yahoo.c:2638
-#: ../libpurple/protocols/yahoo/ycht.c:481 ../libpurple/proxy.c:584
+#: ../libpurple/protocols/oscar/flap_connection.c:391
+#: ../libpurple/protocols/yahoo/yahoo.c:2473
+#: ../libpurple/protocols/yahoo/yahoo.c:2641
+#: ../libpurple/protocols/yahoo/ycht.c:482 ../libpurple/proxy.c:584
 #: ../libpurple/proxy.c:1129 ../libpurple/proxy.c:1238
 #: ../libpurple/proxy.c:1338 ../libpurple/proxy.c:1466
 msgid "Server closed the connection."
 msgstr "Palvelin on katkaissut yhteyden."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2465
-#: ../libpurple/protocols/yahoo/yahoo.c:2632 ../libpurple/proxy.c:596
+#: ../libpurple/protocols/oscar/flap_connection.c:393
+#: ../libpurple/protocols/yahoo/yahoo.c:2466
+#: ../libpurple/protocols/yahoo/yahoo.c:2634 ../libpurple/proxy.c:596
 #: ../libpurple/proxy.c:1141 ../libpurple/proxy.c:1250
 #: ../libpurple/proxy.c:1350 ../libpurple/proxy.c:1478
 #, c-format
@@ -8166,7 +8350,7 @@
 "Yhteys palvelimeen katkesi:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:394
+#: ../libpurple/protocols/oscar/flap_connection.c:396
 #: ../libpurple/proxy.c:1158 ../libpurple/proxy.c:1263
 #: ../libpurple/proxy.c:1362 ../libpurple/proxy.c:1434
 #: ../libpurple/proxy.c:1491
@@ -8204,7 +8388,7 @@
 msgstr "ICQ-yhteyskäytäntöliitännäinen"
 
 #: ../libpurple/protocols/oscar/libicq.c:147
-#: ../libpurple/protocols/yahoo/yahoo.c:4412
+#: ../libpurple/protocols/yahoo/yahoo.c:4421
 #: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Merkistö"
@@ -8228,7 +8412,7 @@
 
 #: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
-msgstr "Ei voitu muodostaa yhteyttä käyttäjän kanssa."
+msgstr "Ei voi muodostaa yhteyttä käyttäjän kanssa."
 
 #: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
@@ -8368,8 +8552,8 @@
 "asiakasohjelma.)"
 
 #. Label
-#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2391
-#: ../pidgin/gtkutils.c:2421
+#: ../libpurple/protocols/oscar/oscar.c:639 ../pidgin/gtkutils.c:2392
+#: ../pidgin/gtkutils.c:2422
 #: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Tuttavakuvake"
@@ -8383,15 +8567,15 @@
 msgstr "AIM:n suora pikaviesti"
 
 #: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:899
-#: ../libpurple/protocols/silc/util.c:557
+#: ../libpurple/protocols/silc/silc.c:911
+#: ../libpurple/protocols/silc/util.c:559
 #: ../libpurple/protocols/silc10/silc.c:679
 #: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Keskustelu"
 
 #: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6065
+#: ../libpurple/protocols/oscar/oscar.c:6060
 msgid "Get File"
 msgstr "Vastaanota tiedosto"
 
@@ -8405,7 +8589,7 @@
 
 #: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
-msgstr "Lähetä tuttavalista"
+msgstr "Lähetä tuttavat"
 
 #: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
@@ -8464,19 +8648,19 @@
 msgstr "Kamera"
 
 #: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5835
+#: ../libpurple/protocols/oscar/oscar.c:5830
 #, c-format
 msgid "Free For Chat"
 msgstr "Vapaana keskusteluun"
 
 #: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5870
+#: ../libpurple/protocols/oscar/oscar.c:5865
 #, c-format
 msgid "Not Available"
-msgstr "Ei tavoittevissa"
+msgstr "Ei tavoitettavissa"
 
 #: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5856
+#: ../libpurple/protocols/oscar/oscar.c:5851
 #, c-format
 msgid "Occupied"
 msgstr "Varattu"
@@ -8486,9 +8670,9 @@
 msgid "Web Aware"
 msgstr "Net-tietoinen"
 
-#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3097 ../libpurple/status.c:157
+#: ../libpurple/protocols/oscar/oscar.c:737 ../libpurple/protocols/qq/qq.c:184
+#: ../libpurple/protocols/qq/qq.c:289
+#: ../libpurple/protocols/yahoo/yahoo.c:3106 ../libpurple/status.c:157
 #: ../pidgin/gtkdocklet.c:557 ../pidgin/gtkstatusbox.c:1060
 #, c-format
 msgid "Invisible"
@@ -8500,13 +8684,13 @@
 msgstr "Linjoilla"
 
 #: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3722
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1155
+#: ../libpurple/protocols/oscar/oscar.c:3717
+#: ../libpurple/protocols/yahoo/yahoo_profile.c:721 ../pidgin/gtkprefs.c:1156
 msgid "IP Address"
 msgstr "IP-osoite"
 
 #: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2906
+#: ../libpurple/protocols/oscar/oscar.c:2901
 msgid "Warning Level"
 msgstr "Varoitustaso"
 
@@ -8552,34 +8736,38 @@
 "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 ""
-"Ei voitu kirjautua: Ei voitu kirjautua käyttäjänä %s koska näyttönimi on "
-"virheellinen. Näyttönimen tulee olla oikea sähköpostiosoite, tai alkaa "
+"Kirjautuminen epäonnistui: käyttäjänä %s ei voi kirjautua koska näyttönimi "
+"on virheellinen. Näyttönimen tulee olla oikea sähköpostiosoite, tai alkaa "
 "kirjaimella ja sisältää vain kirjaimia, numeroita ja välilyöntejä, tai "
 "sisältää vain numeroita."
 
-#: ../libpurple/protocols/oscar/oscar.c:1348
-#: ../libpurple/protocols/yahoo/yahoo.c:2107
+#. Unregistered screen name
+#: ../libpurple/protocols/oscar/oscar.c:1347
+#: ../libpurple/protocols/yahoo/yahoo.c:2108
 msgid "Invalid screen name."
-msgstr "Epäkelpo näyttöjänimi."
-
-#: ../libpurple/protocols/oscar/oscar.c:1355
+msgstr "Epäkelpo näyttönimi."
+
+#: ../libpurple/protocols/oscar/oscar.c:1353
 #: ../libpurple/protocols/qq/login_logout.c:485
-#: ../libpurple/protocols/simple/simple.c:1108
-#: ../libpurple/protocols/yahoo/yahoo.c:2128
+#: ../libpurple/protocols/simple/simple.c:1112
+#: ../libpurple/protocols/yahoo/yahoo.c:2130
 msgid "Incorrect password."
 msgstr "Virheellinen salasana."
 
-#: ../libpurple/protocols/oscar/oscar.c:1360
+#. Suspended account
+#: ../libpurple/protocols/oscar/oscar.c:1357
 msgid "Your account is currently suspended."
 msgstr "Käyttäjätilisi palvelu on parhaillaan keskeytetty."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1364
+#: ../libpurple/protocols/oscar/oscar.c:1361
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "AOL-pikaviestipalvelu ei tilapäisesti ole käytössä."
 
-#: ../libpurple/protocols/oscar/oscar.c:1369
-#: ../libpurple/protocols/oscar/oscar.c:1380
+#. screen name connecting too frequently
+#. IP address connecting too frequently
+#: ../libpurple/protocols/oscar/oscar.c:1365
+#: ../libpurple/protocols/oscar/oscar.c:1374
 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."
@@ -8588,44 +8776,53 @@
 "ja yritä uudelleen. Jos jatkat yrittämistä, joudut odottamaan vielä "
 "pidempään."
 
-#: ../libpurple/protocols/oscar/oscar.c:1374
+#. client too old
+#: ../libpurple/protocols/oscar/oscar.c:1369
 #, c-format
 msgid "The client version you are using is too old. Please upgrade at %s"
 msgstr "Asiakasohjelmasi versio on liian vanha. Päivitä osoitteessa %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1413
+#: ../libpurple/protocols/oscar/oscar.c:1407
 msgid "Could Not Connect"
-msgstr "Yhteyttä ei voitu muodostaa"
-
-#: ../libpurple/protocols/oscar/oscar.c:1417
+msgstr "Yhteyttä ei voi muodostaa"
+
+#: ../libpurple/protocols/oscar/oscar.c:1411
 msgid "Received authorization"
 msgstr "Saatiin lupa"
 
-#: ../libpurple/protocols/oscar/oscar.c:1439
+#: ../libpurple/protocols/oscar/oscar.c:1434
 msgid "The SecurID key entered is invalid."
 msgstr "Syötetty SecurID-avain on virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:1452
+#: ../libpurple/protocols/oscar/oscar.c:1447
 msgid "Enter SecurID"
 msgstr "Syötä SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1453
+#: ../libpurple/protocols/oscar/oscar.c:1448
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Syötä 6 numeroinen luku digitaaliselta näytöltä."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1455
-#: ../libpurple/protocols/oscar/oscar.c:2247
-#: ../libpurple/protocols/oscar/oscar.c:2296
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/oscar.c:6221 ../libpurple/request.h:1388
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_ok_cancel_with_hint instead.
+#.
+#: ../libpurple/protocols/oscar/oscar.c:1450
+#: ../libpurple/protocols/oscar/oscar.c:2242
+#: ../libpurple/protocols/oscar/oscar.c:2291
+#: ../libpurple/protocols/oscar/oscar.c:5935
+#: ../libpurple/protocols/oscar/oscar.c:6216 ../libpurple/request.h:1828
+#: ../libpurple/request.h:1841
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
+#: ../libpurple/protocols/oscar/oscar.c:1489
+#: ../libpurple/protocols/oscar/oscar.c:1532
 #, c-format
 msgid ""
 "You may be disconnected shortly.  You may want to use TOC until this is "
@@ -8634,74 +8831,73 @@
 "Yhteytesi saatetaan katkaista kohta. Saatat haluta käyttää TOC-"
 "yhteyskäytäntöä kunnes tämä on korjattu. Tarkista päivitykset: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1497
-#: ../libpurple/protocols/oscar/oscar.c:1540
+#: ../libpurple/protocols/oscar/oscar.c:1492
+#: ../libpurple/protocols/oscar/oscar.c:1535
 msgid "Unable to get a valid AIM login hash."
 msgstr "Kelvollista AIM-sisäänkirjautumistiivistettä ei saatu."
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
+#: ../libpurple/protocols/oscar/oscar.c:1620
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Yhteytesi saatetaan katkaista kohta. Tarkista päivitykset: %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:1628
+#: ../libpurple/protocols/oscar/oscar.c:1623
 msgid "Unable to get a valid login hash."
 msgstr "Kelvollista sisäänkirjautumistiivistettä ei saatu."
 
-#: ../libpurple/protocols/oscar/oscar.c:1658
+#: ../libpurple/protocols/oscar/oscar.c:1653
 msgid "Password sent"
 msgstr "Salasana lähetetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:1714
+#: ../libpurple/protocols/oscar/oscar.c:1709
 msgid "Unable to initialize connection"
 msgstr "Yhteyden luominen epäonnistui"
 
-#: ../libpurple/protocols/oscar/oscar.c:2205
+#: ../libpurple/protocols/oscar/oscar.c:2200
 msgid "Please authorize me so I can add you to my buddy list."
-msgstr "Valtuuttaisitko minut, jotta voin lisätä sinut tuttavalistalleni?"
-
-#: ../libpurple/protocols/oscar/oscar.c:2245
+msgstr "Valtuuttaisitko minut, jotta voin lisätä sinut tuttaviini?"
+
+#: ../libpurple/protocols/oscar/oscar.c:2240
 msgid "Authorization Request Message:"
 msgstr "Valtuutuksen pyyntöviesti:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2246
+#: ../libpurple/protocols/oscar/oscar.c:2241
 msgid "Please authorize me!"
 msgstr "Voisitko valtuuttaa minut?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2287
-#: ../libpurple/protocols/oscar/oscar.c:2295
-#: ../libpurple/protocols/oscar/oscar.c:2422
-#: ../libpurple/protocols/oscar/oscar.c:5316
+#: ../libpurple/protocols/oscar/oscar.c:2282
+#: ../libpurple/protocols/oscar/oscar.c:2290
+#: ../libpurple/protocols/oscar/oscar.c:2417
+#: ../libpurple/protocols/oscar/oscar.c:5311
 #: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "Syytä ei annettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:2294
+#: ../libpurple/protocols/oscar/oscar.c:2289
 msgid "Authorization Denied Message:"
 msgstr "Valtuutuspyyntö evätty:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2422
+#: ../libpurple/protocols/oscar/oscar.c:2417
 #, c-format
 msgid ""
 "The user %u has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"Käyttäjä %u on evännyt pyyntösi lisätä hänet tuttavalistallesi seuraavasta "
-"syystä:\n"
+"Käyttäjä %u on evännyt pyyntösi lisätä hänet tuttaviisi seuraavasta syystä:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
+#: ../libpurple/protocols/oscar/oscar.c:2418
 msgid "ICQ authorization denied."
 msgstr "ICQ-valtuutus evätty."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2430
+#: ../libpurple/protocols/oscar/oscar.c:2425
 #, c-format
 msgid "The user %u has granted your request to add them to your buddy list."
-msgstr "Käyttäjä %u on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
-
-#: ../libpurple/protocols/oscar/oscar.c:2438
+msgstr "Käyttäjä %u on hyväksynyt pyyntösi lisätä hänet tuttaviisi."
+
+#: ../libpurple/protocols/oscar/oscar.c:2433
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8714,7 +8910,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2446
+#: ../libpurple/protocols/oscar/oscar.c:2441
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8727,7 +8923,7 @@
 "Lähettäjä: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2454
+#: ../libpurple/protocols/oscar/oscar.c:2449
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8740,38 +8936,38 @@
 "Viesti on:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2475
+#: ../libpurple/protocols/oscar/oscar.c:2470
 #, c-format
 msgid "ICQ user %u has sent you a buddy: %s (%s)"
 msgstr "ICQ-käyttäjä %u on lähettänyt sinulle tuttavan: %s (%s)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2481
+#: ../libpurple/protocols/oscar/oscar.c:2476
 msgid "Do you want to add this buddy to your buddy list?"
-msgstr "Haluatko lisätä hänet tuttavalistallesi?"
-
-#: ../libpurple/protocols/oscar/oscar.c:2486 ../pidgin/gtkroomlist.c:309
+msgstr "Haluatko lisätä hänet tuttaviisi?"
+
+#: ../libpurple/protocols/oscar/oscar.c:2481 ../pidgin/gtkroomlist.c:318
 msgid "_Add"
 msgstr "_Lisää"
 
-#: ../libpurple/protocols/oscar/oscar.c:2487
+#: ../libpurple/protocols/oscar/oscar.c:2482
 msgid "_Decline"
 msgstr "_Kieltäydy"
 
-#: ../libpurple/protocols/oscar/oscar.c:2611
+#: ../libpurple/protocols/oscar/oscar.c:2606
 #, 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] "Et saanut %hu viestiä %s:lta koska se oli epäkelpo."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska ne olivat epäkelpoja."
 
-#: ../libpurple/protocols/oscar/oscar.c:2620
+#: ../libpurple/protocols/oscar/oscar.c:2615
 #, 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] "Et saanut %hu viestiä %s:lta koska se oli liian suuri."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska ne olivat liian suuria."
 
-#: ../libpurple/protocols/oscar/oscar.c:2629
+#: ../libpurple/protocols/oscar/oscar.c:2624
 #, c-format
 msgid ""
 "You missed %hu message from %s because the rate limit has been exceeded."
@@ -8780,21 +8976,21 @@
 msgstr[0] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska taajuusraja ylittyi."
 
-#: ../libpurple/protocols/oscar/oscar.c:2638
+#: ../libpurple/protocols/oscar/oscar.c:2633
 #, 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] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska hän on liian hirveä."
 
-#: ../libpurple/protocols/oscar/oscar.c:2647
+#: ../libpurple/protocols/oscar/oscar.c:2642
 #, 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] "Et saanut %hu viestiä %s:lta koska olet liian hirveä."
 msgstr[1] "Et saanut %hu viestiä %s:lta koska olet liian hirveä."
 
-#: ../libpurple/protocols/oscar/oscar.c:2656
+#: ../libpurple/protocols/oscar/oscar.c:2651
 #, 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."
@@ -8802,55 +8998,55 @@
 msgstr[1] "Et saanut %hu viestiä %s:lta tuntemattomasta syystä."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2811
+#: ../libpurple/protocols/oscar/oscar.c:2806
 #, c-format
 msgid "Unable to send message: %s"
-msgstr "Viestiä ei voitu lähettää: %s"
-
+msgstr "Viestiä ei voi lähettää: %s"
+
+#: ../libpurple/protocols/oscar/oscar.c:2806
 #: ../libpurple/protocols/oscar/oscar.c:2811
-#: ../libpurple/protocols/oscar/oscar.c:2816
-#: ../libpurple/protocols/oscar/oscar.c:2880
+#: ../libpurple/protocols/oscar/oscar.c:2875
 msgid "Unknown reason."
 msgstr "Tuntematon syy."
 
-#: ../libpurple/protocols/oscar/oscar.c:2814
-#: ../libpurple/protocols/sametime/sametime.c:2409
+#: ../libpurple/protocols/oscar/oscar.c:2809
+#: ../libpurple/protocols/sametime/sametime.c:2451
 #, c-format
 msgid "Unable to send message to %s:"
-msgstr "Viestiä ei voitu lähettää käyttäjälle %s."
-
-#: ../libpurple/protocols/oscar/oscar.c:2880
+msgstr "Viestiä ei voi lähettää käyttäjälle %s."
+
+#: ../libpurple/protocols/oscar/oscar.c:2875
 #, c-format
 msgid "User information not available: %s"
 msgstr "Käyttäjätiedot eivät ole saatavilla: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2911
+#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Online Since"
 msgstr "Kirjautunut"
 
-#: ../libpurple/protocols/oscar/oscar.c:2916
+#: ../libpurple/protocols/oscar/oscar.c:2911
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Rekisteröitynyt"
 
-#: ../libpurple/protocols/oscar/oscar.c:2951
+#: ../libpurple/protocols/oscar/oscar.c:2946
 msgid "Available Message"
 msgstr "Paikallaoloviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:3059
+#: ../libpurple/protocols/oscar/oscar.c:3054
 msgid "Your AIM connection may be lost."
 msgstr "AIM-yhteytesi saattaa olla katkennut."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3247
+#: ../libpurple/protocols/oscar/oscar.c:3242
 msgid ""
 "[Unable to display a message from this user because it contained invalid "
 "characters.]"
 msgstr ""
-"[Ei voitu näyttää viestiä tältä käyttäjältä koska se sisälsi epäkelpoja "
+"[Ei voi näyttää viestiä tältä käyttäjältä koska se sisälsi epäkelpoja "
 "merkkejä.]"
 
-#: ../libpurple/protocols/oscar/oscar.c:3411
+#: ../libpurple/protocols/oscar/oscar.c:3406
 msgid ""
 "The last action you attempted could not be performed because you are over "
 "the rate limit. Please wait 10 seconds and try again."
@@ -8858,83 +9054,83 @@
 "Viimeistä viestiä ei lähetetty koska olet ylittänyt taajuusrajan. Odota 10 "
 "sekuntia ja yritä uudelleen."
 
-#: ../libpurple/protocols/oscar/oscar.c:3494
+#: ../libpurple/protocols/oscar/oscar.c:3489
 #: ../libpurple/protocols/toc/toc.c:977
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Yhteytesi keskusteluhuoneeseen %s on katkennut."
 
-#: ../libpurple/protocols/oscar/oscar.c:3744
-#: ../libpurple/protocols/silc/util.c:589
+#: ../libpurple/protocols/oscar/oscar.c:3739
+#: ../libpurple/protocols/silc/util.c:591
 #: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Matkapuhelin"
 
-#: ../libpurple/protocols/oscar/oscar.c:3774
+#: ../libpurple/protocols/oscar/oscar.c:3769
 msgid "Personal Web Page"
 msgstr "Henkilökohtainen kotisivu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3798
+#: ../libpurple/protocols/oscar/oscar.c:3793
 #: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Lisätiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:3806
-#: ../libpurple/protocols/oscar/oscar.c:3819
+#: ../libpurple/protocols/oscar/oscar.c:3801
+#: ../libpurple/protocols/oscar/oscar.c:3814
 msgid "Zip Code"
 msgstr "Postinumero"
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
+#: ../libpurple/protocols/oscar/oscar.c:3825
 msgid "Division"
 msgstr "Osasto"
 
-#: ../libpurple/protocols/oscar/oscar.c:3831
+#: ../libpurple/protocols/oscar/oscar.c:3826
 msgid "Position"
 msgstr "Asema"
 
-#: ../libpurple/protocols/oscar/oscar.c:3833
+#: ../libpurple/protocols/oscar/oscar.c:3828
 msgid "Web Page"
 msgstr "Kotisivu"
 
-#: ../libpurple/protocols/oscar/oscar.c:3836
+#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Work Information"
 msgstr "Työtiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:3892
+#: ../libpurple/protocols/oscar/oscar.c:3887
 msgid "Pop-Up Message"
 msgstr "Ponnahdusviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:3932
+#: ../libpurple/protocols/oscar/oscar.c:3927
 #, c-format
 msgid "The following screen name is associated with %s"
 msgid_plural "The following screen names are associated with %s"
 msgstr[0] "Seuraava näyttönimi on assosioitu %s kanssa"
 msgstr[1] "Seuraavat näyttönimet on assosioitu %s kanssa"
 
-#: ../libpurple/protocols/oscar/oscar.c:3937
+#: ../libpurple/protocols/oscar/oscar.c:3932
 msgid "Screen name"
 msgstr "Näyttönimi"
 
-#: ../libpurple/protocols/oscar/oscar.c:3963
+#: ../libpurple/protocols/oscar/oscar.c:3958
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Ei hakutuloksia sähköpostiosoitteelle %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3984
+#: ../libpurple/protocols/oscar/oscar.c:3979
 #, c-format
 msgid "You should receive an e-mail asking to confirm %s."
 msgstr "Sinun tulisi saada sähköpostiviesti %s:n varmistusta varten."
 
-#: ../libpurple/protocols/oscar/oscar.c:3986
+#: ../libpurple/protocols/oscar/oscar.c:3981
 msgid "Account Confirmation Requested"
 msgstr "Tilin varmistusta pyydetty"
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
+#: ../libpurple/protocols/oscar/oscar.c:4012
 #, c-format
 msgid "Error Changing Account Info"
 msgstr "Virhe muutettaessa käyttäjätilin tietoja"
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
+#: ../libpurple/protocols/oscar/oscar.c:4015
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8943,14 +9139,14 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi eroaa "
 "alkuperäisestä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4023
+#: ../libpurple/protocols/oscar/oscar.c:4018
 #, c-format
 msgid "Error 0x%04x: Unable to format screen name because it is invalid."
 msgstr ""
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4026
+#: ../libpurple/protocols/oscar/oscar.c:4021
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to format screen name because the requested screen name "
@@ -8959,7 +9155,7 @@
 "Virhe 0x%04x: Näyttönimeä ei voi muotoilla koska pyydetty näyttönimi on "
 "liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4029
+#: ../libpurple/protocols/oscar/oscar.c:4024
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because there is already a "
@@ -8968,7 +9164,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska tälle näyttönimelle "
 "on jo käsittelemätön muutospyyntö."
 
-#: ../libpurple/protocols/oscar/oscar.c:4032
+#: ../libpurple/protocols/oscar/oscar.c:4027
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address has "
@@ -8977,7 +9173,7 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "assosioitu liian moneen näyttönimeen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4035
+#: ../libpurple/protocols/oscar/oscar.c:4030
 #, c-format
 msgid ""
 "Error 0x%04x: Unable to change e-mail address because the given address is "
@@ -8986,32 +9182,32 @@
 "Virhe 0x%04x: Sähköpostiosoitetta ei voida muuttaa koska annettu osoite on "
 "virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:4038
+#: ../libpurple/protocols/oscar/oscar.c:4033
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Virhe 0x%04x: Tuntematon virhe."
 
-#: ../libpurple/protocols/oscar/oscar.c:4048
+#: ../libpurple/protocols/oscar/oscar.c:4043
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "%s:n sähköpostiosoite on %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4050
+#: ../libpurple/protocols/oscar/oscar.c:4045
 msgid "Account Info"
 msgstr "Tilin tiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:4233
+#: ../libpurple/protocols/oscar/oscar.c:4228
 msgid ""
 "Your IM Image was not sent. You must be Direct Connected to send IM Images."
 msgstr ""
 "Pikaviesti kuvaasi ei lähetetty. Sinun tulee käyttää suorayhteyttä "
 "lähettääksesi pikaviestikuvia."
 
-#: ../libpurple/protocols/oscar/oscar.c:4504
+#: ../libpurple/protocols/oscar/oscar.c:4499
 msgid "Unable to set AIM profile."
 msgstr "AIM-profiilia ei saatu asetettua."
 
-#: ../libpurple/protocols/oscar/oscar.c:4505
+#: ../libpurple/protocols/oscar/oscar.c:4500
 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 "
@@ -9021,7 +9217,7 @@
 "suoritettua loppuun. Profiilia ei asetettu. Yritä asettaa se kun "
 "kirjautuminen on suoritettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:4519
+#: ../libpurple/protocols/oscar/oscar.c:4514
 #, c-format
 msgid ""
 "The maximum profile length of %d byte has been exceeded.  It has been "
@@ -9034,11 +9230,11 @@
 msgstr[1] ""
 "Maksimi profiilin koko %d tavua ylitetty.  Se on nyt lyhennetty puolestasi."
 
-#: ../libpurple/protocols/oscar/oscar.c:4524
+#: ../libpurple/protocols/oscar/oscar.c:4519
 msgid "Profile too long."
 msgstr "Profiili on liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4569
+#: ../libpurple/protocols/oscar/oscar.c:4564
 #, c-format
 msgid ""
 "The maximum away message length of %d byte has been exceeded.  It has been "
@@ -9053,149 +9249,148 @@
 "Maksimi poissaoloviestin koko %d tavua ylitetty. Viesti lyhennettiin "
 "puolestasi."
 
-#: ../libpurple/protocols/oscar/oscar.c:4574
+#: ../libpurple/protocols/oscar/oscar.c:4569
 msgid "Away message too long."
 msgstr "Poissaoloviesti on liian pitkä."
 
-#: ../libpurple/protocols/oscar/oscar.c:4647
+#: ../libpurple/protocols/oscar/oscar.c:4642
 #, 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 ""
-"Ei voitu lisätä tuttavaa %s koska näyttönimi on virheellinen. Näyttönimen "
+"Ei voi lisätä tuttavaa %s koska näyttönimi on virheellinen. Näyttönimen "
 "tulee olla oikea sähköpostiosoite, tai alkaa kirjaimella ja sisältää vain "
 "kirjaimia, numeroita ja välilyöntejä, tai sisältää vain numeroita."
 
-#: ../libpurple/protocols/oscar/oscar.c:4649
-#: ../libpurple/protocols/oscar/oscar.c:5102
-#: ../libpurple/protocols/oscar/oscar.c:5117
+#: ../libpurple/protocols/oscar/oscar.c:4644
+#: ../libpurple/protocols/oscar/oscar.c:5097
+#: ../libpurple/protocols/oscar/oscar.c:5112
 msgid "Unable To Add"
 msgstr "Lisääminen epäonnistui"
 
-#: ../libpurple/protocols/oscar/oscar.c:4768
+#: ../libpurple/protocols/oscar/oscar.c:4763
 msgid "Unable To Retrieve Buddy List"
-msgstr "Tuttavalistan nouto ei onnistunut"
-
-#: ../libpurple/protocols/oscar/oscar.c:4769
+msgstr "Tuttavien nouto ei onnistunut"
+
+#: ../libpurple/protocols/oscar/oscar.c:4764
 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 minutes."
 msgstr ""
-"AIM-palvelimet eivät väliaikaisesti onnistuneet lähettämään tuttavalistaasi. "
-"Tuttavalistasi ei ole kadonnut, se tulee luultavasti saataville muutamassa "
+"AIM-palvelimet eivät väliaikaisesti onnistuneet lähettämään tuttaviasi. "
+"Tuttavasi eivät ole kadonneet, ne tulevat luultavasti näkyville muutamassa "
 "minuutissa."
 
-#: ../libpurple/protocols/oscar/oscar.c:4952
-#: ../libpurple/protocols/oscar/oscar.c:4954
-#: ../libpurple/protocols/oscar/oscar.c:5182
+#: ../libpurple/protocols/oscar/oscar.c:4947
+#: ../libpurple/protocols/oscar/oscar.c:4949
+#: ../libpurple/protocols/oscar/oscar.c:5177
+#: ../libpurple/protocols/oscar/oscar.c:5178
 #: ../libpurple/protocols/oscar/oscar.c:5183
-#: ../libpurple/protocols/oscar/oscar.c:5188
 msgid "Orphans"
 msgstr "Orvot"
 
-#: ../libpurple/protocols/oscar/oscar.c:5100
+#: ../libpurple/protocols/oscar/oscar.c:5095
 #, 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 ""
-"Ei voitu lisätä tuttavaa %s koska listallasi on liian monta tuttavaa. Ole "
-"hyvä ja poista joku ja yritä uudelleen."
-
-#: ../libpurple/protocols/oscar/oscar.c:5100
-#: ../libpurple/protocols/oscar/oscar.c:5115
+"Ei voi lisätä tuttavaa %s koska tuttaviasi on liian monta. Ole hyvä ja "
+"poista joku ja yritä uudelleen."
+
+#: ../libpurple/protocols/oscar/oscar.c:5095
+#: ../libpurple/protocols/oscar/oscar.c:5110
 msgid "(no name)"
 msgstr "(nimetön)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5114
+#: ../libpurple/protocols/oscar/oscar.c:5109
 #, c-format
 msgid "Could not add the buddy %s for an unknown reason."
-msgstr "Tuttavaa %s ei voitu lisätä tuntemattomasta syystä."
-
-#: ../libpurple/protocols/oscar/oscar.c:5231
+msgstr "Tuttavaa %s ei voi lisätä tuntemattomasta syystä."
+
+#: ../libpurple/protocols/oscar/oscar.c:5226
 #, c-format
 msgid ""
 "The user %s has given you permission to add you to their buddy list.  Do you "
 "want to add them?"
 msgstr ""
-"Käyttäjä %s on antanut sinulle oikeuden lisätä itsesi hänen "
-"tuttavalistalleen. Haluatko lisätä hänet omallesi?"
-
-#: ../libpurple/protocols/oscar/oscar.c:5239
+"Käyttäjä %s on antanut sinulle oikeuden lisätä itsesi hänen tuttaviinsa. "
+"Haluatko lisätä hänet omallesi?"
+
+#: ../libpurple/protocols/oscar/oscar.c:5234
 msgid "Authorization Given"
 msgstr "Valtuutus annettu"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5312
+#: ../libpurple/protocols/oscar/oscar.c:5307
 #, c-format
 msgid "The user %s has granted your request to add them to your buddy list."
-msgstr "Käyttäjä %s on hyväksynyt pyyntösi lisätä hänet tuttavalistallesi."
-
-#: ../libpurple/protocols/oscar/oscar.c:5313
+msgstr "Käyttäjä %s on hyväksynyt pyyntösi lisätä hänet tuttaviisi."
+
+#: ../libpurple/protocols/oscar/oscar.c:5308
 msgid "Authorization Granted"
 msgstr "Valtuutus hyväksytty"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5316
+#: ../libpurple/protocols/oscar/oscar.c:5311
 #, c-format
 msgid ""
 "The user %s has denied your request to add them to your buddy list for the "
 "following reason:\n"
 "%s"
 msgstr ""
-"Käyttäjä %s on evännyt pyyntösi lisätä hänet tuttavalistallesi seuraavasta "
-"syystä:\n"
+"Käyttäjä %s on evännyt pyyntösi lisätä hänet tuttaviisi seuraavasta syystä:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5317
+#: ../libpurple/protocols/oscar/oscar.c:5312
 msgid "Authorization Denied"
 msgstr "Valtuutus evätty"
 
-#: ../libpurple/protocols/oscar/oscar.c:5353
+#: ../libpurple/protocols/oscar/oscar.c:5348
 #: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Vaihto:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5393
+#: ../libpurple/protocols/oscar/oscar.c:5388
 msgid "Invalid chat name specified."
 msgstr "Virheellinen ryhmäkeskustelun nimi annettu."
 
-#: ../libpurple/protocols/oscar/oscar.c:5462
+#: ../libpurple/protocols/oscar/oscar.c:5457
 msgid "Your IM Image was not sent. You cannot send IM Images in AIM chats."
 msgstr ""
 "Pikaviestikuvaasi ei lähetetty. Et voi lähettää pikaviestikuvia AIM- "
 "ryhmäkeskustelussa."
 
+#: ../libpurple/protocols/oscar/oscar.c:5619
 #: ../libpurple/protocols/oscar/oscar.c:5624
-#: ../libpurple/protocols/oscar/oscar.c:5629
 msgid "Away Message"
 msgstr "Poissaoloviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5629
+#: ../libpurple/protocols/oscar/oscar.c:5624
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(vastaanotetaan)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5829
+#: ../libpurple/protocols/oscar/oscar.c:5824
 msgid "iTunes Music Store Link"
 msgstr "iTunes-musiikkikauppalinkki"
 
-#: ../libpurple/protocols/oscar/oscar.c:5937
+#: ../libpurple/protocols/oscar/oscar.c:5932
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Tuttavakommentti käyttäjälle %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5938
+#: ../libpurple/protocols/oscar/oscar.c:5933
 msgid "Buddy Comment:"
 msgstr "Kommentti"
 
-#: ../libpurple/protocols/oscar/oscar.c:5985
+#: ../libpurple/protocols/oscar/oscar.c:5980
 #, c-format
 msgid "You have selected to open a Direct IM connection with %s."
 msgstr "Olet päättänyt avata suoran pikaviestiyhteyden %s:n kanssa."
 
-#: ../libpurple/protocols/oscar/oscar.c:5989
+#: ../libpurple/protocols/oscar/oscar.c:5984
 msgid ""
 "Because this reveals your IP address, it may be considered a security risk.  "
 "Do you wish to continue?"
@@ -9203,66 +9398,66 @@
 "Koska tämä paljastaa IP-osoitteesi, sitä voidaan pitää turvallisuusriskinä.  "
 "Haluatko jatkaa?"
 
-#: ../libpurple/protocols/oscar/oscar.c:5995
+#: ../libpurple/protocols/oscar/oscar.c:5990
 #: ../libpurple/protocols/oscar/peer.c:1047
 msgid "C_onnect"
 msgstr "Y_hdistä"
 
-#: ../libpurple/protocols/oscar/oscar.c:6030
+#: ../libpurple/protocols/oscar/oscar.c:6025
 msgid "Get AIM Info"
 msgstr "Hae AIM-tiedot"
 
-#: ../libpurple/protocols/oscar/oscar.c:6036
+#: ../libpurple/protocols/oscar/oscar.c:6031
 msgid "Edit Buddy Comment"
 msgstr "Muokkaa kommenttia"
 
-#: ../libpurple/protocols/oscar/oscar.c:6044
+#: ../libpurple/protocols/oscar/oscar.c:6039
 msgid "Get Status Msg"
 msgstr "Hae tilaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6057
+#: ../libpurple/protocols/oscar/oscar.c:6052
 msgid "Direct IM"
 msgstr "Suora pikaviesti"
 
-#: ../libpurple/protocols/oscar/oscar.c:6079
+#: ../libpurple/protocols/oscar/oscar.c:6074
 msgid "Re-request Authorization"
 msgstr "Pyydä valtuutus uudelleen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6138
+#: ../libpurple/protocols/oscar/oscar.c:6133
 msgid "Require authorization"
 msgstr "Pyydä valtuutusta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
+#: ../libpurple/protocols/oscar/oscar.c:6136
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Web-tietoinen (tämän käyttö altistaa sinut roskaposteille)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6146
+#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "ICQ Privacy Options"
 msgstr "ICQ-yksityisyysvalinnat"
 
-#: ../libpurple/protocols/oscar/oscar.c:6165
+#: ../libpurple/protocols/oscar/oscar.c:6160
 msgid "The new formatting is invalid."
 msgstr "Uusi muotoilu on virheellinen."
 
-#: ../libpurple/protocols/oscar/oscar.c:6166
+#: ../libpurple/protocols/oscar/oscar.c:6161
 msgid "Screen name formatting can change only capitalization and whitespace."
 msgstr ""
 "Näyttönimen muotoilu voi vaikuttaa ainoastaan alkukirjaimeen sekä "
 "välilyönteihin."
 
-#: ../libpurple/protocols/oscar/oscar.c:6219
+#: ../libpurple/protocols/oscar/oscar.c:6214
 msgid "Change Address To:"
 msgstr "Vaihda osoite:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6265
+#: ../libpurple/protocols/oscar/oscar.c:6260
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>Et odota valtuutusta</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6268
+#: ../libpurple/protocols/oscar/oscar.c:6263
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Odotat valtuutusta seuraavilta tuttavilta"
 
-#: ../libpurple/protocols/oscar/oscar.c:6269
+#: ../libpurple/protocols/oscar/oscar.c:6264
 msgid ""
 "You can re-request authorization from these buddies by right-clicking on "
 "them and selecting \"Re-request Authorization.\""
@@ -9270,73 +9465,73 @@
 "Voit pyytää valtuutuksen uudelleen näiltä tuttavilta napsauttamalla oikeaa "
 "nappia heihin ja valitsemalla \"Pyydä valtuutus uudelleen\"."
 
-#: ../libpurple/protocols/oscar/oscar.c:6286
+#: ../libpurple/protocols/oscar/oscar.c:6281
 msgid "Find Buddy by E-Mail"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6287
+#: ../libpurple/protocols/oscar/oscar.c:6282
 msgid "Search for a buddy by e-mail address"
 msgstr "Etsi tuttava sähköpostiosoitteen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6288
+#: ../libpurple/protocols/oscar/oscar.c:6283
 msgid "Type the e-mail address of the buddy you are searching for."
 msgstr "Syötä etsimäsi tuttavan sähköpostiosoite."
 
-#: ../libpurple/protocols/oscar/oscar.c:6291
+#: ../libpurple/protocols/oscar/oscar.c:6286
 msgid "_Search"
 msgstr "_Etsi"
 
-#: ../libpurple/protocols/oscar/oscar.c:6449
+#: ../libpurple/protocols/oscar/oscar.c:6444
 msgid "Set User Info (URL)..."
 msgstr "Aseta käyttäjätiedot (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6460
+#: ../libpurple/protocols/oscar/oscar.c:6455
 msgid "Change Password (URL)"
 msgstr "Vaihda salasana (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6464
+#: ../libpurple/protocols/oscar/oscar.c:6459
 msgid "Configure IM Forwarding (URL)"
 msgstr "Aseta pikaviestien edelleenlähetys (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6474
+#: ../libpurple/protocols/oscar/oscar.c:6469
 msgid "Set Privacy Options..."
 msgstr "Aseta yksityisyysvalinnat..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6481
+#: ../libpurple/protocols/oscar/oscar.c:6476
 msgid "Confirm Account"
 msgstr "Vahvista tili"
 
-#: ../libpurple/protocols/oscar/oscar.c:6485
+#: ../libpurple/protocols/oscar/oscar.c:6480
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Näytä tällä hetkellä rekisteröity sähköpostiosoite"
 
-#: ../libpurple/protocols/oscar/oscar.c:6489
+#: ../libpurple/protocols/oscar/oscar.c:6484
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Muuta tällä hetkellä rekisteröityä sähköpostiosoitetta..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6496
+#: ../libpurple/protocols/oscar/oscar.c:6491
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Näytä tuttavat jotka odottavat valtuutusta"
 
+#: ../libpurple/protocols/oscar/oscar.c:6497
+msgid "Search for Buddy by E-Mail Address..."
+msgstr "Etsi tuttavaa sähköpostiosoitteen perusteella..."
+
 #: ../libpurple/protocols/oscar/oscar.c:6502
-msgid "Search for Buddy by E-Mail Address..."
-msgstr "Etsi tuttavaa sähköpostiosoitteen perusteella..."
-
-#: ../libpurple/protocols/oscar/oscar.c:6507
 msgid "Search for Buddy by Information"
 msgstr "Etsi tuttavaa tietojen perusteella"
 
-#: ../libpurple/protocols/oscar/oscar.c:6575
+#: ../libpurple/protocols/oscar/oscar.c:6570
 msgid "Use recent buddies group"
 msgstr "Käytä viimeaikaisten tuttavien ryhmää"
 
-#: ../libpurple/protocols/oscar/oscar.c:6578
+#: ../libpurple/protocols/oscar/oscar.c:6573
 msgid "Show how long you have been idle"
 msgstr "Näyttää kuinka kauan olet ollut jouten."
 
-#: ../libpurple/protocols/oscar/oscar.c:6733
+#: ../libpurple/protocols/oscar/oscar.c:6728
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9585,7 +9780,7 @@
 #. TODO: Does the user really need to be notified about this?
 #: ../libpurple/protocols/qq/buddy_opt.c:338
 msgid "You have successfully removed yourself from your friend's buddy list"
-msgstr "Sinut on onnistuneesti poistettu tuttavasi tuttavalistalta"
+msgstr "Sinut on onnistuneesti poistettu kaverisi tuttavista"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
@@ -9615,7 +9810,7 @@
 #: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
 msgid "You have added %d to buddy list"
-msgstr "Käyttäjä %d lisätty tuttavalistallesi"
+msgstr "Käyttäjä %d lisätty tuttaviisi"
 
 #: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
@@ -9711,7 +9906,7 @@
 
 #: ../libpurple/protocols/qq/group_im.c:292
 msgid "This group has been added to your buddy list"
-msgstr "Tämä ryhmä on lisätty tuttavalistallesi"
+msgstr "Tämä ryhmä on lisätty tuttaviisi"
 
 #: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not a member"
@@ -9815,7 +10010,7 @@
 msgid "Failed to send IM."
 msgstr "Viestin lähettäminen epäonnistui."
 
-#: ../libpurple/protocols/qq/keep_alive.c:87
+#: ../libpurple/protocols/qq/keep_alive.c:88
 msgid "Keep alive error"
 msgstr "Jatkuvan yhteydenpidon virhe"
 
@@ -9823,100 +10018,100 @@
 msgid "Error requesting login token"
 msgstr "Virhe pyydettäessä kirjautumispolettia"
 
-#: ../libpurple/protocols/qq/login_logout.c:488
+#: ../libpurple/protocols/qq/login_logout.c:489
 msgid "Unable to login, check debug log"
 msgstr "Ei kyetty kirjautumaan, tarkista virheenjäljitysloki"
 
 #. 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/qq/qq.c:140 ../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/yahoo/ycht.c:550
 msgid "Unable to connect."
 msgstr "Yhteyden muodostaminen epäonnistui."
 
-#: ../libpurple/protocols/qq/qq.c:186
+#: ../libpurple/protocols/qq/qq.c:187
 #, c-format
 msgid "Unknown-%d"
 msgstr "Tuntematon-%d"
 
-#: ../libpurple/protocols/qq/qq.c:211
+#: ../libpurple/protocols/qq/qq.c:212
 msgid "TCP Address"
 msgstr "TCP-osoite"
 
-#: ../libpurple/protocols/qq/qq.c:213
+#: ../libpurple/protocols/qq/qq.c:214
 msgid "UDP Address"
 msgstr "UDP-osoite"
 
-#: ../libpurple/protocols/qq/qq.c:242
+#: ../libpurple/protocols/qq/qq.c:243
 msgid "Level"
 msgstr "Taso"
 
-#: ../libpurple/protocols/qq/qq.c:373
+#: ../libpurple/protocols/qq/qq.c:374
 msgid "Invalid name"
 msgstr "Epäkelpo nimi"
 
-#: ../libpurple/protocols/qq/qq.c:439
+#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Parhaillaan kirjautuneena</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:440
+#: ../libpurple/protocols/qq/qq.c:441
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Viimeisin päivitys:</b> %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
+#: ../libpurple/protocols/qq/qq.c:445
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Yhteystila</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
+#: ../libpurple/protocols/qq/qq.c:446
 #, c-format
 msgid "<b>Server IP</b>: %s: %d<br>\n"
 msgstr "<b>Palvelimen IP:</b>: %s: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:446
+#: ../libpurple/protocols/qq/qq.c:447
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Oma julkinen IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
+#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Kirjautumisaika</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
+#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Viimeisimmän kirjautumisen IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
+#: ../libpurple/protocols/qq/qq.c:454
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Viimeisin kirjautumisaika:</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:457
+#: ../libpurple/protocols/qq/qq.c:458
 msgid "Login Information"
 msgstr "Kirjautumistietoja"
 
-#: ../libpurple/protocols/qq/qq.c:533
+#: ../libpurple/protocols/qq/qq.c:534
 msgid "Set My Information"
 msgstr "Aseta omat tiedot"
 
-#: ../libpurple/protocols/qq/qq.c:536 ../libpurple/protocols/toc/toc.c:1680
+#: ../libpurple/protocols/qq/qq.c:537 ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Vaihda salasana"
 
-#: ../libpurple/protocols/qq/qq.c:539
+#: ../libpurple/protocols/qq/qq.c:540
 msgid "Show Login Information"
 msgstr "Näytä kirjautumistiedot"
 
-#: ../libpurple/protocols/qq/qq.c:560
+#: ../libpurple/protocols/qq/qq.c:561
 msgid "Leave this QQ Qun"
 msgstr "Poistu tästä QQ-Qunista"
 
-#: ../libpurple/protocols/qq/qq.c:584
+#: ../libpurple/protocols/qq/qq.c:585
 msgid "Block this buddy"
 msgstr "Estä tämä tuttava"
 
@@ -9930,19 +10125,19 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725 ../libpurple/protocols/qq/qq.c:727
+#: ../libpurple/protocols/qq/qq.c:726 ../libpurple/protocols/qq/qq.c:728
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/qq/qq.c:752
+#: ../libpurple/protocols/qq/qq.c:753
 msgid "Connect using TCP"
 msgstr "Yhdistetään käyttäen TCP:tä"
 
-#: ../libpurple/protocols/qq/recv_core.c:309
+#: ../libpurple/protocols/qq/recv_core.c:310
 msgid "Socket error"
 msgstr "Pistokevirhe"
 
-#: ../libpurple/protocols/qq/recv_core.c:319
+#: ../libpurple/protocols/qq/recv_core.c:321
 msgid "Unable to read from socket"
 msgstr "Ei kyetty lukemaan pistoketta"
 
@@ -9961,12 +10156,11 @@
 msgid "%d canceled the transfer of %s"
 msgstr "%d peruutti tiedoston %s siirron"
 
-#: ../libpurple/protocols/qq/sendqueue.c:123
+#: ../libpurple/protocols/qq/sendqueue.c:124
 msgid "Connection lost"
 msgstr "Yhteys katkesi"
 
-#. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:131
+#: ../libpurple/protocols/qq/sendqueue.c:133
 msgid "Login failed, no reply"
 msgstr "Kirjautuminen epäonnistui, ei vastausta"
 
@@ -9988,7 +10182,7 @@
 #: ../libpurple/protocols/qq/sys_msg.c:176
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
-msgstr "Käyttäjä %s on lisännyt sinut [%s] tuttavalistalleen"
+msgstr "Käyttäjä %s on lisännyt sinut [%s] tuttaviisi"
 
 #: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
@@ -10014,140 +10208,140 @@
 #: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
-msgstr "%s ei ole tuttavalistallasi"
-
-#: ../libpurple/protocols/sametime/sametime.c:417
+msgstr "%s ei ole tuttavissasi"
+
+#: ../libpurple/protocols/sametime/sametime.c:419
 msgid "Connection closed (writing)"
 msgstr "Yhteys suljettu (kirjoitus)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1290
+#: ../libpurple/protocols/sametime/sametime.c:1292
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Ryhmän nimi:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1291
+#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notesin ryhmä-ID:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
+#: ../libpurple/protocols/sametime/sametime.c:1295
 #, c-format
 msgid "Info for Group %s"
 msgstr "Tietoja ryhmästä %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
+#: ../libpurple/protocols/sametime/sametime.c:1297
 msgid "Notes Address Book Information"
 msgstr "Notesin osoitekirjatiedot"
 
-#: ../libpurple/protocols/sametime/sametime.c:1327
+#: ../libpurple/protocols/sametime/sametime.c:1329
 msgid "Invite Group to Conference..."
 msgstr "Kutsu ryhmä neuvotteluun..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1337
+#: ../libpurple/protocols/sametime/sametime.c:1339
 msgid "Get Notes Address Book Info"
 msgstr "Hae Notesin osoitekirjatiedot"
 
-#: ../libpurple/protocols/sametime/sametime.c:1504
+#: ../libpurple/protocols/sametime/sametime.c:1506
 msgid "Sending Handshake"
 msgstr "Lähetetään kättelyä"
 
-#: ../libpurple/protocols/sametime/sametime.c:1509
+#: ../libpurple/protocols/sametime/sametime.c:1511
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Odotetaan kättelyn vahvistusta"
 
-#: ../libpurple/protocols/sametime/sametime.c:1514
+#: ../libpurple/protocols/sametime/sametime.c:1516
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Kättely vahvistettu, kirjaudutaan"
 
-#: ../libpurple/protocols/sametime/sametime.c:1519
+#: ../libpurple/protocols/sametime/sametime.c:1521
 msgid "Waiting for Login Acknowledgement"
 msgstr "Odotetaan kirjautumisen vahvistusta"
 
-#: ../libpurple/protocols/sametime/sametime.c:1524
+#: ../libpurple/protocols/sametime/sametime.c:1526
 msgid "Login Redirected"
 msgstr "Sisäänkirjautuminen uudelleenohjattu"
 
-#: ../libpurple/protocols/sametime/sametime.c:1530
+#: ../libpurple/protocols/sametime/sametime.c:1532
 msgid "Forcing Login"
 msgstr "Pakotetaan sisäänkirjautuminen"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
+#: ../libpurple/protocols/sametime/sametime.c:1536
 msgid "Login Acknowledged"
 msgstr "Kirjautuminen vahvistettu"
 
-#: ../libpurple/protocols/sametime/sametime.c:1539
+#: ../libpurple/protocols/sametime/sametime.c:1541
 msgid "Starting Services"
 msgstr "Käynnistetään palveluja"
 
-#: ../libpurple/protocols/sametime/sametime.c:1645
+#: ../libpurple/protocols/sametime/sametime.c:1678
 #, c-format
 msgid ""
 "A Sametime administrator has issued the following announcement on server %s"
 msgstr "Sametime-ylläpitäjä on julkaissut seuraavan tiedotteen palvelimella %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1650
+#: ../libpurple/protocols/sametime/sametime.c:1683
 msgid "Sametime Administrator Announcement"
 msgstr "Sametime-ylläpitäjän tiedote"
 
-#: ../libpurple/protocols/sametime/sametime.c:1702
+#: ../libpurple/protocols/sametime/sametime.c:1734
 msgid "Connection reset"
 msgstr "Yhteys suljettu"
 
-#: ../libpurple/protocols/sametime/sametime.c:1709
+#: ../libpurple/protocols/sametime/sametime.c:1746
 #, c-format
 msgid "Error reading from socket: %s"
 msgstr "Virhe luettaessa socketista: %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:1771
+#: ../libpurple/protocols/sametime/sametime.c:3772
 msgid "Unable to connect to host"
 msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä"
 
-#: ../libpurple/protocols/sametime/sametime.c:1770
+#: ../libpurple/protocols/sametime/sametime.c:1812
 #, c-format
 msgid "Announcement from %s"
 msgstr "Ilmoitus käyttäjältä %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1944
+#: ../libpurple/protocols/sametime/sametime.c:1986
 msgid "Conference Closed"
 msgstr "Neuvottelu suljettu"
 
-#: ../libpurple/protocols/sametime/sametime.c:2403
+#: ../libpurple/protocols/sametime/sametime.c:2445
 msgid "Unable to send message: "
-msgstr "Viestiä ei voitu lähettää: "
-
-#: ../libpurple/protocols/sametime/sametime.c:2959
+msgstr "Viestiä ei voi lähettää: "
+
+#: ../libpurple/protocols/sametime/sametime.c:3001
 msgid "Place Closed"
 msgstr "Paikka suljettu"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
+#: ../libpurple/protocols/sametime/sametime.c:3271
 msgid "Microphone"
 msgstr "Mikrofoni"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
+#: ../libpurple/protocols/sametime/sametime.c:3272
 msgid "Speakers"
 msgstr "Kaiuttimet"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
+#: ../libpurple/protocols/sametime/sametime.c:3273
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
+#: ../libpurple/protocols/sametime/sametime.c:3311
+#: ../libpurple/protocols/sametime/sametime.c:4191
 msgid "Supports"
 msgstr "Tukee"
 
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
+#: ../libpurple/protocols/sametime/sametime.c:3316
+#: ../libpurple/protocols/sametime/sametime.c:4165
 msgid "External User"
 msgstr "Ulkoinen käyttäjä"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
+#: ../libpurple/protocols/sametime/sametime.c:3422
 msgid "Create conference with user"
 msgstr "Aloita neuvottelu käyttäjän kanssa"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
+#: ../libpurple/protocols/sametime/sametime.c:3423
 #, c-format
 msgid ""
 "Please enter a topic for the new conference, and an invitation message to be "
@@ -10156,27 +10350,27 @@
 "Kirjoita uuden neuvottelun puheenaihe sekä kutsuviesti joka lähetetään "
 "käyttäjälle %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:3385
+#: ../libpurple/protocols/sametime/sametime.c:3427
 msgid "New Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
+#: ../libpurple/protocols/sametime/sametime.c:3429
 msgid "Create"
 msgstr "Aloita"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
+#: ../libpurple/protocols/sametime/sametime.c:3494
 msgid "Available Conferences"
 msgstr "Käynnissä olevat neuvottelut"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
+#: ../libpurple/protocols/sametime/sametime.c:3500
 msgid "Create New Conference..."
 msgstr "Aloita uusi neuvottelu..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3465
+#: ../libpurple/protocols/sametime/sametime.c:3507
 msgid "Invite user to a conference"
 msgstr "Kutsu käyttäjä neuvotteluun"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
+#: ../libpurple/protocols/sametime/sametime.c:3508
 #, c-format
 msgid ""
 "Select a conference from the list below to send an invite to user %s. Select "
@@ -10187,27 +10381,27 @@
 "Valitse \"Aloita uusi neuvottelu\" jos haluat aloittaa uuden neuvottelun ja "
 "kutsua tämän käyttäjän sinne."
 
-#: ../libpurple/protocols/sametime/sametime.c:3471
+#: ../libpurple/protocols/sametime/sametime.c:3513
 msgid "Invite to Conference"
 msgstr "Kutsu neuvotteluun"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
+#: ../libpurple/protocols/sametime/sametime.c:3604
 msgid "Invite to Conference..."
 msgstr "Kutsu neuvotteluun..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3567
+#: ../libpurple/protocols/sametime/sametime.c:3609
 msgid "Send TEST Announcement"
 msgstr "Lähetä TEST-ilmoitus"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586 ../pidgin/gtkconv.c:4434
+#: ../libpurple/protocols/sametime/sametime.c:3628 ../pidgin/gtkconv.c:4437
 msgid "Topic:"
 msgstr "Aihe:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
+#: ../libpurple/protocols/sametime/sametime.c:3656
 msgid "No Sametime Community Server specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
-#: ../libpurple/protocols/sametime/sametime.c:3636
+#: ../libpurple/protocols/sametime/sametime.c:3681
 #, c-format
 msgid ""
 "No host or IP address has been configured for the Meanwhile account %s. "
@@ -10216,68 +10410,68 @@
 "Isäntää tai IP-osoitetta ei ole astetettu Meanwhile-käyttäjätilille %s. "
 "Lisää sellainen alle ennen kirjautumista sisään."
 
-#: ../libpurple/protocols/sametime/sametime.c:3641
+#: ../libpurple/protocols/sametime/sametime.c:3686
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhilen yhteysasetukset"
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
+#: ../libpurple/protocols/sametime/sametime.c:3687
 msgid "No Sametime Community Server Specified"
 msgstr "Sametime-yhteisöpalvelinta ei ole määritelty"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644 ../pidgin/gtkblist.c:4372
+#: ../libpurple/protocols/sametime/sametime.c:3689
 msgid "Connect"
 msgstr "Yhdistä"
 
-#: ../libpurple/protocols/sametime/sametime.c:4135
+#: ../libpurple/protocols/sametime/sametime.c:4181
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Tuntematon (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4137
+#: ../libpurple/protocols/sametime/sametime.c:4183
 msgid "Last Known Client"
 msgstr "Viimeksi nähty asiakasohjelma"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
+#: ../libpurple/protocols/sametime/sametime.c:4347
+#: ../libpurple/protocols/sametime/sametime.c:5552
 msgid "User Name"
 msgstr "Käyttäjänimi"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
+#: ../libpurple/protocols/sametime/sametime.c:4350
+#: ../libpurple/protocols/sametime/sametime.c:5555
 msgid "Sametime ID"
 msgstr "Sametime-tunnus"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
+#: ../libpurple/protocols/sametime/sametime.c:4374
 msgid "An ambiguous user ID was entered"
 msgstr "Epäselvä käyttäjätunnus syötetty"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
+#: ../libpurple/protocols/sametime/sametime.c:4375
 #, 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 ""
 "Tunniste '%s' voi viitata keneen tahansa seuraavista käyttäjistä. Valitse "
-"oikea käyttäjä alla olevasta luettelosta lisätäksesi hänet tuttavalistallesi."
-
-#: ../libpurple/protocols/sametime/sametime.c:4334
+"oikea käyttäjä alla olevasta luettelosta lisätäksesi hänet tuttaviisi."
+
+#: ../libpurple/protocols/sametime/sametime.c:4380
 msgid "Select User"
 msgstr "Valitse käyttäjä"
 
-#: ../libpurple/protocols/sametime/sametime.c:4418
+#: ../libpurple/protocols/sametime/sametime.c:4464
 msgid "Unable to add user: user not found"
-msgstr "Ei voitu lisätä käyttäjää: käyttäjää ei löydy"
-
-#: ../libpurple/protocols/sametime/sametime.c:4420
+msgstr "Ei voi lisätä käyttäjää: käyttäjää ei löydy"
+
+#: ../libpurple/protocols/sametime/sametime.c:4466
 #, 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 ""
-"Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisöstäsi. Tämä hakusana "
-"onpoistettu tuttavalistaltasi."
-
-#: ../libpurple/protocols/sametime/sametime.c:5011
+"Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisöstäsi. Tämä hakusana on "
+"poistettu tuttavistasi."
+
+#: ../libpurple/protocols/sametime/sametime.c:5057
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10286,64 +10480,64 @@
 "Virhe luettaessa tiedostoa %s:  \n"
 "%s.\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
+#: ../libpurple/protocols/sametime/sametime.c:5192
 msgid "Remotely Stored Buddy List"
-msgstr "Etätallennettu tuttavalista"
+msgstr "Etätallennetut tuttavat"
 
 # NOTE source: gftt glossary
-#: ../libpurple/protocols/sametime/sametime.c:5151
+#: ../libpurple/protocols/sametime/sametime.c:5197
 msgid "Buddy List Storage Mode"
-msgstr "Tuttavalistan tallennustapa"
-
-#: ../libpurple/protocols/sametime/sametime.c:5154
+msgstr "Tuttavien tallennustapa"
+
+#: ../libpurple/protocols/sametime/sametime.c:5200
 msgid "Local Buddy List Only"
-msgstr "Vain paikallinen tuttavalista"
-
-#: ../libpurple/protocols/sametime/sametime.c:5156
+msgstr "Vain paikalliset tuttavat"
+
+#: ../libpurple/protocols/sametime/sametime.c:5202
 msgid "Merge List from Server"
-msgstr "Yhdistä tuttavalista palvelimelta"
-
-#: ../libpurple/protocols/sametime/sametime.c:5158
+msgstr "Yhdistä tuttavat palvelimelta"
+
+#: ../libpurple/protocols/sametime/sametime.c:5204
 msgid "Merge and Save List to Server"
-msgstr "Yhdistä ja tallenna lista palvelimelle"
-
-#: ../libpurple/protocols/sametime/sametime.c:5160
+msgstr "Yhdistä ja tallenna tuttavat palvelimelle"
+
+#: ../libpurple/protocols/sametime/sametime.c:5206
 msgid "Synchronize List with Server"
-msgstr "Täsmää lista palvelimen kanssa"
-
-#: ../libpurple/protocols/sametime/sametime.c:5215
+msgstr "Täsmää tuttavat palvelimen kanssa"
+
+#: ../libpurple/protocols/sametime/sametime.c:5261
 #, c-format
 msgid "Import Sametime List for Account %s"
-msgstr "Tuo Sametime-lista käyttäjätililtä %s"
-
-#: ../libpurple/protocols/sametime/sametime.c:5255
+msgstr "Tuo Sametime-tuttavat käyttäjätililtä %s"
+
+#: ../libpurple/protocols/sametime/sametime.c:5301
 #, c-format
 msgid "Export Sametime List for Account %s"
-msgstr "Vie Sametime-lista käyttäjätilille %s"
-
-#: ../libpurple/protocols/sametime/sametime.c:5309
+msgstr "Vie Sametime-tuttavat käyttäjätilille %s"
+
+#: ../libpurple/protocols/sametime/sametime.c:5355
 msgid "Unable to add group: group exists"
-msgstr "Ei voitu lisätä ryhmää: ryhmä on jo olemassa"
-
-#: ../libpurple/protocols/sametime/sametime.c:5310
+msgstr "Ei voi lisätä ryhmää: ryhmä on jo olemassa"
+
+#: ../libpurple/protocols/sametime/sametime.c:5356
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
-msgstr "Ryhmä '%s' on jo tuttavalistallasi."
-
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
+msgstr "Ryhmä '%s' on jo tuttavissasi."
+
+#: ../libpurple/protocols/sametime/sametime.c:5359
+#: ../libpurple/protocols/sametime/sametime.c:5489
 msgid "Unable to add group"
-msgstr "Ryhmää ei voitu lisätä"
-
-#: ../libpurple/protocols/sametime/sametime.c:5372
+msgstr "Ryhmää ei voi lisätä"
+
+#: ../libpurple/protocols/sametime/sametime.c:5418
 msgid "Possible Matches"
 msgstr "Mahdollisia osumia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
+#: ../libpurple/protocols/sametime/sametime.c:5434
 msgid "Notes Address Book group results"
 msgstr "Notesin osoitekirjan ryhmätulokset"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
+#: ../libpurple/protocols/sametime/sametime.c:5435
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following Notes Address "
@@ -10352,17 +10546,17 @@
 msgstr ""
 "Tunniste '%s' voi viitata mihin tahansa seuraavista Notesin osoitekirjan "
 "ryhmistä. Valitse oikea ryhmä alla olevasta luettelosta lisätäksesi sen "
-"tuttavalistallesi."
-
-#: ../libpurple/protocols/sametime/sametime.c:5394
+"tuttaviisi."
+
+#: ../libpurple/protocols/sametime/sametime.c:5440
 msgid "Select Notes Address Book"
 msgstr "Valitse Notesin osoitekirja"
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
+#: ../libpurple/protocols/sametime/sametime.c:5483
 msgid "Unable to add group: group not found"
-msgstr "Ei voitu lisätä ryhmää: ryhmää ei löytynyt"
-
-#: ../libpurple/protocols/sametime/sametime.c:5439
+msgstr "Ei voi lisätä ryhmää: ryhmää ei löytynyt"
+
+#: ../libpurple/protocols/sametime/sametime.c:5485
 #, c-format
 msgid ""
 "The identifier '%s' did not match any Notes Address Book groups in your "
@@ -10371,24 +10565,24 @@
 "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisösi Notesin osoitekirjan "
 "ryhmistä."
 
-#: ../libpurple/protocols/sametime/sametime.c:5480
+#: ../libpurple/protocols/sametime/sametime.c:5526
 msgid "Notes Address Book Group"
 msgstr "Notesin osoitekirjan ryhmä"
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
+#: ../libpurple/protocols/sametime/sametime.c:5527
 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 ""
 "Kirjoita Notesin osoitekirjan ryhmän nimi allaolevaan kenttään lisätäksesi "
-"ryhmän ja sen jäsenet tuttavalistallesi."
-
-#: ../libpurple/protocols/sametime/sametime.c:5530
+"ryhmän ja sen jäsenet tuttaviisi."
+
+#: ../libpurple/protocols/sametime/sametime.c:5576
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Hakutulokset haulle '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
+#: ../libpurple/protocols/sametime/sametime.c:5577
 #, c-format
 msgid ""
 "The identifier '%s' may possibly refer to any of the following users. You "
@@ -10396,31 +10590,31 @@
 "buttons below."
 msgstr ""
 "Tunniste '%s' voi viitata keneen tahansa seuraavista käyttäjistä. Voit "
-"lisätä nämä käyttäjät tuttavalistallesi tai lähettää heille viestejä alla "
-"olevilla painikkeilla."
-
-#: ../libpurple/protocols/sametime/sametime.c:5538 ../pidgin/gtknotify.c:762
+"lisätä nämä käyttäjät tuttaviisi tai lähettää heille viestejä alla olevilla "
+"painikkeilla."
+
+#: ../libpurple/protocols/sametime/sametime.c:5584 ../pidgin/gtknotify.c:763
 msgid "Search Results"
 msgstr "Hakutulokset"
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
+#: ../libpurple/protocols/sametime/sametime.c:5609
 msgid "No matches"
 msgstr "Ei tuloksia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
+#: ../libpurple/protocols/sametime/sametime.c:5610
 #, c-format
 msgid "The identifier '%s' did not match any users in your Sametime community."
 msgstr "Tunnisteella '%s' ei löytynyt osumia Sametime-yhteisöstäsi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5568
+#: ../libpurple/protocols/sametime/sametime.c:5614
 msgid "No Matches"
 msgstr "Ei tuloksia"
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
+#: ../libpurple/protocols/sametime/sametime.c:5651
 msgid "Search for a user"
 msgstr "Etsi käyttäjiä"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
+#: ../libpurple/protocols/sametime/sametime.c:5652
 msgid ""
 "Enter a name or partial ID in the field below to search for matching users "
 "in your Sametime community."
@@ -10428,32 +10622,32 @@
 "Kirjoita nimi tai osittainen käyttäjätunnus alla olevaan kenttään etsiäksesi "
 "käyttäjiä Sametime-yhteisöstäsi."
 
-#: ../libpurple/protocols/sametime/sametime.c:5609
+#: ../libpurple/protocols/sametime/sametime.c:5655
 msgid "User Search"
 msgstr "Käyttäjähaku"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
+#: ../libpurple/protocols/sametime/sametime.c:5668
 msgid "Import Sametime List..."
-msgstr "Tuo Sametime-lista..."
-
-#: ../libpurple/protocols/sametime/sametime.c:5626
+msgstr "Tuo Sametime-tuttavat..."
+
+#: ../libpurple/protocols/sametime/sametime.c:5672
 msgid "Export Sametime List..."
-msgstr "Vie Sametime-lista..."
-
-#: ../libpurple/protocols/sametime/sametime.c:5630
+msgstr "Vie Sametime-tuttavat..."
+
+#: ../libpurple/protocols/sametime/sametime.c:5676
 msgid "Add Notes Address Book Group..."
 msgstr "Lisää Notesin osoitekirjan ryhmä..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
+#: ../libpurple/protocols/sametime/sametime.c:5680
 msgid "User Search..."
 msgstr "Käyttäjähaku..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
+#: ../libpurple/protocols/sametime/sametime.c:5786
 msgid "Force login (ignore server redirects)"
 msgstr "Pakota sisäänkirjautuminen (älä välitä palvelinuudelleenohjauksista)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
+#: ../libpurple/protocols/sametime/sametime.c:5796
 msgid "Hide client identity"
 msgstr "Piilota asiakasohjelman tunniste"
 
@@ -10600,7 +10794,7 @@
 #: ../libpurple/protocols/silc10/ops.c:1495
 #: ../libpurple/protocols/silc10/ops.c:1506
 msgid "Cannot fetch the public key"
-msgstr "Ei voitu hakea julkista avainta"
+msgstr "Ei voi hakea julkista avainta"
 
 #: ../libpurple/protocols/silc/buddy.c:622
 #: ../libpurple/protocols/silc/buddy.c:1658
@@ -10616,7 +10810,7 @@
 #: ../libpurple/protocols/silc10/buddy.c:1036
 #: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
-msgstr "Ei voitu ladata julkista avainta"
+msgstr "Ei voi ladata julkista avainta"
 
 #: ../libpurple/protocols/silc/buddy.c:701
 #: ../libpurple/protocols/silc/ops.c:1053
@@ -10640,7 +10834,7 @@
 #: ../libpurple/protocols/silc10/ops.c:1160
 #: ../libpurple/protocols/silc10/ops.c:1314
 msgid "Cannot get user information"
-msgstr "Ei voitu hakea käyttäjätietoja"
+msgstr "Ei voi hakea käyttäjätietoja"
 
 #: ../libpurple/protocols/silc/buddy.c:723
 #: ../libpurple/protocols/silc10/buddy.c:735
@@ -10695,7 +10889,7 @@
 "user from the list to add to the buddy list."
 msgstr ""
 "Useammalla kuin yhdellä käyttäjällä on sama julkinen avain. Valitse oikea "
-"käyttäjä listalta."
+"käyttäjä luettelosta."
 
 #: ../libpurple/protocols/silc/buddy.c:1190
 #: ../libpurple/protocols/silc10/buddy.c:1188
@@ -10704,7 +10898,7 @@
 "from the list to add to the buddy list."
 msgstr ""
 "Useammalla kuin yhdellä käyttäjällä on sama nimi. Valitse oikea käyttäjä "
-"listalta."
+"luettelosta."
 
 #: ../libpurple/protocols/silc/buddy.c:1477
 #: ../libpurple/protocols/silc10/buddy.c:1477
@@ -10738,8 +10932,8 @@
 msgstr "Robotti"
 
 #: ../libpurple/protocols/silc/buddy.c:1496
-#: ../libpurple/protocols/silc/silc.c:874
-#: ../libpurple/protocols/silc/util.c:520
+#: ../libpurple/protocols/silc/silc.c:886
+#: ../libpurple/protocols/silc/util.c:522
 #: ../libpurple/protocols/silc10/buddy.c:1496
 #: ../libpurple/protocols/silc10/silc.c:654
 #: ../libpurple/protocols/silc10/util.c:512
@@ -10747,8 +10941,8 @@
 msgstr "Onnellinen"
 
 #: ../libpurple/protocols/silc/buddy.c:1498
-#: ../libpurple/protocols/silc/silc.c:876
-#: ../libpurple/protocols/silc/util.c:522
+#: ../libpurple/protocols/silc/silc.c:888
+#: ../libpurple/protocols/silc/util.c:524
 #: ../libpurple/protocols/silc10/buddy.c:1498
 #: ../libpurple/protocols/silc10/silc.c:656
 #: ../libpurple/protocols/silc10/util.c:514
@@ -10756,8 +10950,8 @@
 msgstr "Surullinen"
 
 #: ../libpurple/protocols/silc/buddy.c:1500
-#: ../libpurple/protocols/silc/silc.c:878
-#: ../libpurple/protocols/silc/util.c:524
+#: ../libpurple/protocols/silc/silc.c:890
+#: ../libpurple/protocols/silc/util.c:526
 #: ../libpurple/protocols/silc10/buddy.c:1500
 #: ../libpurple/protocols/silc10/silc.c:658
 #: ../libpurple/protocols/silc10/util.c:516
@@ -10765,8 +10959,8 @@
 msgstr "Vihainen"
 
 #: ../libpurple/protocols/silc/buddy.c:1502
-#: ../libpurple/protocols/silc/silc.c:880
-#: ../libpurple/protocols/silc/util.c:526
+#: ../libpurple/protocols/silc/silc.c:892
+#: ../libpurple/protocols/silc/util.c:528
 #: ../libpurple/protocols/silc10/buddy.c:1502
 #: ../libpurple/protocols/silc10/silc.c:660
 #: ../libpurple/protocols/silc10/util.c:518
@@ -10774,8 +10968,8 @@
 msgstr "Mustasukkainen"
 
 #: ../libpurple/protocols/silc/buddy.c:1504
-#: ../libpurple/protocols/silc/silc.c:882
-#: ../libpurple/protocols/silc/util.c:528
+#: ../libpurple/protocols/silc/silc.c:894
+#: ../libpurple/protocols/silc/util.c:530
 #: ../libpurple/protocols/silc10/buddy.c:1504
 #: ../libpurple/protocols/silc10/silc.c:662
 #: ../libpurple/protocols/silc10/util.c:520
@@ -10783,8 +10977,8 @@
 msgstr "Häpeää"
 
 #: ../libpurple/protocols/silc/buddy.c:1506
-#: ../libpurple/protocols/silc/silc.c:884
-#: ../libpurple/protocols/silc/util.c:530
+#: ../libpurple/protocols/silc/silc.c:896
+#: ../libpurple/protocols/silc/util.c:532
 #: ../libpurple/protocols/silc10/buddy.c:1506
 #: ../libpurple/protocols/silc10/silc.c:664
 #: ../libpurple/protocols/silc10/util.c:522
@@ -10792,15 +10986,15 @@
 msgstr "Haavoittumaton"
 
 #: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/util.c:532
+#: ../libpurple/protocols/silc/util.c:534
 #: ../libpurple/protocols/silc10/buddy.c:1508
 #: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Rakastunut"
 
 #: ../libpurple/protocols/silc/buddy.c:1510
-#: ../libpurple/protocols/silc/silc.c:888
-#: ../libpurple/protocols/silc/util.c:534
+#: ../libpurple/protocols/silc/silc.c:900
+#: ../libpurple/protocols/silc/util.c:536
 #: ../libpurple/protocols/silc10/buddy.c:1510
 #: ../libpurple/protocols/silc10/silc.c:668
 #: ../libpurple/protocols/silc10/util.c:526
@@ -10808,8 +11002,8 @@
 msgstr "Unelias"
 
 #: ../libpurple/protocols/silc/buddy.c:1512
-#: ../libpurple/protocols/silc/silc.c:890
-#: ../libpurple/protocols/silc/util.c:536
+#: ../libpurple/protocols/silc/silc.c:902
+#: ../libpurple/protocols/silc/util.c:538
 #: ../libpurple/protocols/silc10/buddy.c:1512
 #: ../libpurple/protocols/silc10/silc.c:670
 #: ../libpurple/protocols/silc10/util.c:528
@@ -10817,8 +11011,8 @@
 msgstr "Tylsistynyt"
 
 #: ../libpurple/protocols/silc/buddy.c:1514
-#: ../libpurple/protocols/silc/silc.c:892
-#: ../libpurple/protocols/silc/util.c:538
+#: ../libpurple/protocols/silc/silc.c:904
+#: ../libpurple/protocols/silc/util.c:540
 #: ../libpurple/protocols/silc10/buddy.c:1514
 #: ../libpurple/protocols/silc10/silc.c:672
 #: ../libpurple/protocols/silc10/util.c:530
@@ -10826,8 +11020,8 @@
 msgstr "Innostunut"
 
 #: ../libpurple/protocols/silc/buddy.c:1516
-#: ../libpurple/protocols/silc/silc.c:894
-#: ../libpurple/protocols/silc/util.c:540
+#: ../libpurple/protocols/silc/silc.c:906
+#: ../libpurple/protocols/silc/util.c:542
 #: ../libpurple/protocols/silc10/buddy.c:1516
 #: ../libpurple/protocols/silc10/silc.c:674
 #: ../libpurple/protocols/silc10/util.c:532
@@ -11009,7 +11203,7 @@
 #: ../libpurple/protocols/silc/chat.c:432
 #: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
-msgstr "Kanavan julkisten avainten lista"
+msgstr "Kanavan julkisten avainten luettelo"
 
 #: ../libpurple/protocols/silc/chat.c:437
 #: ../libpurple/protocols/silc10/chat.c:413
@@ -11025,7 +11219,7 @@
 "Tunnistautuminen voi perustua salasanaan tai digitaaliseen "
 "allekirjoitukseen. Jos salasana on asetettu, se vaaditaan kanavalle "
 "pääsemiseksi. Jos käytetään kanavan julkisia avaimia niin silloin pääsevät "
-"vain käyttäjät joiden julkinen avain on listalla."
+"vain käyttäjät joiden julkinen avain on luettelossa."
 
 #: ../libpurple/protocols/silc/chat.c:446
 #: ../libpurple/protocols/silc/chat.c:447
@@ -11054,7 +11248,7 @@
 
 #: ../libpurple/protocols/silc/chat.c:605
 #: ../libpurple/protocols/silc/ops.c:1817
-#: ../libpurple/protocols/silc/silc.c:1151
+#: ../libpurple/protocols/silc/silc.c:1163
 #: ../libpurple/protocols/silc10/chat.c:585
 #: ../libpurple/protocols/silc10/ops.c:1901
 #: ../libpurple/protocols/silc10/silc.c:931
@@ -11162,23 +11356,23 @@
 msgstr "Ei voida liittyä yksityiseen ryhmään"
 
 #: ../libpurple/protocols/silc/chat.c:1245
-#: ../libpurple/protocols/silc/silc.c:1348
+#: ../libpurple/protocols/silc/silc.c:1360
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Call Command"
 msgstr "Kutsu komentoa"
 
 #: ../libpurple/protocols/silc/chat.c:1245
-#: ../libpurple/protocols/silc/silc.c:1349
+#: ../libpurple/protocols/silc/silc.c:1361
 #: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
+#: ../libpurple/protocols/silc10/silc.c:1140
 msgid "Cannot call command"
 msgstr "Komentoa ei voida kutsua"
 
 #: ../libpurple/protocols/silc/chat.c:1246
-#: ../libpurple/protocols/silc/silc.c:1350
+#: ../libpurple/protocols/silc/silc.c:1362
 #: ../libpurple/protocols/silc10/chat.c:1300
-#: ../libpurple/protocols/silc10/silc.c:1138
+#: ../libpurple/protocols/silc10/silc.c:1141
 msgid "Unknown command"
 msgstr "Tuntematon komento"
 
@@ -11244,11 +11438,11 @@
 
 #: ../libpurple/protocols/silc/ft.c:283 ../libpurple/protocols/silc10/ft.c:216
 msgid "Could not perform key agreement for file transfer"
-msgstr "Ei voitu suorittaa avainsopimusta tiedostonsiirtoa varten"
+msgstr "Ei voi suorittaa avainsopimusta tiedostonsiirtoa varten"
 
 #: ../libpurple/protocols/silc/ft.c:289 ../libpurple/protocols/silc10/ft.c:222
 msgid "Could not start the file transfer"
-msgstr "Ei voitu aloittaa tiedostonsiirtoa"
+msgstr "Ei voi aloittaa tiedostonsiirtoa"
 
 #: ../libpurple/protocols/silc/ft.c:426 ../libpurple/protocols/silc10/ft.c:341
 msgid "Cannot send file"
@@ -11336,7 +11530,7 @@
 msgstr "Asema työssä"
 
 #: ../libpurple/protocols/silc/ops.c:1018
-#: ../libpurple/protocols/silc/silc.c:1144
+#: ../libpurple/protocols/silc/silc.c:1156
 #: ../libpurple/protocols/silc10/ops.c:1052
 #: ../libpurple/protocols/silc10/silc.c:924
 msgid "Organization"
@@ -11402,11 +11596,11 @@
 msgstr "_Lisää..."
 
 #: ../libpurple/protocols/silc/ops.c:1373
-#: ../libpurple/protocols/silc/silc.c:1208
+#: ../libpurple/protocols/silc/silc.c:1220
 #: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
+#: ../libpurple/protocols/silc10/silc.c:991
 msgid "Detach From Server"
-msgstr "Irroita palvelimelta"
+msgstr "Irrota palvelimelta"
 
 #: ../libpurple/protocols/silc/ops.c:1373
 #: ../libpurple/protocols/silc10/ops.c:1371
@@ -11426,12 +11620,12 @@
 #: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
-msgstr "Huonelista"
+msgstr "Huoneluettelo"
 
 #: ../libpurple/protocols/silc/ops.c:1471
 #: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
-msgstr "Huonelistaa ei saatu"
+msgstr "Huoneluetteloa ei saatu"
 
 #: ../libpurple/protocols/silc/ops.c:1472
 msgid "Network is empty"
@@ -11519,7 +11713,7 @@
 #: ../libpurple/protocols/silc/ops.c:1613
 #: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
-msgstr "Ei voitu poistaa käyttäjää"
+msgstr "Ei voi poistaa käyttäjää"
 
 #: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
@@ -11531,7 +11725,7 @@
 
 #: ../libpurple/protocols/silc/ops.c:1728
 #: ../libpurple/protocols/silc/ops.c:1779
-#: ../libpurple/protocols/silc/silc.c:377
+#: ../libpurple/protocols/silc/silc.c:385
 #: ../libpurple/protocols/silc10/ops.c:1811
 #: ../libpurple/protocols/silc10/ops.c:1858
 #: ../libpurple/protocols/silc10/silc.c:190
@@ -11594,22 +11788,22 @@
 msgid "Unsupported public key type"
 msgstr "Julkisen avaimen tyyppiä ei tuettu"
 
-#: ../libpurple/protocols/silc/silc.c:317
+#: ../libpurple/protocols/silc/silc.c:319
 #: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr "Palvelin katkaisi yhteyden"
 
-#: ../libpurple/protocols/silc/silc.c:324
+#: ../libpurple/protocols/silc/silc.c:327
 #: ../libpurple/protocols/silc10/ops.c:1700
 msgid "Error during connecting to SILC Server"
 msgstr "Virhe luotaessa yhteyttä SILC-palvelimelle"
 
-#: ../libpurple/protocols/silc/silc.c:329
+#: ../libpurple/protocols/silc/silc.c:333
 #: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "Avaintenvaihto epäonnistui"
 
-#: ../libpurple/protocols/silc/silc.c:338
+#: ../libpurple/protocols/silc/silc.c:343
 #: ../libpurple/protocols/silc10/ops.c:1714
 msgid ""
 "Resuming detached session failed. Press Reconnect to create new connection."
@@ -11617,64 +11811,63 @@
 "Irroitetun yhteyden palauttaminen epäonnistui. Paina Uudelleenyhdistä "
 "luodaksesi uuden yhteyden."
 
-#: ../libpurple/protocols/silc/silc.c:365
-#: ../libpurple/protocols/silc/silc.c:411
+#: ../libpurple/protocols/silc/silc.c:373
+#: ../libpurple/protocols/silc/silc.c:420
 #: ../libpurple/protocols/silc10/silc.c:161
 msgid "Connection failed"
 msgstr "Yhteys epäonnistui"
 
-#: ../libpurple/protocols/silc/silc.c:380
+#: ../libpurple/protocols/silc/silc.c:388
 #: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Suoritetaan avaintenvaihto"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:435
+#: ../libpurple/protocols/silc/silc.c:445
 #: ../libpurple/protocols/silc10/silc.c:325
 msgid "Connecting to SILC Server"
 msgstr "Yhdistetään SILC-palvelimelle"
 
-#: ../libpurple/protocols/silc/silc.c:444
-#, c-format
+#: ../libpurple/protocols/silc/silc.c:455
 msgid "Could not load SILC key pair"
-msgstr "Ei voitu ladata SILC-avainparia"
-
-#: ../libpurple/protocols/silc/silc.c:458
+msgstr "Ei voi ladata SILC-avainparia"
+
+#: ../libpurple/protocols/silc/silc.c:469
 #: ../libpurple/protocols/silc10/silc.c:355
 msgid "Unable to create connection"
 msgstr "Yhteyden luominen epäonnistui"
 
-#: ../libpurple/protocols/silc/silc.c:487
+#: ../libpurple/protocols/silc/silc.c:499
 #: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Muisti loppu"
 
-#: ../libpurple/protocols/silc/silc.c:538
+#: ../libpurple/protocols/silc/silc.c:550
 #: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Ei voida alustaa SILC-yhteyskäytäntöä"
 
-#: ../libpurple/protocols/silc/silc.c:547
+#: ../libpurple/protocols/silc/silc.c:559
 msgid "Error loading SILC key pair"
 msgstr "Virhe ladattaessa SILC-avainparia"
 
-#: ../libpurple/protocols/silc/silc.c:870
+#: ../libpurple/protocols/silc/silc.c:882
 #: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Tämänhetkinen mielialasi"
 
-#: ../libpurple/protocols/silc/silc.c:872
-#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1740
+#: ../libpurple/protocols/silc/silc.c:884
+#: ../libpurple/protocols/silc10/silc.c:652 ../pidgin/gtkprefs.c:1741
 #, c-format
 msgid "Normal"
 msgstr "Normaali"
 
-#: ../libpurple/protocols/silc/silc.c:886
+#: ../libpurple/protocols/silc/silc.c:898
 #: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Rakastunut"
 
-#: ../libpurple/protocols/silc/silc.c:897
+#: ../libpurple/protocols/silc/silc.c:909
 #: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
@@ -11683,62 +11876,62 @@
 "\n"
 "Suosimasi yhteystavat"
 
-#: ../libpurple/protocols/silc/silc.c:905
-#: ../libpurple/protocols/silc/util.c:565
+#: ../libpurple/protocols/silc/silc.c:917
+#: ../libpurple/protocols/silc/util.c:567
 #: ../libpurple/protocols/silc10/silc.c:685
 #: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:907
-#: ../libpurple/protocols/silc/util.c:567
+#: ../libpurple/protocols/silc/silc.c:919
+#: ../libpurple/protocols/silc/util.c:569
 #: ../libpurple/protocols/silc10/silc.c:687
 #: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:909
+#: ../libpurple/protocols/silc/silc.c:921
 #: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Videoneuvottelu"
 
-#: ../libpurple/protocols/silc/silc.c:914
+#: ../libpurple/protocols/silc/silc.c:926
 #: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Tämänhetkinen tilasi"
 
-#: ../libpurple/protocols/silc/silc.c:921
+#: ../libpurple/protocols/silc/silc.c:933
 #: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Online-palvelut"
 
-#: ../libpurple/protocols/silc/silc.c:924
+#: ../libpurple/protocols/silc/silc.c:936
 #: ../libpurple/protocols/silc10/silc.c:704
 msgid "Let others see what services you are using"
 msgstr "Anna muiden nähdä mitä palveluja käytät"
 
-#: ../libpurple/protocols/silc/silc.c:930
+#: ../libpurple/protocols/silc/silc.c:942
 #: ../libpurple/protocols/silc10/silc.c:710
 msgid "Let others see what computer you are using"
 msgstr "Anna muiden nähdä mitä tietokonetta käytät"
 
-#: ../libpurple/protocols/silc/silc.c:937
+#: ../libpurple/protocols/silc/silc.c:949
 #: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "VCard-tiedostosi"
 
-#: ../libpurple/protocols/silc/silc.c:943
+#: ../libpurple/protocols/silc/silc.c:955
 msgid "Timezone (UTC)"
 msgstr "Aikavyöhyke (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:947
-#: ../libpurple/protocols/silc/silc.c:948
+#: ../libpurple/protocols/silc/silc.c:959
+#: ../libpurple/protocols/silc/silc.c:960
 #: ../libpurple/protocols/silc10/silc.c:729
 #: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Käyttäjän paikallaolo-ominaisuudet"
 
-#: ../libpurple/protocols/silc/silc.c:949
+#: ../libpurple/protocols/silc/silc.c:961
 #: ../libpurple/protocols/silc10/silc.c:731
 msgid ""
 "You can let other users see your online status information and your personal "
@@ -11749,31 +11942,31 @@
 "henkilökohtaiset tietosi. Syötä tiedot jotka haluat toisten näkevän "
 "itsestäsi."
 
-#: ../libpurple/protocols/silc/silc.c:990
-#: ../libpurple/protocols/silc/silc.c:996
-#: ../libpurple/protocols/silc/silc.c:1617
+#: ../libpurple/protocols/silc/silc.c:1002
+#: ../libpurple/protocols/silc/silc.c:1008
+#: ../libpurple/protocols/silc/silc.c:1629
 #: ../libpurple/protocols/silc10/silc.c:772
 #: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
+#: ../libpurple/protocols/silc10/silc.c:1418
 msgid "Message of the Day"
 msgstr "Päivän viesti"
 
-#: ../libpurple/protocols/silc/silc.c:990
+#: ../libpurple/protocols/silc/silc.c:1002
 #: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Päivän viestiä ei ole"
 
-#: ../libpurple/protocols/silc/silc.c:991
-#: ../libpurple/protocols/silc/silc.c:1612
+#: ../libpurple/protocols/silc/silc.c:1003
+#: ../libpurple/protocols/silc/silc.c:1624
 #: ../libpurple/protocols/silc10/silc.c:773
-#: ../libpurple/protocols/silc10/silc.c:1410
+#: ../libpurple/protocols/silc10/silc.c:1413
 msgid "There is no Message of the Day associated with this connection"
 msgstr "Ei ole Päivän viestiä joka olisi assosioitu tälle yhteydelle."
 
-#: ../libpurple/protocols/silc/silc.c:1042
-#: ../libpurple/protocols/silc/silc.c:1088
-#: ../libpurple/protocols/silc/silc.c:1159
-#: ../libpurple/protocols/silc/silc.c:1160
+#: ../libpurple/protocols/silc/silc.c:1054
+#: ../libpurple/protocols/silc/silc.c:1100
+#: ../libpurple/protocols/silc/silc.c:1171
+#: ../libpurple/protocols/silc/silc.c:1172
 #: ../libpurple/protocols/silc10/silc.c:824
 #: ../libpurple/protocols/silc10/silc.c:868
 #: ../libpurple/protocols/silc10/silc.c:939
@@ -11781,180 +11974,180 @@
 msgid "Create New SILC Key Pair"
 msgstr "Luo uusi SILC-avainpari"
 
-#: ../libpurple/protocols/silc/silc.c:1042
+#: ../libpurple/protocols/silc/silc.c:1054
 #: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "Salasanat eivät täsmää"
 
-#: ../libpurple/protocols/silc/silc.c:1088
+#: ../libpurple/protocols/silc/silc.c:1100
 #: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Avainparin luonti epäonnistui"
 
-#: ../libpurple/protocols/silc/silc.c:1127
+#: ../libpurple/protocols/silc/silc.c:1139
 #: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Avaimen pituus"
 
-#: ../libpurple/protocols/silc/silc.c:1129
+#: ../libpurple/protocols/silc/silc.c:1141
 #: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Julkinen avaintiedosto"
 
-#: ../libpurple/protocols/silc/silc.c:1131
+#: ../libpurple/protocols/silc/silc.c:1143
 #: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Yksityinen avaintiedosto"
 
-#: ../libpurple/protocols/silc/silc.c:1154
+#: ../libpurple/protocols/silc/silc.c:1166
 #: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Salasana (uudelleen)"
 
-#: ../libpurple/protocols/silc/silc.c:1161
+#: ../libpurple/protocols/silc/silc.c:1173
 #: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Luo avainpari"
 
-#: ../libpurple/protocols/silc/silc.c:1204
-#: ../libpurple/protocols/silc10/silc.c:984
+#: ../libpurple/protocols/silc/silc.c:1216
+#: ../libpurple/protocols/silc10/silc.c:987
 msgid "Online Status"
 msgstr "Tila"
 
-#: ../libpurple/protocols/silc/silc.c:1212
-#: ../libpurple/protocols/silc10/silc.c:992
+#: ../libpurple/protocols/silc/silc.c:1224
+#: ../libpurple/protocols/silc10/silc.c:995
 msgid "View Message of the Day"
 msgstr "Näytä päivän viesti"
 
-#: ../libpurple/protocols/silc/silc.c:1216
-#: ../libpurple/protocols/silc10/silc.c:996
+#: ../libpurple/protocols/silc/silc.c:1228
+#: ../libpurple/protocols/silc10/silc.c:999
 msgid "Create SILC Key Pair..."
 msgstr "Luo SILC-avainpari..."
 
-#: ../libpurple/protocols/silc/silc.c:1308
-#: ../libpurple/protocols/silc10/silc.c:1095
+#: ../libpurple/protocols/silc/silc.c:1320
+#: ../libpurple/protocols/silc10/silc.c:1098
 #, c-format
 msgid "User <I>%s</I> is not present in the network"
 msgstr "Käyttäjä <I>%s</I> ei ole verkossa"
 
-#: ../libpurple/protocols/silc/silc.c:1488
-#: ../libpurple/protocols/silc10/silc.c:1286
+#: ../libpurple/protocols/silc/silc.c:1500
+#: ../libpurple/protocols/silc10/silc.c:1289
 msgid "Topic too long"
 msgstr "Aihe liian pitkä"
 
-#: ../libpurple/protocols/silc/silc.c:1569
-#: ../libpurple/protocols/silc10/silc.c:1367
+#: ../libpurple/protocols/silc/silc.c:1581
+#: ../libpurple/protocols/silc10/silc.c:1370
 msgid "You must specify a nick"
 msgstr "Sinun täytyy syöttää lempinimi"
 
-#: ../libpurple/protocols/silc/silc.c:1671
-#: ../libpurple/protocols/silc10/silc.c:1469
+#: ../libpurple/protocols/silc/silc.c:1683
+#: ../libpurple/protocols/silc10/silc.c:1472
 #, c-format
 msgid "channel %s not found"
 msgstr "Kanavaa %s ei löydy"
 
-#: ../libpurple/protocols/silc/silc.c:1676
-#: ../libpurple/protocols/silc10/silc.c:1474
+#: ../libpurple/protocols/silc/silc.c:1688
+#: ../libpurple/protocols/silc10/silc.c:1477
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanavan tilat kanavalle %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1678
-#: ../libpurple/protocols/silc10/silc.c:1476
+#: ../libpurple/protocols/silc/silc.c:1690
+#: ../libpurple/protocols/silc10/silc.c:1479
 #, c-format
 msgid "no channel modes are set on %s"
 msgstr "ei kanavan tiloja asetettu kanavalle %s"
 
-#: ../libpurple/protocols/silc/silc.c:1691
-#: ../libpurple/protocols/silc10/silc.c:1489
+#: ../libpurple/protocols/silc/silc.c:1703
+#: ../libpurple/protocols/silc10/silc.c:1492
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "cmodes asetus epäonnistui, %s"
 
-#: ../libpurple/protocols/silc/silc.c:1721
-#: ../libpurple/protocols/silc10/silc.c:1519
+#: ../libpurple/protocols/silc/silc.c:1733
+#: ../libpurple/protocols/silc10/silc.c:1522
 #, c-format
 msgid "Unknown command: %s, (may be a client bug)"
 msgstr "Tuntematon komento: %s, (mahdollisesti asiakasohjelman virhe)"
 
-#: ../libpurple/protocols/silc/silc.c:1784
-#: ../libpurple/protocols/silc10/silc.c:1582
+#: ../libpurple/protocols/silc/silc.c:1796
+#: ../libpurple/protocols/silc10/silc.c:1585
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanava]:  Poistu keskustelusta"
 
-#: ../libpurple/protocols/silc/silc.c:1788
-#: ../libpurple/protocols/silc10/silc.c:1586
+#: ../libpurple/protocols/silc/silc.c:1800
+#: ../libpurple/protocols/silc10/silc.c:1589
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanava]:  Poistu keskustelusta"
 
-#: ../libpurple/protocols/silc/silc.c:1792
-#: ../libpurple/protocols/silc10/silc.c:1590
+#: ../libpurple/protocols/silc/silc.c:1804
+#: ../libpurple/protocols/silc10/silc.c:1593
 msgid "topic [&lt;new topic&gt;]:  View or change the topic"
 msgstr "topic [&lt;uusi aihe&gt;]: Näytä tai aseta aihe"
 
-#: ../libpurple/protocols/silc/silc.c:1797
-#: ../libpurple/protocols/silc10/silc.c:1595
+#: ../libpurple/protocols/silc/silc.c:1809
+#: ../libpurple/protocols/silc10/silc.c:1598
 msgid "join &lt;channel&gt; [&lt;password&gt;]:  Join a chat on this network"
 msgstr "join &lt;kanava&gt; [&lt;salasana&gt;]: Liity kanavalle tässä verkossa"
 
-#: ../libpurple/protocols/silc/silc.c:1801
-#: ../libpurple/protocols/silc10/silc.c:1599
+#: ../libpurple/protocols/silc/silc.c:1813
+#: ../libpurple/protocols/silc10/silc.c:1602
 msgid "list:  List channels on this network"
 msgstr "list: Listaa kanavat tässä verkossa"
 
-#: ../libpurple/protocols/silc/silc.c:1805
-#: ../libpurple/protocols/silc10/silc.c:1603
+#: ../libpurple/protocols/silc/silc.c:1817
+#: ../libpurple/protocols/silc10/silc.c:1606
 msgid "whois &lt;nick&gt;:  View nick's information"
 msgstr "whois &lt;nimi&gt;: Näytä nimen tiedot"
 
-#: ../libpurple/protocols/silc/silc.c:1809
-#: ../libpurple/protocols/silc10/silc.c:1607
+#: ../libpurple/protocols/silc/silc.c:1821
+#: ../libpurple/protocols/silc10/silc.c:1610
 #: ../libpurple/protocols/zephyr/zephyr.c:2685
 msgid "msg &lt;nick&gt; &lt;message&gt;:  Send a private message to a user"
 msgstr "msg &lt;nimi&gt; &lt;viesti&gt;: Lähetä yksityisviesti käyttäjälle"
 
-#: ../libpurple/protocols/silc/silc.c:1813
-#: ../libpurple/protocols/silc10/silc.c:1611
+#: ../libpurple/protocols/silc/silc.c:1825
+#: ../libpurple/protocols/silc10/silc.c:1614
 msgid "query &lt;nick&gt; [&lt;message&gt;]:  Send a private message to a user"
 msgstr "query &lt;nimi&gt; [&lt;viesti&gt;]: Lähetä yksityisviesti käyttäjälle"
 
-#: ../libpurple/protocols/silc/silc.c:1817
-#: ../libpurple/protocols/silc10/silc.c:1615
-msgid "motd:  View the server's Message Of The Day"
-msgstr "motd: Näytä palvelimen päivän viesti"
-
-#: ../libpurple/protocols/silc/silc.c:1821
-#: ../libpurple/protocols/silc10/silc.c:1619
-msgid "detach:  Detach this session"
-msgstr "detach: Irroita tämä istunto"
-
-#: ../libpurple/protocols/silc/silc.c:1825
-#: ../libpurple/protocols/silc10/silc.c:1623
-msgid "quit [message]:  Disconnect from the server, with an optional message"
-msgstr "quit [viesti]: Katkaise yhteys palvelimelle, valinnainen viesti"
-
 #: ../libpurple/protocols/silc/silc.c:1829
-#: ../libpurple/protocols/silc10/silc.c:1627
+#: ../libpurple/protocols/silc10/silc.c:1618
+msgid "motd:  View the server's Message Of The Day"
+msgstr "motd: Näytä palvelimen päivän viesti"
+
+#: ../libpurple/protocols/silc/silc.c:1833
+#: ../libpurple/protocols/silc10/silc.c:1622
+msgid "detach:  Detach this session"
+msgstr "detach: Irrota tämä istunto"
+
+#: ../libpurple/protocols/silc/silc.c:1837
+#: ../libpurple/protocols/silc10/silc.c:1626
+msgid "quit [message]:  Disconnect from the server, with an optional message"
+msgstr "quit [viesti]: Katkaise yhteys palvelimelle, valinnainen viesti"
+
+#: ../libpurple/protocols/silc/silc.c:1841
+#: ../libpurple/protocols/silc10/silc.c:1630
 msgid "call &lt;command&gt;:  Call any silc client command"
 msgstr "call &lt;komento&gt;: Kutsu mitä vain silc:n asiakaskomentoa."
 
-#: ../libpurple/protocols/silc/silc.c:1835
-#: ../libpurple/protocols/silc10/silc.c:1633
+#: ../libpurple/protocols/silc/silc.c:1847
+#: ../libpurple/protocols/silc10/silc.c:1636
 msgid "kill &lt;nick&gt; [-pubkey|&lt;reason&gt;]:  Kill nick"
 msgstr "kill &lt;nimi&gt; [-pubkey|&lt;syy&gt;]: Tuhoa nimi"
 
-#: ../libpurple/protocols/silc/silc.c:1839
-#: ../libpurple/protocols/silc10/silc.c:1637
+#: ../libpurple/protocols/silc/silc.c:1851
+#: ../libpurple/protocols/silc10/silc.c:1640
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;uusi nimi&gt;: Muuta (lempi)nimesi."
 
-#: ../libpurple/protocols/silc/silc.c:1843
-#: ../libpurple/protocols/silc10/silc.c:1641
+#: ../libpurple/protocols/silc/silc.c:1855
+#: ../libpurple/protocols/silc10/silc.c:1644
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nimi&gt;: Näytä nimen tiedot"
 
-#: ../libpurple/protocols/silc/silc.c:1847
-#: ../libpurple/protocols/silc10/silc.c:1645
+#: ../libpurple/protocols/silc/silc.c:1859
+#: ../libpurple/protocols/silc10/silc.c:1648
 msgid ""
 "cmode &lt;channel&gt; [+|-&lt;modes&gt;] [arguments]:  Change or display "
 "channel modes"
@@ -11962,8 +12155,8 @@
 "cmode &lt;kanava&gt; [+|-&lt;tila&gt;] [argumentit]: Aseta tai näytä kanavan "
 "tilat."
 
-#: ../libpurple/protocols/silc/silc.c:1851
-#: ../libpurple/protocols/silc10/silc.c:1649
+#: ../libpurple/protocols/silc/silc.c:1863
+#: ../libpurple/protocols/silc10/silc.c:1652
 msgid ""
 "cumode &lt;channel&gt; +|-&lt;modes&gt; &lt;nick&gt;:  Change nick's modes "
 "on channel"
@@ -11971,64 +12164,64 @@
 "cumode &lt;kanava&gt; +|-&lt;tila&gt; &lt;nimi&gt;: Muuta nimen tilaa "
 "kanavalla."
 
-#: ../libpurple/protocols/silc/silc.c:1855
-#: ../libpurple/protocols/silc10/silc.c:1653
+#: ../libpurple/protocols/silc/silc.c:1867
+#: ../libpurple/protocols/silc10/silc.c:1656
 msgid "umode &lt;usermodes&gt;:  Set your modes in the network"
 msgstr "umode &lt;käyttäjätilat&gt;: Aseta omat tilasi verkossa"
 
-#: ../libpurple/protocols/silc/silc.c:1859
-#: ../libpurple/protocols/silc10/silc.c:1657
+#: ../libpurple/protocols/silc/silc.c:1871
+#: ../libpurple/protocols/silc10/silc.c:1660
 msgid "oper &lt;nick&gt; [-pubkey]:  Get server operator privileges"
 msgstr "oper &lt;nimi&gt; [-pubkey]: Palvelinoperaattorin oikeudet"
 
-#: ../libpurple/protocols/silc/silc.c:1863
-#: ../libpurple/protocols/silc10/silc.c:1661
+#: ../libpurple/protocols/silc/silc.c:1875
+#: ../libpurple/protocols/silc10/silc.c:1664
 msgid ""
 "invite &lt;channel&gt; [-|+]&lt;nick&gt;:  invite nick or add/remove from "
 "channel invite list"
 msgstr ""
 "invite &lt;kanava&gt; [-|+]&lt;nimi&gt;: Kutsu käyttäjä tai lisää/poista "
-"kanavan kutsu- listalta"
-
-#: ../libpurple/protocols/silc/silc.c:1867
-#: ../libpurple/protocols/silc10/silc.c:1665
+"kanavan kutsulistalta"
+
+#: ../libpurple/protocols/silc/silc.c:1879
+#: ../libpurple/protocols/silc10/silc.c:1668
 msgid "kick &lt;channel&gt; &lt;nick&gt; [comment]:  Kick client from channel"
 msgstr ""
 "kick &lt;kanava&gt; &lt;nimi&gt; [kommentti]: Poista käyttäjä kanavalta"
 
-#: ../libpurple/protocols/silc/silc.c:1871
-#: ../libpurple/protocols/silc10/silc.c:1669
+#: ../libpurple/protocols/silc/silc.c:1883
+#: ../libpurple/protocols/silc10/silc.c:1672
 msgid "info [server]:  View server administrative details"
 msgstr "info [palvelin]: Näytä palvelimen ylläpidolliset yksityiskohdat"
 
-#: ../libpurple/protocols/silc/silc.c:1875
-#: ../libpurple/protocols/silc10/silc.c:1673
+#: ../libpurple/protocols/silc/silc.c:1887
+#: ../libpurple/protocols/silc10/silc.c:1676
 msgid "ban [&lt;channel&gt; +|-&lt;nick&gt;]:  Ban client from channel"
 msgstr "ban [%lt;kanava%gt; +|-&lt;nimi&gt;]: Kiellä käyttäjä kanavalta"
 
-#: ../libpurple/protocols/silc/silc.c:1879
-#: ../libpurple/protocols/silc10/silc.c:1677
+#: ../libpurple/protocols/silc/silc.c:1891
+#: ../libpurple/protocols/silc10/silc.c:1680
 msgid "getkey &lt;nick|server&gt;:  Retrieve client's or server's public key"
 msgstr ""
 "getkey &lt;nimi|palvelin&gt;: Hae käyttäjän tai palvelimen julkinen avain"
 
-#: ../libpurple/protocols/silc/silc.c:1883
-#: ../libpurple/protocols/silc10/silc.c:1681
+#: ../libpurple/protocols/silc/silc.c:1895
+#: ../libpurple/protocols/silc10/silc.c:1684
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Näytä palvelimen ja verkon tilastot"
 
-#: ../libpurple/protocols/silc/silc.c:1887
-#: ../libpurple/protocols/silc10/silc.c:1685
+#: ../libpurple/protocols/silc/silc.c:1899
+#: ../libpurple/protocols/silc10/silc.c:1688
 msgid "ping:  Send PING to the connected server"
 msgstr "ping:  Lähetä PING palvelimelle, johon ollaan yhteydessä"
 
-#: ../libpurple/protocols/silc/silc.c:1892
-#: ../libpurple/protocols/silc10/silc.c:1690
+#: ../libpurple/protocols/silc/silc.c:1904
+#: ../libpurple/protocols/silc10/silc.c:1693
 msgid "users &lt;channel&gt;:  List users in channel"
 msgstr "users &lt;kanava&gt;: Näytä käyttäjät kanavalla"
 
-#: ../libpurple/protocols/silc/silc.c:1896
-#: ../libpurple/protocols/silc10/silc.c:1694
+#: ../libpurple/protocols/silc/silc.c:1908
+#: ../libpurple/protocols/silc10/silc.c:1697
 msgid ""
 "names [-count|-ops|-halfops|-voices|-normal] &lt;channel(s)&gt;:  List "
 "specific users in channel(s)"
@@ -12045,140 +12238,140 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:2007
-#: ../libpurple/protocols/silc10/silc.c:1819
+#: ../libpurple/protocols/silc/silc.c:2019
+#: ../libpurple/protocols/silc10/silc.c:1822
 msgid "SILC Protocol Plugin"
 msgstr "SILC-yhteyskäytäntöliitännäinen"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:2009
-#: ../libpurple/protocols/silc10/silc.c:1821
+#: ../libpurple/protocols/silc/silc.c:2021
+#: ../libpurple/protocols/silc10/silc.c:1824
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) -yhteyskäytäntö"
 
-#: ../libpurple/protocols/silc/silc.c:2041
-#: ../libpurple/protocols/silc10/silc.c:1853 ../pidgin/gtkprefs.c:2137
+#: ../libpurple/protocols/silc/silc.c:2053
+#: ../libpurple/protocols/silc10/silc.c:1856 ../pidgin/gtkprefs.c:2138
 msgid "Network"
 msgstr "Verkko"
 
-#: ../libpurple/protocols/silc/silc.c:2052
-#: ../libpurple/protocols/silc10/silc.c:1864
+#: ../libpurple/protocols/silc/silc.c:2064
+#: ../libpurple/protocols/silc10/silc.c:1867
 msgid "Public Key file"
 msgstr "Julkinen avaintiedosto"
 
-#: ../libpurple/protocols/silc/silc.c:2056
-#: ../libpurple/protocols/silc10/silc.c:1868
+#: ../libpurple/protocols/silc/silc.c:2068
+#: ../libpurple/protocols/silc10/silc.c:1871
 msgid "Private Key file"
 msgstr "Yksityinen avaintiedosto"
 
-#: ../libpurple/protocols/silc/silc.c:2066
-#: ../libpurple/protocols/silc10/silc.c:1878
+#: ../libpurple/protocols/silc/silc.c:2078
+#: ../libpurple/protocols/silc10/silc.c:1881
 msgid "Cipher"
 msgstr "Salaus"
 
-#: ../libpurple/protocols/silc/silc.c:2076
-#: ../libpurple/protocols/silc10/silc.c:1888
+#: ../libpurple/protocols/silc/silc.c:2088
+#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:2079
+#: ../libpurple/protocols/silc/silc.c:2091
 msgid "Use Perfect Forward Secrecy"
 msgstr "Käytä täydellistä jatkosalaisuutta (PFS)"
 
-#: ../libpurple/protocols/silc/silc.c:2083
-#: ../libpurple/protocols/silc10/silc.c:1891
+#: ../libpurple/protocols/silc/silc.c:2095
+#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Public key authentication"
 msgstr "Julkisella avaimella todentaminen"
 
-#: ../libpurple/protocols/silc/silc.c:2086
-#: ../libpurple/protocols/silc10/silc.c:1894
+#: ../libpurple/protocols/silc/silc.c:2098
+#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block IMs without Key Exchange"
 msgstr "Estä pikaviestit ilman avaintenvaihtoa"
 
-#: ../libpurple/protocols/silc/silc.c:2089
-#: ../libpurple/protocols/silc10/silc.c:1897
+#: ../libpurple/protocols/silc/silc.c:2101
+#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Block messages to whiteboard"
 msgstr "Estä viestit kirjoitustaululle"
 
-#: ../libpurple/protocols/silc/silc.c:2092
-#: ../libpurple/protocols/silc10/silc.c:1900
+#: ../libpurple/protocols/silc/silc.c:2104
+#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Automatically open whiteboard"
 msgstr "Avaa kirjoitustaulu automaattisesti"
 
-#: ../libpurple/protocols/silc/silc.c:2095
-#: ../libpurple/protocols/silc10/silc.c:1903
+#: ../libpurple/protocols/silc/silc.c:2107
+#: ../libpurple/protocols/silc10/silc.c:1906
 msgid "Digitally sign and verify all messages"
 msgstr "Allekirjoita ja tarkista kaikki viestit digitaalisesti"
 
 #: ../libpurple/protocols/silc/util.c:207
-#: ../libpurple/protocols/silc/util.c:249
+#: ../libpurple/protocols/silc/util.c:250
 #: ../libpurple/protocols/silc10/util.c:207
 #: ../libpurple/protocols/silc10/util.c:247
 msgid "Creating SILC key pair..."
 msgstr "Luodaan SILC-avainpari..."
 
-#: ../libpurple/protocols/silc/util.c:215
-#: ../libpurple/protocols/silc/util.c:257
+#: ../libpurple/protocols/silc/util.c:216
+#: ../libpurple/protocols/silc/util.c:259
 msgid "Cannot create SILC key pair\n"
 msgstr "SILC-avainparia ei voida luoda\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:362
+#: ../libpurple/protocols/silc/util.c:364
 #: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "Oikea nimi: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:364
+#: ../libpurple/protocols/silc/util.c:366
 #: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Käyttäjänimi: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
+#: ../libpurple/protocols/silc/util.c:368
 #: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "Sähköposti: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
+#: ../libpurple/protocols/silc/util.c:370
 #: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Palvelin: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
+#: ../libpurple/protocols/silc/util.c:372
 #: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisaatio: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:372
+#: ../libpurple/protocols/silc/util.c:374
 #: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Maa: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:373
+#: ../libpurple/protocols/silc/util.c:375
 #: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritmi: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
+#: ../libpurple/protocols/silc/util.c:376
 #: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Avaimen pituus: \t%d bittiä\n"
 
-#: ../libpurple/protocols/silc/util.c:376
+#: ../libpurple/protocols/silc/util.c:378
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Versio: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:378
+#: ../libpurple/protocols/silc/util.c:380
 #: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
@@ -12190,7 +12383,7 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:379
+#: ../libpurple/protocols/silc/util.c:381
 #: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
@@ -12200,34 +12393,34 @@
 "Julkisen avaimen babbleprint\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:383
-#: ../libpurple/protocols/silc/util.c:384
+#: ../libpurple/protocols/silc/util.c:385
+#: ../libpurple/protocols/silc/util.c:386
 #: ../libpurple/protocols/silc10/util.c:374
 #: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Julkisen avaimen tiedot"
 
-#: ../libpurple/protocols/silc/util.c:563
+#: ../libpurple/protocols/silc/util.c:565
 #: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Kaukohaku"
 
-#: ../libpurple/protocols/silc/util.c:569
+#: ../libpurple/protocols/silc/util.c:571
 #: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videoneuvottelu"
 
-#: ../libpurple/protocols/silc/util.c:587
+#: ../libpurple/protocols/silc/util.c:589
 #: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Tietokone"
 
-#: ../libpurple/protocols/silc/util.c:591
+#: ../libpurple/protocols/silc/util.c:593
 #: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:593
+#: ../libpurple/protocols/silc/util.c:595
 #: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Pääte"
@@ -12320,38 +12513,37 @@
 #: ../libpurple/protocols/silc10/silc.c:334
 #, c-format
 msgid "Could not load SILC key pair: %s"
-msgstr "Ei voitu ladata SILC-avainparia: %s"
-
-#. TODO: do we really want to disconnect on a failure to write?
-#: ../libpurple/protocols/simple/simple.c:417
+msgstr "Ei voi ladata SILC-avainparia: %s"
+
+#: ../libpurple/protocols/simple/simple.c:419
 msgid "Could not write"
-msgstr "Ei voitu kirjoittaa"
-
-#: ../libpurple/protocols/simple/simple.c:439
-#: ../libpurple/protocols/simple/simple.c:1684
+msgstr "Ei voi kirjoittaa"
+
+#: ../libpurple/protocols/simple/simple.c:443
+#: ../libpurple/protocols/simple/simple.c:1691
 msgid "Could not connect"
-msgstr "Ei voitu yhdistää"
-
-#: ../libpurple/protocols/simple/simple.c:1122
+msgstr "Ei voi yhdistää"
+
+#: ../libpurple/protocols/simple/simple.c:1127
 msgid "Unknown server response."
 msgstr "Tuntematon palvelinvastaus."
 
-#: ../libpurple/protocols/simple/simple.c:1718
-#: ../libpurple/protocols/simple/simple.c:1760
+#: ../libpurple/protocols/simple/simple.c:1727
 #: ../libpurple/protocols/simple/simple.c:1773
-#: ../libpurple/protocols/simple/simple.c:1824
+#: ../libpurple/protocols/simple/simple.c:1788
+#: ../libpurple/protocols/simple/simple.c:1843
 msgid "Could not create listen socket"
 msgstr "Kuuntelupistokkeen luominen epäonnistui"
 
-#: ../libpurple/protocols/simple/simple.c:1741
+#: ../libpurple/protocols/simple/simple.c:1752
 msgid "Couldn't resolve host"
-msgstr "Yhteyttä isäntään ei voitu löytää"
-
-#: ../libpurple/protocols/simple/simple.c:1832
+msgstr "Yhteyttä isäntään ei voi löytää"
+
+#: ../libpurple/protocols/simple/simple.c:1853
 msgid "Could not resolve hostname"
-msgstr "Isäntänimeä ei voitu selvittää"
-
-#: ../libpurple/protocols/simple/simple.c:1849
+msgstr "Isäntänimeä ei voi selvittää"
+
+#: ../libpurple/protocols/simple/simple.c:1871
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP-näyttönimissä ei tule olla välilyöntejä tai @-merkkejä"
 
@@ -12363,36 +12555,36 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:2035
+#: ../libpurple/protocols/simple/simple.c:2057
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-yhteyskäytäntöliitännäinen"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:2036
+#: ../libpurple/protocols/simple/simple.c:2058
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "SIP/SIMPLE-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/simple/simple.c:2064
+#: ../libpurple/protocols/simple/simple.c:2086
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Julkaise tilasi (huom: kuka tahansa voi seurata tilaasi)"
 
-#: ../libpurple/protocols/simple/simple.c:2070
+#: ../libpurple/protocols/simple/simple.c:2092
 msgid "Use UDP"
 msgstr "Käytä UDP:tä"
 
-#: ../libpurple/protocols/simple/simple.c:2072
+#: ../libpurple/protocols/simple/simple.c:2094
 msgid "Use proxy"
 msgstr "Käytä välipalvelinta"
 
-#: ../libpurple/protocols/simple/simple.c:2074
+#: ../libpurple/protocols/simple/simple.c:2096
 msgid "Proxy"
 msgstr "Välipalvelin"
 
-#: ../libpurple/protocols/simple/simple.c:2076
+#: ../libpurple/protocols/simple/simple.c:2098
 msgid "Auth User"
 msgstr "Todennus/käyttäjä"
 
-#: ../libpurple/protocols/simple/simple.c:2078
+#: ../libpurple/protocols/simple/simple.c:2100
 msgid "Auth Domain"
 msgstr "Todennus/verkkoalue"
 
@@ -12566,8 +12758,8 @@
 msgid "Password Change Successful"
 msgstr "Salasanan vaihto onnistui"
 
-#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:5929
-#: ../pidgin/gtkblist.c:6285
+#: ../libpurple/protocols/toc/toc.c:1366 ../pidgin/gtkblist.c:6270
+#: ../pidgin/gtkblist.c:6628
 msgid "_Group:"
 msgstr "_Ryhmä:"
 
@@ -12592,11 +12784,11 @@
 #: ../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 "Yhteyttä siirtoa varten ei voitu muodostaa."
+msgstr "Yhteyttä siirtoa varten ei voi muodostaa."
 
 #: ../libpurple/protocols/toc/toc.c:2075
 msgid "Could not write file header.  The file will not be transferred."
-msgstr "Tiedosto-otsikkoa ei voitu kirjoittaa. Tiedostoa ei siirretä."
+msgstr "Tiedosto-otsikkoa ei voi kirjoittaa. Tiedostoa ei siirretä."
 
 #: ../libpurple/protocols/toc/toc.c:2175
 msgid "Save As..."
@@ -12652,15 +12844,14 @@
 "%s has (retroactively) denied your request to add them to your list for the "
 "following reason: %s."
 msgstr ""
-"Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
-"tuttavalistallesi seuraavasta syystä: %s."
+"Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet tuttaviisi "
+"seuraavasta syystä: %s."
 
 #: ../libpurple/protocols/yahoo/yahoo.c:1052
 #, c-format
 msgid "%s has (retroactively) denied your request to add them to your list."
 msgstr ""
-"Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet "
-"tuttavalistallesi."
+"Käyttäjä %s on (taannehtivasti) evännyt pyyntösi lisätä hänet tuttaviisi."
 
 #: ../libpurple/protocols/yahoo/yahoo.c:1054
 msgid "Add buddy rejected"
@@ -12687,55 +12878,55 @@
 "You have tried to ignore %s, but the user is on your buddy list.  Clicking "
 "\"Yes\" will remove and ignore the buddy."
 msgstr ""
-"Olet yrittänyt olla välittämättä tuttavasta %s, mutta hän on "
-"tuttavalistalla. Painaessasi \"Kyllä\" poistat hänet tuttavalistalta eikä "
-"häneltä saapuneista viesteistä enää välitetä."
+"Olet yrittänyt olla välittämättä tuttavasta %s, mutta hän on tuttavissasi. "
+"Painaessasi \"Kyllä\" poistat hänet tuttavistasi eikä häneltä saapuneista "
+"viesteistä enää välitetä."
 
 #: ../libpurple/protocols/yahoo/yahoo.c:2068
 msgid "Ignore buddy?"
 msgstr "Jätä tuttava huomiotta?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2131
+#: ../libpurple/protocols/yahoo/yahoo.c:2133
 msgid "Your account is locked, please log in to the Yahoo! website."
 msgstr "Käyttäjätilisi on lukittu, kirjaudu sisään yahoo-websivustolta."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
+#: ../libpurple/protocols/yahoo/yahoo.c:2136
 #, c-format
 msgid "Unknown error number %d. Logging into the Yahoo! website may fix this."
 msgstr ""
 "Tuntematon viesti numero %d. Kirjautumalla Yahoo! verkkosivuille saattaa "
 "korjata tämän."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2188
+#: ../libpurple/protocols/yahoo/yahoo.c:2189
 #, c-format
 msgid "Could not add buddy %s to group %s to the server list on account %s."
 msgstr ""
-"Ei voitu lisätä tuttavaa %s ryhmään %s palvelimen listalle, tilillä %s."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2191
+"Ei voi lisätä tuttavaa %s ryhmään %s palvelimen tuttavissa, tilillä %s."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2192
 msgid "Could not add buddy to server list"
-msgstr "Ei voitu lisätä tuttavaa palvelimen listalle"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:2310
+msgstr "Ei voi lisätä tuttavaa palvelimen tuttaviin"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:2311
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Ääniäinen %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2653
+#: ../libpurple/protocols/yahoo/yahoo.c:2657
 msgid "Received unexpected HTTP response from server."
 msgstr "Odottamaton HTTP-vastaus palvelimelta."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2677
-#: ../libpurple/protocols/yahoo/yahoo.c:2863
-#: ../libpurple/protocols/yahoo/yahoo.c:2966
-#: ../libpurple/protocols/yahoo/yahoo.c:2976
+#: ../libpurple/protocols/yahoo/yahoo.c:2682
+#: ../libpurple/protocols/yahoo/yahoo.c:2870
+#: ../libpurple/protocols/yahoo/yahoo.c:2974
+#: ../libpurple/protocols/yahoo/yahoo.c:2985
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:585
+#: ../libpurple/protocols/yahoo/ycht.c:586
 msgid "Connection problem"
 msgstr "Yhteysvirhe"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2703
+#: ../libpurple/protocols/yahoo/yahoo.c:2708
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12744,112 +12935,112 @@
 "Yhteys palvelimeen %s katkesi:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2728
+#: ../libpurple/protocols/yahoo/yahoo.c:2733
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
 "%s"
 msgstr ""
-"Ei voitu muodostaa yhteyttä palvelimeen %s:\n"
+"Ei voi muodostaa yhteyttä palvelimeen %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3769
+#: ../libpurple/protocols/yahoo/yahoo.c:3092
+#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "Not at Home"
 msgstr "Poissa kotoa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3772
+#: ../libpurple/protocols/yahoo/yahoo.c:3094
+#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "Not at Desk"
 msgstr "Poissa työpöydältä"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3775
+#: ../libpurple/protocols/yahoo/yahoo.c:3096
+#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Not in Office"
 msgstr "Poissa toimistolta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3781
+#: ../libpurple/protocols/yahoo/yahoo.c:3100
+#: ../libpurple/protocols/yahoo/yahoo.c:3790
 msgid "On Vacation"
 msgstr "Lomalla"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3095
-#: ../libpurple/protocols/yahoo/yahoo.c:3787
+#: ../libpurple/protocols/yahoo/yahoo.c:3104
+#: ../libpurple/protocols/yahoo/yahoo.c:3796
 msgid "Stepped Out"
 msgstr "Piipahdan ulkona"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3188
-#: ../libpurple/protocols/yahoo/yahoo.c:3218
+#: ../libpurple/protocols/yahoo/yahoo.c:3197
+#: ../libpurple/protocols/yahoo/yahoo.c:3227
 msgid "Not on server list"
-msgstr "Ei palvelimen listalla"
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3235
-#: ../libpurple/protocols/yahoo/yahoo.c:3293
+msgstr "Ei palvelimen tuttavissa"
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3244
+#: ../libpurple/protocols/yahoo/yahoo.c:3302
 msgid "Appear Online"
 msgstr "Näytä linjoilla olevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3238
-#: ../libpurple/protocols/yahoo/yahoo.c:3314
+#: ../libpurple/protocols/yahoo/yahoo.c:3247
+#: ../libpurple/protocols/yahoo/yahoo.c:3323
 msgid "Appear Permanently Offline"
 msgstr "Näytä pysyvästi poissaolevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3256
+#: ../libpurple/protocols/yahoo/yahoo.c:3265
 msgid "Presence"
 msgstr "Läsnäolo"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3299
+#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Appear Offline"
 msgstr "Näytä poissaolevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3308
+#: ../libpurple/protocols/yahoo/yahoo.c:3317
 msgid "Don't Appear Permanently Offline"
 msgstr "Älä näytä pysyvästi poissaolevalta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3356
+#: ../libpurple/protocols/yahoo/yahoo.c:3365
 msgid "Join in Chat"
 msgstr "Liity ryhmäkeskusteluun"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3362
+#: ../libpurple/protocols/yahoo/yahoo.c:3371
 msgid "Initiate Conference"
 msgstr "Aloita neuvottelu"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3390
+#: ../libpurple/protocols/yahoo/yahoo.c:3399
 msgid "Presence Settings"
 msgstr "Läsnäoloasetukset"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3396
+#: ../libpurple/protocols/yahoo/yahoo.c:3405
 msgid "Start Doodling"
 msgstr "Aloita piirtely"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
+#: ../libpurple/protocols/yahoo/yahoo.c:3506
 msgid "Activate which ID?"
 msgstr "Mikä tunnus (ID) aktivoidaan?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3508
-msgid "Join whom in chat?"
+#: ../libpurple/protocols/yahoo/yahoo.c:3517
+msgid "Join who in chat?"
 msgstr "Kenen seuraan liitytään ryhmäkeskustelussa?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3520
-msgid "Activate ID..."
-msgstr "Aktivoi tunnus (ID)..."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:3524
-msgid "Join User in Chat..."
-msgstr "Liity käyttäjän seuraan ryhmäkeskustelussa..."
-
 #: ../libpurple/protocols/yahoo/yahoo.c:3529
+msgid "Activate ID..."
+msgstr "Aktivoi tunnus (ID)..."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3533
+msgid "Join User in Chat..."
+msgstr "Liity käyttäjän seuraan ryhmäkeskustelussa..."
+
+#: ../libpurple/protocols/yahoo/yahoo.c:3538
 msgid "Open Inbox"
 msgstr "Avaa saapuneet-kansio"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4138
+#: ../libpurple/protocols/yahoo/yahoo.c:4147
 msgid "join &lt;room&gt;:  Join a chat room on the Yahoo network"
 msgstr "join: &lt;huone&gt;: Liity keskusteluhuoneeseen Yahoo-verkossa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4143
+#: ../libpurple/protocols/yahoo/yahoo.c:4152
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Listaa kanavat Yahoo-verkossa"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4151
+#: ../libpurple/protocols/yahoo/yahoo.c:4160
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Pyydä käyttäjää aloittamaan piirtelyistunto"
 
@@ -12863,56 +13054,56 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
-#: ../libpurple/protocols/yahoo/yahoo.c:4362
+#: ../libpurple/protocols/yahoo/yahoo.c:4369
+#: ../libpurple/protocols/yahoo/yahoo.c:4371
 msgid "Yahoo Protocol Plugin"
 msgstr "Yahoo-yhteyskäytäntöliitännäinen"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4385
+#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4388
+#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "Pager server"
 msgstr "Hakulaitepalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4391
+#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Japan Pager server"
 msgstr "Hakulaitepalvelin (Japani)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4394
+#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "Pager port"
 msgstr "Hakulaiteportti"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4397
+#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "File transfer server"
 msgstr "Tiedostonsiirtopalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
+#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Japan file transfer server"
 msgstr "Tiedostonsiirtopalvelin (Japani)"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4403
+#: ../libpurple/protocols/yahoo/yahoo.c:4412
 msgid "File transfer port"
 msgstr "Tiedostonsiirtoportti"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
+#: ../libpurple/protocols/yahoo/yahoo.c:4415
 msgid "Chat room locale"
 msgstr "Keskusteluhuoneen paikallisasetus"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4409
+#: ../libpurple/protocols/yahoo/yahoo.c:4418
 msgid "Ignore conference and chatroom invitations"
 msgstr "Jätä konferenssi- ja keskusteluhuonekutsut huomiotta"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4417
+#: ../libpurple/protocols/yahoo/yahoo.c:4426
 msgid "Chat room list URL"
 msgstr "Keskusteluhuoneluettelon URL"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4420
+#: ../libpurple/protocols/yahoo/yahoo.c:4429
 msgid "Yahoo Chat server"
 msgstr "Yahoo-ryhmäkeskustelupalvelin"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4423
+#: ../libpurple/protocols/yahoo/yahoo.c:4432
 msgid "Yahoo Chat port"
 msgstr "Yahoo-ryhmäkeskustelupalvelimen portti"
 
@@ -12929,8 +13120,7 @@
 msgid "Unable to establish file descriptor."
 msgstr "Ei kyetty muodostamaan tiedostokahvaa."
 
-#. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:306
+#: ../libpurple/protocols/yahoo/yahoo_packet.c:307
 msgid "Write Error"
 msgstr "Virhe kirjoituksessa"
 
@@ -13011,7 +13201,7 @@
 "Could not retrieve the user's profile. This most likely is a temporary "
 "server-side problem. Please try again later."
 msgstr ""
-"Ei voitu hakea käyttäjän profiilia. Tämä on todennäköisesti väliaikainen "
+"Ei voi hakea käyttäjän profiilia. Tämä on todennäköisesti väliaikainen "
 "palvelimen ongelma. Ole hyvä ja yritä myöhemmin uudestaan."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1224
@@ -13020,10 +13210,10 @@
 "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 ""
-"Ei voitu hakea käyttäjän profiilia. Tämä todennäköisesti tarkoittaa sitä "
-"että käyttäjää ei ole; kuitenkin Yahoo! joskus epäonnistuu löytämään "
-"käyttäjän profiilin. Jos olet varma että käyttäjä on olemassa, yritä "
-"myöhemmin uudelleen."
+"Ei voi hakea käyttäjän profiilia. Tämä todennäköisesti tarkoittaa sitä että "
+"käyttäjää ei ole; kuitenkin Yahoo! joskus epäonnistuu löytämään käyttäjän "
+"profiilin. Jos olet varma että käyttäjä on olemassa, yritä myöhemmin "
+"uudelleen."
 
 #: ../libpurple/protocols/yahoo/yahoo_profile.c:1231
 msgid "The user's profile is empty."
@@ -13081,7 +13271,7 @@
 #: ../libpurple/protocols/yahoo/yahoochat.c:1416
 #: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Fetching the room list failed."
-msgstr "Huonelistan haku epäonnistui."
+msgstr "Huoneluettelon haku epäonnistui."
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:1500
 msgid "Voices"
@@ -13094,17 +13284,17 @@
 #: ../libpurple/protocols/yahoo/yahoochat.c:1514
 #: ../libpurple/protocols/yahoo/yahoochat.c:1584
 msgid "Unable to fetch room list."
-msgstr "Huonelistaa ei voida hakea."
+msgstr "Huoneluetteloa ei voi hakea."
 
 #: ../libpurple/protocols/yahoo/yahoochat.c:1577
 msgid "User Rooms"
 msgstr "Käyttäjän huoneet"
 
-#: ../libpurple/protocols/yahoo/ycht.c:456
+#: ../libpurple/protocols/yahoo/ycht.c:457
 msgid "Connection problem with the YCHT server."
 msgstr "Yhteysvirhe YCHT-palvelimen kanssa"
 
-#: ../libpurple/protocols/yahoo/ycht.c:475
+#: ../libpurple/protocols/yahoo/ycht.c:476
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -13287,7 +13477,7 @@
 #: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
-msgstr "Ei voitu jäsentää vastausta HTTP-välipalvelimelta: %s\n"
+msgstr "Ei voi jäsentää vastausta HTTP-välipalvelimelta: %s\n"
 
 #: ../libpurple/proxy.c:702 ../libpurple/proxy.c:750 ../libpurple/proxy.c:786
 #: ../libpurple/proxy.c:798
@@ -13307,23 +13497,37 @@
 
 #: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
-msgstr "Ei voitu selvittää isäntänimeä"
+msgstr "Ei voi selvittää isäntänimeä"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/request.h:1378
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @deprecated Please use purple_request_yes_no_with_hint instead.
+#.
+#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
 msgid "_Yes"
 msgstr "_Kyllä"
 
-#: ../libpurple/request.h:1378
+#: ../libpurple/request.h:1802 ../libpurple/request.h:1815
 msgid "_No"
 msgstr "_Ei"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/request.h:1398
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_accept_cancel_with_hint instead.
+#.
+#: ../libpurple/request.h:1854 ../libpurple/request.h:1867
 msgid "_Accept"
 msgstr "_Hyväksy"
 
@@ -13404,67 +13608,71 @@
 msgid "Mobile"
 msgstr "Liikkeellä"
 
-#: ../libpurple/status.c:609
+#: ../libpurple/status.c:161
+msgid "Listening to music"
+msgstr "Kuuntelee musiikkia"
+
+#: ../libpurple/status.c:610
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s on vaihtanut tilasta %s tilaan %s"
 
-#: ../libpurple/status.c:612
+#: ../libpurple/status.c:613
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr "%s (%s) on vaihtanut tilasta %s tilaan %s"
 
-#: ../libpurple/status.c:623
+#: ../libpurple/status.c:624
 #, c-format
 msgid "%s is now %s"
 msgstr "%s on nyt %s"
 
-#: ../libpurple/status.c:625
+#: ../libpurple/status.c:626
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) on nyt %s"
 
-#: ../libpurple/status.c:631
+#: ../libpurple/status.c:632
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s ei ole enää %s"
 
-#: ../libpurple/status.c:633
+#: ../libpurple/status.c:634
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) ei ole enää %s"
 
-#: ../libpurple/status.c:1244
+#: ../libpurple/status.c:1247
 #, c-format
 msgid "%s became idle"
 msgstr "%s on jouten"
 
-#: ../libpurple/status.c:1261
+#: ../libpurple/status.c:1264
 #, c-format
 msgid "%s became unidle"
 msgstr "%s on aktiivinen"
 
-#: ../libpurple/status.c:1324
+#: ../libpurple/status.c:1327
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s on jouten"
 
-#: ../libpurple/status.c:1326
+#: ../libpurple/status.c:1329
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s on aktiivinen"
 
-#: ../libpurple/util.c:701
+#: ../libpurple/util.c:721
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2706
+#: ../libpurple/util.c:2783
 #, c-format
 msgid "Error Reading %s"
 msgstr "Virhe luettaessa %s"
 
-#: ../libpurple/util.c:2707
+#: ../libpurple/util.c:2784
 #, c-format
 msgid ""
 "An error was encountered reading your %s.  They have not been loaded, and "
@@ -13473,89 +13681,89 @@
 "%s:n lukemisessa tapahtui virhe. Niitä ei ladattu ja vanha tiedosto on "
 "nimetty uudelleen nimellä %s~."
 
-#: ../libpurple/util.c:3204
+#: ../libpurple/util.c:3281
 msgid "Calculating..."
 msgstr "Lasketaan..."
 
-#: ../libpurple/util.c:3207
+#: ../libpurple/util.c:3284
 msgid "Unknown."
 msgstr "Tuntematon."
 
-#: ../libpurple/util.c:3233
+#: ../libpurple/util.c:3310
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekunti"
 msgstr[1] "%d sekuntia"
 
-#: ../libpurple/util.c:3245
+#: ../libpurple/util.c:3322
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d päivä"
 msgstr[1] "%d päivää"
 
-#: ../libpurple/util.c:3253
+#: ../libpurple/util.c:3330
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d tunti"
 msgstr[1] "%s, %d tuntia"
 
-#: ../libpurple/util.c:3259
+#: ../libpurple/util.c:3336
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d tunti"
 msgstr[1] "%d tuntia"
 
-#: ../libpurple/util.c:3267
+#: ../libpurple/util.c:3344
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minuutti"
 msgstr[1] "%s, %d minuuttia"
 
-#: ../libpurple/util.c:3273
+#: ../libpurple/util.c:3350
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minuutti"
 msgstr[1] "%d minuuttia"
 
-#: ../libpurple/util.c:3533
+#: ../libpurple/util.c:3610
 #, c-format
 msgid "Could not open %s: Redirected too many times"
 msgstr "%s:n avaaminen epäonnistui: uudelleenohjattu liian monta kertaa"
 
-#: ../libpurple/util.c:3570 ../libpurple/util.c:3866
+#: ../libpurple/util.c:3647 ../libpurple/util.c:3943
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Kohteeseen %s ei kyetty muodostamaan yhteyttä"
 
-#: ../libpurple/util.c:3693
+#: ../libpurple/util.c:3770
 #, c-format
 msgid ""
 "Unable to allocate enough memory to hold the contents from %s.  The web "
 "server may be trying something malicious."
 msgstr ""
-"Ei voitu varata riittävästi muistia säilyttämään kohteen %s sisältö. "
+"Ei voi varata riittävästi muistia säilyttämään kohteen %s sisältö. "
 "Verkkopalvelin voi olla yrittämässä tehdä jotain pahantahtoista."
 
-#: ../libpurple/util.c:3728
+#: ../libpurple/util.c:3805
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Virhe luettaessa kohteesta %s: %s"
 
-#: ../libpurple/util.c:3759
+#: ../libpurple/util.c:3836
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Virhe kirjoitettaessa kohteseen %s: %s"
 
-#: ../libpurple/util.c:3784
+#: ../libpurple/util.c:3861
 #, c-format
 msgid "Unable to connect to %s: %s"
-msgstr "Ei voitu yhdistää kohteeseen %s: %s"
+msgstr "Ei voi yhdistää kohteeseen %s: %s"
 
 #: ../pidgin.desktop.in.h:1
 msgid "Internet Messenger"
@@ -13642,7 +13850,7 @@
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:970 ../pidgin/gtkprefs.c:1282
+#: ../pidgin/gtkaccount.c:970 ../pidgin/gtkprefs.c:1283
 msgid "Use Environmental Settings"
 msgstr "Käytä ympäristöasetuksia"
 
@@ -13664,15 +13872,15 @@
 msgid "Proxy Options"
 msgstr "Välipalvelinvalinnat"
 
-#: ../pidgin/gtkaccount.c:1047 ../pidgin/gtkprefs.c:1276
+#: ../pidgin/gtkaccount.c:1047 ../pidgin/gtkprefs.c:1277
 msgid "Proxy _type:"
 msgstr "Välipalvelimen _tyyppi:"
 
-#: ../pidgin/gtkaccount.c:1056 ../pidgin/gtkprefs.c:1297
+#: ../pidgin/gtkaccount.c:1056 ../pidgin/gtkprefs.c:1298
 msgid "_Host:"
 msgstr "P_alvelin:"
 
-#: ../pidgin/gtkaccount.c:1060 ../pidgin/gtkprefs.c:1315
+#: ../pidgin/gtkaccount.c:1060 ../pidgin/gtkprefs.c:1316
 msgid "_Port:"
 msgstr "_Portti:"
 
@@ -13680,7 +13888,7 @@
 msgid "_Username:"
 msgstr "_Käyttäjänimi:"
 
-#: ../pidgin/gtkaccount.c:1075 ../pidgin/gtkprefs.c:1352
+#: ../pidgin/gtkaccount.c:1075 ../pidgin/gtkprefs.c:1353
 msgid "Pa_ssword:"
 msgstr "_Salasana:"
 
@@ -13708,7 +13916,7 @@
 msgid "_Advanced"
 msgstr "_Lisäasetukset"
 
-#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:569
+#: ../pidgin/gtkaccount.c:1978 ../pidgin/gtkplugin.c:595
 msgid "Enabled"
 msgstr "Käytössä"
 
@@ -13737,9 +13945,9 @@
 "uudestaan <b>Lisää</b>-painiketta määritelläksesi ne kaikki.\n"
 "\n"
 "Voit palata tähän ikkunaan lisäämään, muokkaamaan tai poistamaan tilejä "
-"valitsemalla <b>Käyttäjätilit->Lisää/muokkaa</b> Tuttavalista-ikkunassa."
-
-#: ../pidgin/gtkblist.c:527
+"valitsemalla <b>Käyttäjätilit->Lisää/muokkaa</b> Tuttavat-ikkunassa."
+
+#: ../pidgin/gtkblist.c:543
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
 msgid_plural ""
@@ -13747,128 +13955,127 @@
 msgstr[0] "Sinulla on %d kontakti jonka nimi on %s. Haluatko yhdistää ne?"
 msgstr[1] "Sinulla on %d kontaktia joiden nimi on %s. Haluatko yhdistää ne?"
 
-#: ../pidgin/gtkblist.c:528
+#: ../pidgin/gtkblist.c:544
 msgid ""
 "Merging these contacts will cause them to share a single entry on the buddy "
 "list and use a single conversation window. You can separate them again by "
 "choosing 'Expand' from the contact's context menu"
 msgstr ""
-"Kontaktien yhdistäminen tekee niistä yhden, yhdistetyn kontaktin "
-"tuttavalistalle ja kontakteille käytetään jatkossa vain yhtä "
-"keskusteluikkunaa. Ne voidaan erottaa valitsemalla \"Laajenna\" kontaktin "
-"oikean napin valikosta"
-
-#: ../pidgin/gtkblist.c:530
+"Kontaktien yhdistäminen tekee niistä yhden, yhdistetyn kontaktin tuttaviin "
+"ja kontakteille käytetään jatkossa vain yhtä keskusteluikkunaa. Ne voidaan "
+"erottaa valitsemalla \"Laajenna\" kontaktin oikean napin valikosta"
+
+#: ../pidgin/gtkblist.c:546
 msgid "_Merge"
 msgstr "_Yhdistä"
 
-#: ../pidgin/gtkblist.c:948
+#: ../pidgin/gtkblist.c:961
 msgid ""
 "Please enter the appropriate information about the chat you would like to "
 "join.\n"
 msgstr "Syötä tiedot ryhmäkeskustelusta, johon haluaisit liittyä.\n"
 
-#: ../pidgin/gtkblist.c:959 ../pidgin/gtkblist.c:6246
-#: ../pidgin/gtkpounce.c:546 ../pidgin/gtkroomlist.c:396
+#: ../pidgin/gtkblist.c:972 ../pidgin/gtkblist.c:6589
+#: ../pidgin/gtkpounce.c:554 ../pidgin/gtkroomlist.c:709
 msgid "_Account:"
 msgstr "_Käyttäjätili:"
 
-#: ../pidgin/gtkblist.c:1248 ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
+#: ../pidgin/gtkblist.c:1261 ../pidgin/gtkprivacy.c:605
+#: ../pidgin/gtkprivacy.c:619
 msgid "_Block"
 msgstr "_Estä"
 
-#: ../pidgin/gtkblist.c:1248
+#: ../pidgin/gtkblist.c:1261
 msgid "Un_block"
 msgstr "_Poista esto"
 
-#: ../pidgin/gtkblist.c:1291
+#: ../pidgin/gtkblist.c:1304
 msgid "Move to"
 msgstr "Siirrä"
 
-#: ../pidgin/gtkblist.c:1331
+#: ../pidgin/gtkblist.c:1344
 msgid "Get _Info"
 msgstr "Hae _tiedot"
 
-#: ../pidgin/gtkblist.c:1334 ../pidgin/pidginstock.c:90
+#: ../pidgin/gtkblist.c:1347 ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_Pikaviesti"
 
-#: ../pidgin/gtkblist.c:1340
+#: ../pidgin/gtkblist.c:1353
 msgid "_Send File..."
 msgstr "_Lähetä tiedosto..."
 
-#: ../pidgin/gtkblist.c:1347
+#: ../pidgin/gtkblist.c:1360
 msgid "Add Buddy _Pounce..."
 msgstr "Lisää tuttava_ilmoitin..."
 
-#: ../pidgin/gtkblist.c:1352 ../pidgin/gtkblist.c:1356
-#: ../pidgin/gtkblist.c:1471 ../pidgin/gtkblist.c:1494
+#: ../pidgin/gtkblist.c:1365 ../pidgin/gtkblist.c:1369
+#: ../pidgin/gtkblist.c:1484 ../pidgin/gtkblist.c:1507
 msgid "View _Log"
 msgstr "Näytä _loki"
 
-#: ../pidgin/gtkblist.c:1362
+#: ../pidgin/gtkblist.c:1375
 msgid "Hide when offline"
 msgstr "Piilota kun poissa linjoilta"
 
-#: ../pidgin/gtkblist.c:1362
+#: ../pidgin/gtkblist.c:1375
 msgid "Show when offline"
 msgstr "Näytä kun poissa linjoilta"
 
-#: ../pidgin/gtkblist.c:1376 ../pidgin/gtkblist.c:1385
-#: ../pidgin/gtkblist.c:1479 ../pidgin/gtkblist.c:1500
+#: ../pidgin/gtkblist.c:1389 ../pidgin/gtkblist.c:1398
+#: ../pidgin/gtkblist.c:1492 ../pidgin/gtkblist.c:1513
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1379 ../pidgin/gtkblist.c:1387
-#: ../pidgin/gtkblist.c:1481 ../pidgin/gtkblist.c:1502
+#: ../pidgin/gtkblist.c:1392 ../pidgin/gtkblist.c:1400
+#: ../pidgin/gtkblist.c:1494 ../pidgin/gtkblist.c:1515
 msgid "_Remove"
 msgstr "_Poista"
 
-#: ../pidgin/gtkblist.c:1437
+#: ../pidgin/gtkblist.c:1450
 msgid "Add _Buddy..."
 msgstr "Lisää _tuttava..."
 
-#: ../pidgin/gtkblist.c:1440
+#: ../pidgin/gtkblist.c:1453
 msgid "Add C_hat..."
 msgstr "Lisää ry_hmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:1443
+#: ../pidgin/gtkblist.c:1456
 msgid "_Delete Group"
 msgstr "_Poista ryhmä"
 
-#: ../pidgin/gtkblist.c:1445
+#: ../pidgin/gtkblist.c:1458
 msgid "_Rename"
 msgstr "Nimeä _uudelleen"
 
 #. join button
-#: ../pidgin/gtkblist.c:1465 ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460 ../pidgin/pidginstock.c:88
+#: ../pidgin/gtkblist.c:1478 ../pidgin/gtkroomlist.c:316
+#: ../pidgin/gtkroomlist.c:773 ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Liity"
 
-#: ../pidgin/gtkblist.c:1467
+#: ../pidgin/gtkblist.c:1480
 msgid "Auto-Join"
 msgstr "Liity automaattisesti"
 
-#: ../pidgin/gtkblist.c:1469
+#: ../pidgin/gtkblist.c:1482
 msgid "Persistent"
 msgstr "Pysyvä"
 
-#: ../pidgin/gtkblist.c:1507 ../pidgin/gtkblist.c:1530
+#: ../pidgin/gtkblist.c:1520 ../pidgin/gtkblist.c:1543
 msgid "_Collapse"
 msgstr "_Pienennä"
 
-#: ../pidgin/gtkblist.c:1535
+#: ../pidgin/gtkblist.c:1548
 msgid "_Expand"
 msgstr "_Laajenna"
 
-#: ../pidgin/gtkblist.c:1786 ../pidgin/gtkblist.c:1798
-#: ../pidgin/gtkblist.c:4933 ../pidgin/gtkblist.c:4946
+#: ../pidgin/gtkblist.c:1799 ../pidgin/gtkblist.c:1811
+#: ../pidgin/gtkblist.c:5254 ../pidgin/gtkblist.c:5267
 msgid "/Tools/Mute Sounds"
 msgstr "/Työkalut/Vaimenna äänet"
 
-#: ../pidgin/gtkblist.c:2258 ../pidgin/gtkconv.c:4919
+#: ../pidgin/gtkblist.c:2271 ../pidgin/gtkconv.c:4922
 #: ../pidgin/gtkpounce.c:437
 msgid ""
 "You are not currently signed on with an account that can add that buddy."
@@ -13877,138 +14084,138 @@
 "tuttavan."
 
 #. Buddies menu
-#: ../pidgin/gtkblist.c:3070
+#: ../pidgin/gtkblist.c:3103
 msgid "/_Buddies"
 msgstr "/_Tuttavat"
 
-#: ../pidgin/gtkblist.c:3071
+#: ../pidgin/gtkblist.c:3104
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Tuttavat/Uusi _pikaviesti..."
 
-#: ../pidgin/gtkblist.c:3072
+#: ../pidgin/gtkblist.c:3105
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Tuttavat/Liity _ryhmäkeskusteluun..."
 
-#: ../pidgin/gtkblist.c:3073
+#: ../pidgin/gtkblist.c:3106
 msgid "/Buddies/Get User _Info..."
 msgstr "/Tuttavat/Hae _käyttäjätiedot..."
 
-#: ../pidgin/gtkblist.c:3074
+#: ../pidgin/gtkblist.c:3107
 msgid "/Buddies/View User _Log..."
 msgstr "/Tuttavat/Näytä käyttäjä_loki..."
 
-#: ../pidgin/gtkblist.c:3076
+#: ../pidgin/gtkblist.c:3109
 msgid "/Buddies/Sh_ow"
 msgstr "/Tuttavat/Nä_ytä"
 
-#: ../pidgin/gtkblist.c:3077
+#: ../pidgin/gtkblist.c:3110
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Tuttavat/Näytä/_Poissaolevat tuttavat"
 
-#: ../pidgin/gtkblist.c:3078
+#: ../pidgin/gtkblist.c:3111
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Tuttavat/Näytä/_Tyhjät ryhmät"
 
-#: ../pidgin/gtkblist.c:3079
+#: ../pidgin/gtkblist.c:3112
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Tuttavat/Näytä/Tuttavien tie_dot"
 
-#: ../pidgin/gtkblist.c:3080
+#: ../pidgin/gtkblist.c:3113
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Tuttavat/Näytä/_Joutenoloajat"
 
-#: ../pidgin/gtkblist.c:3081
+#: ../pidgin/gtkblist.c:3114
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Tuttavat/Näytä/_Yhteyskäytäntökuvakkeet"
 
-#: ../pidgin/gtkblist.c:3082
+#: ../pidgin/gtkblist.c:3115
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Tuttavat/L_ajittele tuttavat"
 
-#: ../pidgin/gtkblist.c:3084
+#: ../pidgin/gtkblist.c:3117
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Tuttavat/_Lisää tuttava..."
 
-#: ../pidgin/gtkblist.c:3085
+#: ../pidgin/gtkblist.c:3118
 msgid "/Buddies/Add C_hat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:3086
+#: ../pidgin/gtkblist.c:3119
 msgid "/Buddies/Add _Group..."
 msgstr "/Tuttavat/Lisää _ryhmä..."
 
-#: ../pidgin/gtkblist.c:3088
+#: ../pidgin/gtkblist.c:3121
 msgid "/Buddies/_Quit"
 msgstr "/Tuttavat/_Lopeta"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3091
+#: ../pidgin/gtkblist.c:3124
 msgid "/_Accounts"
 msgstr "/_Käyttäjätilit"
 
-#: ../pidgin/gtkblist.c:3092 ../pidgin/gtkblist.c:6948
+#: ../pidgin/gtkblist.c:3125 ../pidgin/gtkblist.c:7291
 msgid "/Accounts/Manage"
 msgstr "/Käyttäjätilit/Hallinta"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3095
+#: ../pidgin/gtkblist.c:3128
 msgid "/_Tools"
 msgstr "/T_yökalut"
 
-#: ../pidgin/gtkblist.c:3096
+#: ../pidgin/gtkblist.c:3129
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Työkalut/Tuttava_ilmoittimet"
 
-#: ../pidgin/gtkblist.c:3097
+#: ../pidgin/gtkblist.c:3130
 msgid "/Tools/_Certificates"
 msgstr "/Työkalut/_Varmenteet"
 
-#: ../pidgin/gtkblist.c:3098
+#: ../pidgin/gtkblist.c:3131
 msgid "/Tools/Plu_gins"
 msgstr "/Työkalut/_Liitännäiset"
 
-#: ../pidgin/gtkblist.c:3099
+#: ../pidgin/gtkblist.c:3132
 msgid "/Tools/Pr_eferences"
 msgstr "/Työkalut/A_setukset"
 
-#: ../pidgin/gtkblist.c:3100
+#: ../pidgin/gtkblist.c:3133
 msgid "/Tools/Pr_ivacy"
 msgstr "/Työkalut/Yks_ityisyys"
 
-#: ../pidgin/gtkblist.c:3102
+#: ../pidgin/gtkblist.c:3135
 msgid "/Tools/_File Transfers"
 msgstr "/Työkalut/_Tiedostonsiirrot..."
 
-#: ../pidgin/gtkblist.c:3103
+#: ../pidgin/gtkblist.c:3136
 msgid "/Tools/R_oom List"
-msgstr "/Työkalut/Huone_lista"
-
-#: ../pidgin/gtkblist.c:3104
+msgstr "/Työkalut/Huone_luettelo"
+
+#: ../pidgin/gtkblist.c:3137
 msgid "/Tools/System _Log"
 msgstr "/Työkalut/Järjestelmä_loki"
 
-#: ../pidgin/gtkblist.c:3106
+#: ../pidgin/gtkblist.c:3139
 msgid "/Tools/Mute _Sounds"
 msgstr "/Työkalut/Vaimenna _äänet"
 
 #. Help
-#: ../pidgin/gtkblist.c:3108
+#: ../pidgin/gtkblist.c:3141
 msgid "/_Help"
 msgstr "/O_hje"
 
-#: ../pidgin/gtkblist.c:3109
+#: ../pidgin/gtkblist.c:3142
 msgid "/Help/Online _Help"
 msgstr "/Ohje/O_hjeita verkossa"
 
-#: ../pidgin/gtkblist.c:3110
+#: ../pidgin/gtkblist.c:3143
 msgid "/Help/_Debug Window"
 msgstr "/Ohje/_Virheenjäljitysikkuna"
 
-#: ../pidgin/gtkblist.c:3112 ../pidgin/gtkblist.c:3114
+#: ../pidgin/gtkblist.c:3145 ../pidgin/gtkblist.c:3147
 msgid "/Help/_About"
 msgstr "/Ohje/Tietoj_a"
 
-#: ../pidgin/gtkblist.c:3143
+#: ../pidgin/gtkblist.c:3176
 #, c-format
 msgid ""
 "\n"
@@ -14017,78 +14224,78 @@
 "\n"
 "<b>Käyttäjätili:</b> %s"
 
-#: ../pidgin/gtkblist.c:3221
+#: ../pidgin/gtkblist.c:3254
 msgid "Buddy Alias"
 msgstr "Tuttavan lempinimi"
 
-#: ../pidgin/gtkblist.c:3250
+#: ../pidgin/gtkblist.c:3283
 msgid "Logged In"
 msgstr "Kirjautumisesta aikaa"
 
-#: ../pidgin/gtkblist.c:3296
+#: ../pidgin/gtkblist.c:3329
 msgid "Last Seen"
 msgstr "Näkemisestä aikaa"
 
-#: ../pidgin/gtkblist.c:3317
+#: ../pidgin/gtkblist.c:3350
 msgid "Spooky"
 msgstr "Aavemainen"
 
-#: ../pidgin/gtkblist.c:3319
+#: ../pidgin/gtkblist.c:3352
 msgid "Awesome"
 msgstr "Mahtava"
 
-#: ../pidgin/gtkblist.c:3321
+#: ../pidgin/gtkblist.c:3354
 msgid "Rockin'"
 msgstr "Rokkaava"
 
-#: ../pidgin/gtkblist.c:3660
+#: ../pidgin/gtkblist.c:3693
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Jouten %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3662
+#: ../pidgin/gtkblist.c:3695
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Jouten %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3664
+#: ../pidgin/gtkblist.c:3697
 #, c-format
 msgid "Idle %dm"
 msgstr "Jouten %dm"
 
-#: ../pidgin/gtkblist.c:3818
+#: ../pidgin/gtkblist.c:3851
 msgid "/Buddies/New Instant Message..."
 msgstr "/Tuttavat/Uusi pikaviesti..."
 
-#: ../pidgin/gtkblist.c:3819 ../pidgin/gtkblist.c:3852
+#: ../pidgin/gtkblist.c:3852 ../pidgin/gtkblist.c:3885
 msgid "/Buddies/Join a Chat..."
 msgstr "/Tuttavat/Liity ryhmäkeskusteluun..."
 
-#: ../pidgin/gtkblist.c:3820
+#: ../pidgin/gtkblist.c:3853
 msgid "/Buddies/Get User Info..."
 msgstr "/Tuttavat/Hae käyttäjätiedot..."
 
-#: ../pidgin/gtkblist.c:3821
+#: ../pidgin/gtkblist.c:3854
 msgid "/Buddies/Add Buddy..."
 msgstr "/Tuttavat/Lisää tuttava..."
 
-#: ../pidgin/gtkblist.c:3822 ../pidgin/gtkblist.c:3855
+#: ../pidgin/gtkblist.c:3855 ../pidgin/gtkblist.c:3888
 msgid "/Buddies/Add Chat..."
 msgstr "/Tuttavat/Lisää ryhmäkeskustelu..."
 
-#: ../pidgin/gtkblist.c:3823
+#: ../pidgin/gtkblist.c:3856
 msgid "/Buddies/Add Group..."
 msgstr "/Tuttavat/Lisää ryhmä..."
 
-#: ../pidgin/gtkblist.c:3858
+#: ../pidgin/gtkblist.c:3891
 msgid "/Tools/Privacy"
 msgstr "/Työkalut/Yksityisyys"
 
-#: ../pidgin/gtkblist.c:3861
+#: ../pidgin/gtkblist.c:3894
 msgid "/Tools/Room List"
-msgstr "/Työkalut/Huonelista"
-
-#: ../pidgin/gtkblist.c:3993 ../pidgin/gtkdocklet.c:155
+msgstr "/Työkalut/Huoneluettelo"
+
+#: ../pidgin/gtkblist.c:4026 ../pidgin/gtkdocklet.c:155
 #: ../pidgin/gtkdocklet.c:160
 #, c-format
 msgid "%d unread message from %s\n"
@@ -14096,46 +14303,69 @@
 msgstr[0] "%d lukematon viesti käyttäjältä %s\n"
 msgstr[1] "%d lukematonta viestiä käyttäjältä %s\n"
 
-#: ../pidgin/gtkblist.c:4153
+#: ../pidgin/gtkblist.c:4189
 msgid "Manually"
 msgstr "Käsin"
 
-#: ../pidgin/gtkblist.c:4156
+#: ../pidgin/gtkblist.c:4192
 msgid "By status"
 msgstr "Tilan mukaan"
 
-#: ../pidgin/gtkblist.c:4157
+#: ../pidgin/gtkblist.c:4193
 msgid "By log size"
 msgstr "Lokin koon mukaan"
 
-#: ../pidgin/gtkblist.c:4362 ../pidgin/gtkconn.c:180
+#: ../pidgin/gtkblist.c:4492
 #, c-format
 msgid "%s disconnected"
 msgstr "Yhteys katkennut kohteeseen %s"
 
-#: ../pidgin/gtkblist.c:4397
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s kirjautui ulos: %s</span>"
-
-#: ../pidgin/gtkblist.c:4549
+#: ../pidgin/gtkblist.c:4494
+#, c-format
+msgid "%s disabled"
+msgstr "%s pois käytöstä"
+
+#: ../pidgin/gtkblist.c:4498
+msgid "Reconnect"
+msgstr "Uudelleenyhdistä"
+
+#: ../pidgin/gtkblist.c:4498 ../pidgin/gtkblist.c:4606
+msgid "Re-enable"
+msgstr "Ota uudelleen käyttöön"
+
+#: ../pidgin/gtkblist.c:4502 ../pidgin/gtkblist.c:4609
+#: ../pidgin/gtkconv.c:1679
+msgid "Ignore"
+msgstr "Jätä huomiotta"
+
+#: ../pidgin/gtkblist.c:4633
+#, c-format
+msgid "%d account was disabled because you signed on from another location."
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location."
+msgstr[0] ""
+"%d tili poistettiin käytöstä koska toisesta paikasta kirjauduttiin sisään."
+msgstr[1] ""
+"%d tiliä poistettiin käytöstä koska toisesta paikasta kirjauduttiin sisään."
+
+#: ../pidgin/gtkblist.c:4860
 msgid "<b>Username:</b>"
 msgstr "<b>Käyttäjänimi:</b>"
 
-#: ../pidgin/gtkblist.c:4556
+#: ../pidgin/gtkblist.c:4867
 msgid "<b>Password:</b>"
 msgstr "<b>Salasana:</b>"
 
-#: ../pidgin/gtkblist.c:4567
+#: ../pidgin/gtkblist.c:4878
 msgid "_Login"
 msgstr "_Sisäänkirjautuminen"
 
-#: ../pidgin/gtkblist.c:4650
+#: ../pidgin/gtkblist.c:4963
 msgid "/Accounts"
 msgstr "/Käyttäjätilit"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4664
+#: ../pidgin/gtkblist.c:4977
 #, c-format
 msgid ""
 "<span weight='bold' size='larger'>Welcome to %s!</span>\n"
@@ -14154,55 +14384,55 @@
 #. set the Show Offline Buddies option. must be done
 #. * after the treeview or faceprint gets mad. -Robot101
 #.
-#: ../pidgin/gtkblist.c:4927
+#: ../pidgin/gtkblist.c:5248
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Tuttavat/Näytä/Poissaolevat tuttavat"
 
-#: ../pidgin/gtkblist.c:4930
+#: ../pidgin/gtkblist.c:5251
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Tuttavat/Näytä/Tyhjät ryhmät"
 
-#: ../pidgin/gtkblist.c:4936
+#: ../pidgin/gtkblist.c:5257
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Tuttavat/Näytä/Tuttavien tiedot"
 
-#: ../pidgin/gtkblist.c:4939
+#: ../pidgin/gtkblist.c:5260
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Tuttavat/Näytä/Joutenoloajat"
 
-#: ../pidgin/gtkblist.c:4942
+#: ../pidgin/gtkblist.c:5263
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Tuttavat/Näytä/Yhteyskäytäntökuvakkeet"
 
-#: ../pidgin/gtkblist.c:5854
+#: ../pidgin/gtkblist.c:6195
 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 ""
-"Syötä sen henkilön näyttönimi, jonka haluat lisätä tuttavalistalle. Voit "
-"myös valita lempinimen tuttavalle. Lempinimi näytetään näyttönimen sijasta "
-"aina kuin mahdollista.\n"
+"Syötä sen henkilön näyttönimi, jonka haluat lisätä tuttaviisi. Voit myös "
+"valita lempinimen tuttavalle. Lempinimi näytetään näyttönimen sijasta aina "
+"kuin mahdollista.\n"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:5877
+#: ../pidgin/gtkblist.c:6218
 msgid "A_ccount:"
 msgstr "_Käyttäjätili:"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5889
+#: ../pidgin/gtkblist.c:6230
 msgid "_Screen name:"
 msgstr "_Näyttönimi:"
 
-#: ../pidgin/gtkblist.c:5911 ../pidgin/gtkblist.c:6267
+#: ../pidgin/gtkblist.c:6252 ../pidgin/gtkblist.c:6610
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:6179
+#: ../pidgin/gtkblist.c:6520
 msgid "This protocol does not support chat rooms."
 msgstr "Tämä yhteyskäytäntö ei tue keskusteluhuoneita."
 
-#: ../pidgin/gtkblist.c:6195
+#: ../pidgin/gtkblist.c:6536
 msgid ""
 "You are not currently signed on with any protocols that have the ability to "
 "chat."
@@ -14210,76 +14440,63 @@
 "Et ole kirjautuneena millään yhteyskäytännöllä jolla voisi käyttää "
 "ryhmäkeskustelua."
 
-#: ../pidgin/gtkblist.c:6236
+#: ../pidgin/gtkblist.c:6579
 msgid ""
 "Please enter an alias, and the appropriate information about the chat you "
 "would like to add to your buddy list.\n"
 msgstr ""
 "Anna lempinimi, ja tiedot ryhmäkeskustelusta jonka haluat lisätä "
-"tuttavalistalle.\n"
-
-#: ../pidgin/gtkblist.c:6295
+"tuttaviisi.\n"
+
+#: ../pidgin/gtkblist.c:6638
 msgid "Autojoin when account becomes online."
 msgstr "Liity automaattisesti kun käyttäjätili pääsee linjoille."
 
-#: ../pidgin/gtkblist.c:6296
+#: ../pidgin/gtkblist.c:6639
 msgid "Hide chat when the window is closed."
 msgstr "Piilota ryhmäkeskustelu kun ikkuna on suljettu."
 
-#: ../pidgin/gtkblist.c:6322
+#: ../pidgin/gtkblist.c:6665
 msgid "Please enter the name of the group to be added."
 msgstr "Anna lisättävän ryhmän nimi."
 
-#: ../pidgin/gtkblist.c:6968
+#: ../pidgin/gtkblist.c:7311
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Käyttäjätilit/"
 
-#: ../pidgin/gtkblist.c:6992
+#: ../pidgin/gtkblist.c:7335
 msgid "_Edit Account"
 msgstr "_Muokkaa käyttäjätiliä"
 
-#: ../pidgin/gtkblist.c:7005 ../pidgin/gtkconv.c:3143
+#: ../pidgin/gtkblist.c:7348 ../pidgin/gtkconv.c:3146
 msgid "No actions available"
 msgstr "Ei toimintoja saatavilla."
 
-#: ../pidgin/gtkblist.c:7013
+#: ../pidgin/gtkblist.c:7356
 msgid "_Disable"
 msgstr "_Poista käytöstä"
 
-#: ../pidgin/gtkblist.c:7025
+#: ../pidgin/gtkblist.c:7368
 msgid "Enable Account"
 msgstr "Ota tili käyttöön"
 
-#: ../pidgin/gtkblist.c:7031
+#: ../pidgin/gtkblist.c:7374
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Käyttäjätilit/Ota tili käyttöön"
 
-#: ../pidgin/gtkblist.c:7080
+#: ../pidgin/gtkblist.c:7423
 msgid "/Tools"
 msgstr "/Työkalut"
 
-#: ../pidgin/gtkblist.c:7150
+#: ../pidgin/gtkblist.c:7493
 msgid "/Buddies/Sort Buddies"
 msgstr "/Tuttavat/Lajittele tuttavat"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
+#: ../pidgin/gtkcertmgr.c:531
 msgid "SSL Servers"
 msgstr "SSL-palvelimet"
 
-#: ../pidgin/gtkconn.c:181
-#, 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 ei yritä uudelleenyhdistää käyttäjätiliä kunnes korjaat virheen ja otat "
-"tilin uudelleen käyttöön."
-
 #: ../pidgin/gtkconv.c:524
 msgid "Unknown command."
 msgstr "Tuntematon komento."
@@ -14310,8 +14527,8 @@
 msgid "_Buddy:"
 msgstr "_Tuttava:"
 
-#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1529
+#: ../pidgin/gtkconv.c:931 ../pidgin/gtksavedstatuses.c:1200
+#: ../pidgin/gtksavedstatuses.c:1536
 msgid "_Message:"
 msgstr "_Viesti:"
 
@@ -14324,11 +14541,11 @@
 msgid "Save Conversation"
 msgstr "Tallenna keskustelu"
 
-#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:167 ../pidgin/gtkdebug.c:743
+#: ../pidgin/gtkconv.c:1179 ../pidgin/gtkdebug.c:168 ../pidgin/gtkdebug.c:748
 msgid "Find"
 msgstr "Etsi"
 
-#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:195
+#: ../pidgin/gtkconv.c:1205 ../pidgin/gtkdebug.c:196
 msgid "_Search for:"
 msgstr "_Haettava termi:"
 
@@ -14336,10 +14553,6 @@
 msgid "Un-Ignore"
 msgstr "Huomioi"
 
-#: ../pidgin/gtkconv.c:1679
-msgid "Ignore"
-msgstr "Jätä huomiotta"
-
 #: ../pidgin/gtkconv.c:1699
 msgid "Get Away Message"
 msgstr "Hae poissaoloviesti"
@@ -14478,11 +14691,11 @@
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Valinnat/Näytä aika_leima"
 
-#: ../pidgin/gtkconv.c:3131
+#: ../pidgin/gtkconv.c:3134
 msgid "/Conversation/More"
 msgstr "/Keskustelu/Lisää"
 
-#: ../pidgin/gtkconv.c:3187
+#: ../pidgin/gtkconv.c:3190
 msgid "/Options"
 msgstr "/Valinnat"
 
@@ -14491,233 +14704,233 @@
 #. 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:3222 ../pidgin/gtkconv.c:3254
+#: ../pidgin/gtkconv.c:3225 ../pidgin/gtkconv.c:3257
 msgid "/Conversation"
 msgstr "/Keskustelu"
 
-#: ../pidgin/gtkconv.c:3262
+#: ../pidgin/gtkconv.c:3265
 msgid "/Conversation/View Log"
 msgstr "/Keskustelu/Näytä loki..."
 
-#: ../pidgin/gtkconv.c:3268
+#: ../pidgin/gtkconv.c:3271
 msgid "/Conversation/Send File..."
 msgstr "/Keskustelu/Lähetä tiedosto..."
 
-#: ../pidgin/gtkconv.c:3272
+#: ../pidgin/gtkconv.c:3275
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Keskustelu/Lisää tuttavailmoitin..."
 
-#: ../pidgin/gtkconv.c:3278
+#: ../pidgin/gtkconv.c:3281
 msgid "/Conversation/Get Info"
 msgstr "/Keskustelu/Hae tiedot..."
 
-#: ../pidgin/gtkconv.c:3282
+#: ../pidgin/gtkconv.c:3285
 msgid "/Conversation/Invite..."
 msgstr "/Keskustelu/Kutsu..."
 
-#: ../pidgin/gtkconv.c:3288
+#: ../pidgin/gtkconv.c:3291
 msgid "/Conversation/Alias..."
 msgstr "/Keskustelu/Alias..."
 
-#: ../pidgin/gtkconv.c:3292
+#: ../pidgin/gtkconv.c:3295
 msgid "/Conversation/Block..."
 msgstr "/Keskustelu/Estä..."
 
-#: ../pidgin/gtkconv.c:3296
+#: ../pidgin/gtkconv.c:3299
 msgid "/Conversation/Unblock..."
 msgstr "/Keskustelu/Poista esto..."
 
-#: ../pidgin/gtkconv.c:3300
+#: ../pidgin/gtkconv.c:3303
 msgid "/Conversation/Add..."
 msgstr "/Keskustelu/Lisää..."
 
-#: ../pidgin/gtkconv.c:3304
+#: ../pidgin/gtkconv.c:3307
 msgid "/Conversation/Remove..."
 msgstr "/Keskustelu/Poista..."
 
-#: ../pidgin/gtkconv.c:3310
+#: ../pidgin/gtkconv.c:3313
 msgid "/Conversation/Insert Link..."
 msgstr "/Keskustelu/Lisää linkki..."
 
-#: ../pidgin/gtkconv.c:3314
+#: ../pidgin/gtkconv.c:3317
 msgid "/Conversation/Insert Image..."
 msgstr "/Keskustelu/Lisää kuva..."
 
-#: ../pidgin/gtkconv.c:3320
+#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Logging"
 msgstr "/Valinnat/Lokiinkirjaus"
 
-#: ../pidgin/gtkconv.c:3323
+#: ../pidgin/gtkconv.c:3326
 msgid "/Options/Enable Sounds"
 msgstr "/Valinnat/Soita merkkiäänet"
 
-#: ../pidgin/gtkconv.c:3336
-msgid "/Options/Show Formatting Toolbars"
-msgstr "/Valinnat/Näytä muokkaustyökalurivit"
-
 #: ../pidgin/gtkconv.c:3339
+msgid "/Options/Show Formatting Toolbars"
+msgstr "/Valinnat/Näytä muokkaustyökalurivit"
+
+#: ../pidgin/gtkconv.c:3342
 msgid "/Options/Show Timestamps"
 msgstr "/Valinnat/Näytä aikaleima"
 
-#: ../pidgin/gtkconv.c:3416 ../pidgin/gtkconv.c:3458
+#: ../pidgin/gtkconv.c:3419 ../pidgin/gtkconv.c:3461
 msgid "User is typing..."
 msgstr "Käyttäjä kirjoittaa..."
 
-#: ../pidgin/gtkconv.c:3461
+#: ../pidgin/gtkconv.c:3464
 msgid "User has typed something and stopped"
 msgstr "Käyttäjä kirjoitti jotain ja keskeytti"
 
 #. Build the Send To menu
-#: ../pidgin/gtkconv.c:3645 ../pidgin/gtkconv.c:8180
+#: ../pidgin/gtkconv.c:3648 ../pidgin/gtkconv.c:8248
 msgid "S_end To"
 msgstr "Läh_etä henkilölle"
 
-#: ../pidgin/gtkconv.c:4357
+#: ../pidgin/gtkconv.c:4360
 msgid "_Send"
 msgstr "_Lähetä"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4470
+#: ../pidgin/gtkconv.c:4473
 msgid "0 people in room"
 msgstr "0 ihmistä huoneessa"
 
-#: ../pidgin/gtkconv.c:5843 ../pidgin/gtkconv.c:5964
+#: ../pidgin/gtkconv.c:5846 ../pidgin/gtkconv.c:5967
 #, c-format
 msgid "%d person in room"
 msgid_plural "%d people in room"
 msgstr[0] "%d ihminen huoneessa"
 msgstr[1] "%d ihmistä huoneessa"
 
-#: ../pidgin/gtkconv.c:6571 ../pidgin/gtkstatusbox.c:660
+#: ../pidgin/gtkconv.c:6574 ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Kirjoittaa"
 
-#: ../pidgin/gtkconv.c:6575
+#: ../pidgin/gtkconv.c:6578
 msgid "Stopped Typing"
 msgstr "Lopetti kirjoittamisen"
 
-#: ../pidgin/gtkconv.c:6578
+#: ../pidgin/gtkconv.c:6581
 msgid "Nick Said"
 msgstr "Sanoi"
 
-#: ../pidgin/gtkconv.c:6581 ../pidgin/gtkdocklet.c:685
+#: ../pidgin/gtkconv.c:6584 ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "Lukemattomat viestit"
 
-#: ../pidgin/gtkconv.c:6587
+#: ../pidgin/gtkconv.c:6590
 msgid "New Event"
 msgstr "Uusi tapahtuma"
 
-#: ../pidgin/gtkconv.c:7699
+#: ../pidgin/gtkconv.c:7767
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Tyhjentää kaikki keskustelut"
 
-#: ../pidgin/gtkconv.c:7862
+#: ../pidgin/gtkconv.c:7930
 msgid "Confirm close"
 msgstr "Vahvista sulkeminen"
 
-#: ../pidgin/gtkconv.c:7894
+#: ../pidgin/gtkconv.c:7962
 msgid "You have unread messages. Are you sure you want to close the window?"
 msgstr ""
 "Sinulla on lukemattomia viestejä. Haluatko varmasti sulkea tämän ikkunan?"
 
-#: ../pidgin/gtkconv.c:8513
+#: ../pidgin/gtkconv.c:8581
 msgid "Close other tabs"
 msgstr "Sulje muut välilehdet"
 
-#: ../pidgin/gtkconv.c:8519
+#: ../pidgin/gtkconv.c:8587
 msgid "Close all tabs"
 msgstr "Sulje kaikki välilehdet"
 
-#: ../pidgin/gtkconv.c:8527
+#: ../pidgin/gtkconv.c:8595
 msgid "Detach this tab"
 msgstr "Irrota tämä välilehti"
 
-#: ../pidgin/gtkconv.c:8533
+#: ../pidgin/gtkconv.c:8601
 msgid "Close this tab"
 msgstr "Sulje tämä välilehti"
 
-#: ../pidgin/gtkconv.c:9038
+#: ../pidgin/gtkconv.c:9106
 msgid "Close conversation"
 msgstr "Sulje keskustelu"
 
-#: ../pidgin/gtkconv.c:9640
+#: ../pidgin/gtkconv.c:9708
 msgid "Last created window"
 msgstr "Viimeksi luotu ikkuna"
 
-#: ../pidgin/gtkconv.c:9642
+#: ../pidgin/gtkconv.c:9710
 msgid "Separate IM and Chat windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut eri ikkunoissa"
 
-#: ../pidgin/gtkconv.c:9644 ../pidgin/gtkprefs.c:1509
+#: ../pidgin/gtkconv.c:9712 ../pidgin/gtkprefs.c:1510
 msgid "New window"
 msgstr "Uusi ikkuna"
 
-#: ../pidgin/gtkconv.c:9646
+#: ../pidgin/gtkconv.c:9714
 msgid "By group"
 msgstr "Ryhmän mukaan"
 
-#: ../pidgin/gtkconv.c:9648
+#: ../pidgin/gtkconv.c:9716
 msgid "By account"
 msgstr "Tilin mukaan"
 
-#: ../pidgin/gtkdebug.c:234
+#: ../pidgin/gtkdebug.c:235
 msgid "Save Debug Log"
 msgstr "Tallenna virheenjäljitysloki"
 
-#: ../pidgin/gtkdebug.c:582
+#: ../pidgin/gtkdebug.c:583
 msgid "Invert"
 msgstr "Käännä"
 
-#: ../pidgin/gtkdebug.c:585
+#: ../pidgin/gtkdebug.c:586
 msgid "Highlight matches"
 msgstr "Korosta osumat"
 
-#: ../pidgin/gtkdebug.c:652
+#: ../pidgin/gtkdebug.c:653
 msgid "_Icon Only"
 msgstr "Vain _kuvake"
 
-#: ../pidgin/gtkdebug.c:653
+#: ../pidgin/gtkdebug.c:654
 msgid "_Text Only"
 msgstr "Vain _teksti"
 
-#: ../pidgin/gtkdebug.c:654
+#: ../pidgin/gtkdebug.c:655
 msgid "_Both Icon & Text"
 msgstr "_Sekä kuvake että teksti"
 
-#: ../pidgin/gtkdebug.c:775
+#: ../pidgin/gtkdebug.c:780
 msgid "Filter"
 msgstr "Suodin"
 
-#: ../pidgin/gtkdebug.c:794
+#: ../pidgin/gtkdebug.c:799
 msgid "Right click for more options."
 msgstr "Näytä lisää valintoja oikealla hiiren painikkeella."
 
-#: ../pidgin/gtkdebug.c:824
+#: ../pidgin/gtkdebug.c:829
 msgid "Level "
 msgstr "Taso "
 
-#: ../pidgin/gtkdebug.c:825 ../pidgin/gtkdebug.c:831
+#: ../pidgin/gtkdebug.c:830 ../pidgin/gtkdebug.c:836
 msgid "Select the debug filter level."
 msgstr "Valitse virheenjäljityssuodattimen taso."
 
-#: ../pidgin/gtkdebug.c:833
+#: ../pidgin/gtkdebug.c:838
 msgid "All"
 msgstr "Kaikki"
 
-#: ../pidgin/gtkdebug.c:834
+#: ../pidgin/gtkdebug.c:839
 msgid "Misc"
 msgstr "Muut"
 
-#: ../pidgin/gtkdebug.c:836
+#: ../pidgin/gtkdebug.c:841
 msgid "Warning"
 msgstr "Varoitukset"
 
-#: ../pidgin/gtkdebug.c:837
+#: ../pidgin/gtkdebug.c:842
 msgid "Error "
 msgstr "Virheet "
 
-#: ../pidgin/gtkdebug.c:838
+#: ../pidgin/gtkdebug.c:843
 msgid "Fatal Error"
 msgstr "Vakavat virheet"
 
@@ -14782,7 +14995,7 @@
 msgid "Afrikaans"
 msgstr "afrikaans"
 
-#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:226
+#: ../pidgin/gtkdialogs.c:134 ../pidgin/gtkdialogs.c:227
 msgid "Arabic"
 msgstr "arabia"
 
@@ -14791,7 +15004,7 @@
 msgstr "valkovenäjä latinalainen"
 
 #: ../pidgin/gtkdialogs.c:136 ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
+#: ../pidgin/gtkdialogs.c:228
 msgid "Bulgarian"
 msgstr "bulgaria"
 
@@ -14804,8 +15017,8 @@
 msgid "Bosnian"
 msgstr "bosnia"
 
-#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:143 ../pidgin/gtkdialogs.c:229
+#: ../pidgin/gtkdialogs.c:230
 msgid "Catalan"
 msgstr "katalaani"
 
@@ -14813,7 +15026,7 @@
 msgid "Valencian-Catalan"
 msgstr "valencian katalaani"
 
-#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:230
+#: ../pidgin/gtkdialogs.c:146 ../pidgin/gtkdialogs.c:231
 msgid "Czech"
 msgstr "tšekki"
 
@@ -14822,7 +15035,7 @@
 msgstr "tanska"
 
 #: ../pidgin/gtkdialogs.c:149 ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
+#: ../pidgin/gtkdialogs.c:232
 msgid "German"
 msgstr "saksa"
 
@@ -14851,9 +15064,9 @@
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233 ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:160 ../pidgin/gtkdialogs.c:233
+#: ../pidgin/gtkdialogs.c:234 ../pidgin/gtkdialogs.c:235
+#: ../pidgin/gtkdialogs.c:236
 msgid "Spanish"
 msgstr "espanja"
 
@@ -14870,19 +15083,19 @@
 msgid "Persian"
 msgstr "persia"
 
-#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:167 ../pidgin/gtkdialogs.c:237
+#: ../pidgin/gtkdialogs.c:238
 msgid "Finnish"
 msgstr "suomi"
 
-#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239 ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:168 ../pidgin/gtkdialogs.c:239
+#: ../pidgin/gtkdialogs.c:240 ../pidgin/gtkdialogs.c:241
+#: ../pidgin/gtkdialogs.c:242
 msgid "French"
 msgstr "ranska"
 
 #: ../pidgin/gtkdialogs.c:169 ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
+#: ../pidgin/gtkdialogs.c:243
 msgid "Galician"
 msgstr "galego"
 
@@ -14894,7 +15107,7 @@
 msgid "Gujarati Language Team"
 msgstr "Gujaratin kääntäjäryhmä"
 
-#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:243
+#: ../pidgin/gtkdialogs.c:173 ../pidgin/gtkdialogs.c:244
 msgid "Hebrew"
 msgstr "heprea"
 
@@ -14902,7 +15115,7 @@
 msgid "Hindi"
 msgstr "hindi"
 
-#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:244
+#: ../pidgin/gtkdialogs.c:175 ../pidgin/gtkdialogs.c:245
 msgid "Hungarian"
 msgstr "unkari"
 
@@ -14910,16 +15123,16 @@
 msgid "Indonesian"
 msgstr "indonesia"
 
-#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:245
+#: ../pidgin/gtkdialogs.c:177 ../pidgin/gtkdialogs.c:246
 msgid "Italian"
 msgstr "italia"
 
-#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247 ../pidgin/gtkdialogs.c:248
+#: ../pidgin/gtkdialogs.c:178 ../pidgin/gtkdialogs.c:247
+#: ../pidgin/gtkdialogs.c:248 ../pidgin/gtkdialogs.c:249
 msgid "Japanese"
 msgstr "japani"
 
-#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:249
+#: ../pidgin/gtkdialogs.c:179 ../pidgin/gtkdialogs.c:250
 msgid "Georgian"
 msgstr "georgia"
 
@@ -14935,8 +15148,8 @@
 msgid "Kannada Translation team"
 msgstr "Kannadan kääntäjäryhmä"
 
-#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:181 ../pidgin/gtkdialogs.c:251
+#: ../pidgin/gtkdialogs.c:252
 msgid "Korean"
 msgstr "korea"
 
@@ -14949,18 +15162,18 @@
 msgid "Lao"
 msgstr "lao"
 
-#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:186 ../pidgin/gtkdialogs.c:253
+#: ../pidgin/gtkdialogs.c:254
 msgid "Lithuanian"
 msgstr "liettua"
 
 #: ../pidgin/gtkdialogs.c:187 ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:254
+#: ../pidgin/gtkdialogs.c:189 ../pidgin/gtkdialogs.c:255
 msgid "Macedonian"
 msgstr "makedonia"
 
-#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:190 ../pidgin/gtkdialogs.c:256
+#: ../pidgin/gtkdialogs.c:257
 msgid "Bokmål Norwegian"
 msgstr "kirjanorja"
 
@@ -14976,104 +15189,108 @@
 msgid "Norwegian Nynorsk"
 msgstr "norja (uusnorja)"
 
-#: ../pidgin/gtkdialogs.c:194 ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196 ../pidgin/gtkdialogs.c:257
+#: ../pidgin/gtkdialogs.c:194
+msgid "Punjabi"
+msgstr "punjabi"
+
+#: ../pidgin/gtkdialogs.c:195 ../pidgin/gtkdialogs.c:196
+#: ../pidgin/gtkdialogs.c:197 ../pidgin/gtkdialogs.c:258
 msgid "Polish"
 msgstr "puola"
 
-#: ../pidgin/gtkdialogs.c:197
+#: ../pidgin/gtkdialogs.c:198
 msgid "Portuguese"
 msgstr "portugali"
 
-#: ../pidgin/gtkdialogs.c:198
+#: ../pidgin/gtkdialogs.c:199
 msgid "Portuguese-Brazil"
 msgstr "portugali (brasilialainen)"
 
-#: ../pidgin/gtkdialogs.c:199
+#: ../pidgin/gtkdialogs.c:200
 msgid "Pashto"
 msgstr "paštu"
 
-#: ../pidgin/gtkdialogs.c:200
+#: ../pidgin/gtkdialogs.c:201
 msgid "Romanian"
 msgstr "romania"
 
-#: ../pidgin/gtkdialogs.c:201 ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:259
+#: ../pidgin/gtkdialogs.c:260
 msgid "Russian"
 msgstr "venäjä"
 
-#: ../pidgin/gtkdialogs.c:202 ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260 ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:203 ../pidgin/gtkdialogs.c:204
+#: ../pidgin/gtkdialogs.c:261 ../pidgin/gtkdialogs.c:262
+#: ../pidgin/gtkdialogs.c:263
 msgid "Slovak"
 msgstr "slovakki"
 
-#: ../pidgin/gtkdialogs.c:204 ../pidgin/gtkdialogs.c:263
+#: ../pidgin/gtkdialogs.c:205 ../pidgin/gtkdialogs.c:264
 msgid "Slovenian"
 msgstr "sloveeni"
 
-#: ../pidgin/gtkdialogs.c:205
+#: ../pidgin/gtkdialogs.c:206
 msgid "Albanian"
 msgstr "albania"
 
-#: ../pidgin/gtkdialogs.c:206 ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264 ../pidgin/gtkdialogs.c:265
+#: ../pidgin/gtkdialogs.c:207 ../pidgin/gtkdialogs.c:208
+#: ../pidgin/gtkdialogs.c:265 ../pidgin/gtkdialogs.c:266
 msgid "Serbian"
 msgstr "serbia"
 
-#: ../pidgin/gtkdialogs.c:208 ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:209 ../pidgin/gtkdialogs.c:267
+#: ../pidgin/gtkdialogs.c:268
 msgid "Swedish"
 msgstr "ruotsi"
 
-#: ../pidgin/gtkdialogs.c:209
-msgid "Tamil"
-msgstr "tamil"
-
 #: ../pidgin/gtkdialogs.c:210
+msgid "Tamil"
+msgstr "tamil"
+
+#: ../pidgin/gtkdialogs.c:211
 msgid "Telugu"
 msgstr "telugu"
 
-#: ../pidgin/gtkdialogs.c:211
+#: ../pidgin/gtkdialogs.c:212
 msgid "Thai"
 msgstr "thai"
 
-#: ../pidgin/gtkdialogs.c:212 ../pidgin/gtkdialogs.c:268
+#: ../pidgin/gtkdialogs.c:213 ../pidgin/gtkdialogs.c:269
 msgid "Turkish"
 msgstr "turkki"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:214
 msgid "Vietnamese"
 msgstr "vietnam"
 
-#: ../pidgin/gtkdialogs.c:213
+#: ../pidgin/gtkdialogs.c:214
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M Thanh ja Gnomen Vi-työryhmä"
 
-#: ../pidgin/gtkdialogs.c:214 ../pidgin/gtkdialogs.c:269
+#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:270
 msgid "Simplified Chinese"
 msgstr "kiina (yksinkertaistettu)"
 
-#: ../pidgin/gtkdialogs.c:215 ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:216 ../pidgin/gtkdialogs.c:217
+#: ../pidgin/gtkdialogs.c:218
 msgid "Hong Kong Chinese"
 msgstr "Hong Kongin kiina"
 
-#: ../pidgin/gtkdialogs.c:218 ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
+#: ../pidgin/gtkdialogs.c:219 ../pidgin/gtkdialogs.c:220
+#: ../pidgin/gtkdialogs.c:271
 msgid "Traditional Chinese"
 msgstr "kiina (perinteinen)"
 
-#: ../pidgin/gtkdialogs.c:225
+#: ../pidgin/gtkdialogs.c:226
 msgid "Amharic"
 msgstr "amhara"
 
-#: ../pidgin/gtkdialogs.c:357
+#: ../pidgin/gtkdialogs.c:369
 #, c-format
 msgid "About %s"
 msgstr "Tietoja %sistä"
 
-#: ../pidgin/gtkdialogs.c:400
+#: ../pidgin/gtkdialogs.c:412
 #, c-format
 msgid ""
 "%s is a graphical modular messaging client based on libpurple which is "
@@ -15097,101 +15314,105 @@
 "luettelo osallistuneista löytyy \"COPYRIGHT\"-tiedostosta. Tekijät eivät "
 "anna ohjelmalle minkäänlaista takuuta.<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:418
+#: ../pidgin/gtkdialogs.c:430
 #, c-format
 msgid "<FONT SIZE=\"4\">IRC:</FONT> #pidgin on irc.freenode.net<BR><BR>"
 msgstr ""
 "<FONT SIZE=\"4\">IRC:</FONT> #pidgin palvelimella irc.freenode.net<BR><BR>"
 
-#: ../pidgin/gtkdialogs.c:423
+#: ../pidgin/gtkdialogs.c:435
 msgid "Current Developers"
 msgstr "Nykyiset kehittäjät"
 
-#: ../pidgin/gtkdialogs.c:438
+#: ../pidgin/gtkdialogs.c:450
 msgid "Crazy Patch Writers"
 msgstr "Villit korjauspäivitysten kirjoittajat"
 
-#: ../pidgin/gtkdialogs.c:453
+#: ../pidgin/gtkdialogs.c:465
 msgid "Retired Developers"
 msgstr "Lopettaneet kehittäjät"
 
-#: ../pidgin/gtkdialogs.c:468
+#: ../pidgin/gtkdialogs.c:480
 msgid "Retired Crazy Patch Writers"
 msgstr "Lopettaneet korjauspäivitysten kirjoittajat"
 
-#: ../pidgin/gtkdialogs.c:483
+#: ../pidgin/gtkdialogs.c:495
 msgid "Artists"
 msgstr "Graafikot"
 
-#: ../pidgin/gtkdialogs.c:498
+#: ../pidgin/gtkdialogs.c:510
 msgid "Current Translators"
 msgstr "Nykyiset kielenkääntäjät"
 
-#: ../pidgin/gtkdialogs.c:518
+#: ../pidgin/gtkdialogs.c:530
 msgid "Past Translators"
 msgstr "Aikaisemmat kielenkääntäjät"
 
-#: ../pidgin/gtkdialogs.c:536
+#: ../pidgin/gtkdialogs.c:548
 msgid "Debugging Information"
 msgstr "Virheenjäljitystietoja"
 
-#: ../pidgin/gtkdialogs.c:753 ../pidgin/gtkdialogs.c:892
-#: ../pidgin/gtkdialogs.c:973
+#: ../pidgin/gtkdialogs.c:765 ../pidgin/gtkdialogs.c:908
+#: ../pidgin/gtkdialogs.c:989
 msgid "_Name"
 msgstr "_Nimi"
 
-#: ../pidgin/gtkdialogs.c:758 ../pidgin/gtkdialogs.c:897
-#: ../pidgin/gtkdialogs.c:978
+#: ../pidgin/gtkdialogs.c:770
+msgid "Buddy"
+msgstr "Tuttava"
+
+#: ../pidgin/gtkdialogs.c:774 ../pidgin/gtkdialogs.c:913
+#: ../pidgin/gtkdialogs.c:994
 msgid "_Account"
 msgstr "_Käyttäjätili"
 
-#: ../pidgin/gtkdialogs.c:905
+#: ../pidgin/gtkdialogs.c:921
 msgid "Get User Info"
 msgstr "Hae käyttäjätiedot"
 
-#: ../pidgin/gtkdialogs.c:907
+#: ../pidgin/gtkdialogs.c:923
 msgid ""
 "Please enter the screen name or alias of the person whose info you would "
 "like to view."
 msgstr ""
 "Syötä sen henkilön näyttönimi tai lempinimi, jonka tiedot haluat nähdä."
 
-#: ../pidgin/gtkdialogs.c:997
+#: ../pidgin/gtkdialogs.c:1013
 msgid "View User Log"
 msgstr "Näytä käyttäjäloki"
 
-#: ../pidgin/gtkdialogs.c:999
+#: ../pidgin/gtkdialogs.c:1015
 msgid ""
 "Please enter the screen name or alias of the person whose log you would like "
 "to view."
 msgstr "Syötä sen henkilön näyttönimi jonka lokia haluat katsella."
 
-#: ../pidgin/gtkdialogs.c:1019
+#: ../pidgin/gtkdialogs.c:1035
 msgid "Alias Contact"
 msgstr "Anna kontaktiryhmälle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1020
+#: ../pidgin/gtkdialogs.c:1036
 msgid "Enter an alias for this contact."
 msgstr "Anna lempinimi tälle kontaktiryhmälle."
 
-#: ../pidgin/gtkdialogs.c:1042
+#: ../pidgin/gtkdialogs.c:1058
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Anna %s:n lempinimi."
 
-#: ../pidgin/gtkdialogs.c:1044
+#: ../pidgin/gtkdialogs.c:1060
 msgid "Alias Buddy"
 msgstr "Anna tuttavalle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1065
+#: ../pidgin/gtkdialogs.c:1081
 msgid "Alias Chat"
 msgstr "Anna ryhmäkeskustelulle lempinimi"
 
-#: ../pidgin/gtkdialogs.c:1066
+#: ../pidgin/gtkdialogs.c:1082
 msgid "Enter an alias for this chat."
 msgstr "Syötä lempinimi tälle ryhmäkeskustelulle."
 
-#: ../pidgin/gtkdialogs.c:1105
+#: ../pidgin/gtkdialogs.c:1121
 #, c-format
 msgid ""
 "You are about to remove the contact containing %s and %d other buddy from "
@@ -15200,79 +15421,78 @@
 "You are about to remove the contact containing %s and %d other buddies from "
 "your buddy list.  Do you want to continue?"
 msgstr[0] ""
-"Olet poistamassa kontaktin, jossa on %s sekä %d muuta tuttavaa "
-"tuttavalistaltasi.  Haluatko jatkaa?"
+"Olet poistamassa kontaktin, jossa on %s sekä %d muuta tuttavaa tuttavistasi. "
+"Haluatko jatkaa?"
 msgstr[1] ""
-"Olet poistamassa kontaktin, jossa on %s sekä %d muuta tuttavaa "
-"tuttavalistaltasi.  Haluatko jatkaa?"
-
-#: ../pidgin/gtkdialogs.c:1113
+"Olet poistamassa kontaktin, jossa on %s sekä %d muuta tuttavaa tuttavistasi. "
+"Haluatko jatkaa?"
+
+#: ../pidgin/gtkdialogs.c:1129
 msgid "Remove Contact"
 msgstr "Poista kontakti"
 
-#: ../pidgin/gtkdialogs.c:1116
+#: ../pidgin/gtkdialogs.c:1132
 msgid "_Remove Contact"
 msgstr "_Poista kontakti"
 
-#: ../pidgin/gtkdialogs.c:1147
+#: ../pidgin/gtkdialogs.c:1163
 #, c-format
 msgid ""
 "You are about to merge the group called %s into the group called %s. Do you "
 "want to continue?"
 msgstr "Olet yhdistämässä ryhmää \"%s\" ryhmään \"%s\".  Haluatko jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1154
+#: ../pidgin/gtkdialogs.c:1170
 msgid "Merge Groups"
 msgstr "Yhdistä ryhmät"
 
-#: ../pidgin/gtkdialogs.c:1157
+#: ../pidgin/gtkdialogs.c:1173
 msgid "_Merge Groups"
 msgstr "_Yhdistä ryhmät"
 
-#: ../pidgin/gtkdialogs.c:1207
+#: ../pidgin/gtkdialogs.c:1223
 #, 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 ""
-"Olet poistamassa ryhmää nimeltä \"%s\" tuttavalistaltasi.  Haluatko jatkaa?"
-
-#: ../pidgin/gtkdialogs.c:1210
+msgstr "Olet poistamassa ryhmää nimeltä \"%s\" tuttavistasi.  Haluatko jatkaa?"
+
+#: ../pidgin/gtkdialogs.c:1226
 msgid "Remove Group"
 msgstr "Poista ryhmä"
 
-#: ../pidgin/gtkdialogs.c:1213
+#: ../pidgin/gtkdialogs.c:1229
 msgid "_Remove Group"
 msgstr "_Poista ryhmä"
 
-#: ../pidgin/gtkdialogs.c:1246
+#: ../pidgin/gtkdialogs.c:1262
 #, c-format
 msgid ""
 "You are about to remove %s from your buddy list.  Do you want to continue?"
-msgstr "Olet poistamassa \"%s\":n tuttavalistaltasi.  Haluatko jatkaa?"
-
-#: ../pidgin/gtkdialogs.c:1249
+msgstr "Olet poistamassa \"%s\":n tuttavistasi.  Haluatko jatkaa?"
+
+#: ../pidgin/gtkdialogs.c:1265
 msgid "Remove Buddy"
 msgstr "Poista tuttava"
 
-#: ../pidgin/gtkdialogs.c:1252
+#: ../pidgin/gtkdialogs.c:1268
 msgid "_Remove Buddy"
 msgstr "_Poista tuttava"
 
-#: ../pidgin/gtkdialogs.c:1273
+#: ../pidgin/gtkdialogs.c:1289
 #, c-format
 msgid ""
 "You are about to remove the chat %s from your buddy list.  Do you want to "
 "continue?"
 msgstr ""
-"Olet poistamassa ryhmäkeskustelun nimeltä \"%s\" tuttavalistaltasi. Haluatko "
+"Olet poistamassa ryhmäkeskustelun nimeltä \"%s\" tuttavistasi. Haluatko "
 "jatkaa?"
 
-#: ../pidgin/gtkdialogs.c:1276
+#: ../pidgin/gtkdialogs.c:1292
 msgid "Remove Chat"
 msgstr "Poista ryhmäkeskustelu"
 
-#: ../pidgin/gtkdialogs.c:1279
+#: ../pidgin/gtkdialogs.c:1295
 msgid "_Remove Chat"
 msgstr "_Poista ryhmäkeskustelu"
 
@@ -15286,7 +15506,7 @@
 
 #: ../pidgin/gtkdocklet.c:680
 msgid "Show Buddy List"
-msgstr "Näytä tuttavalista"
+msgstr "Näytä tuttavat"
 
 #: ../pidgin/gtkdocklet.c:706
 msgid "New Message..."
@@ -15394,39 +15614,39 @@
 msgid "Paste as Plain _Text"
 msgstr "Liimaa pelkkänä _tekstinä"
 
-#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1195
+#: ../pidgin/gtkimhtml.c:832 ../pidgin/gtkimhtmltoolbar.c:1199
 msgid "_Reset formatting"
 msgstr "_Poista muotoilu"
 
-#: ../pidgin/gtkimhtml.c:1359
+#: ../pidgin/gtkimhtml.c:1357
 msgid "Hyperlink color"
 msgstr "Hyperlinkin väri"
 
-#: ../pidgin/gtkimhtml.c:1360
+#: ../pidgin/gtkimhtml.c:1358
 msgid "Color to draw hyperlinks."
 msgstr "Väri jolla piirretään hyperlinkit"
 
-#: ../pidgin/gtkimhtml.c:1363
+#: ../pidgin/gtkimhtml.c:1361
 msgid "Hyperlink prelight color"
 msgstr "Hyperlinkin ensiväri"
 
-#: ../pidgin/gtkimhtml.c:1364
+#: ../pidgin/gtkimhtml.c:1362
 msgid "Color to draw hyperlinks when mouse is over them."
 msgstr "Väri jolla piirretään hyperlinkit kun hiiren kursori on niiden päällä."
 
-#: ../pidgin/gtkimhtml.c:1581
+#: ../pidgin/gtkimhtml.c:1579
 msgid "_Copy E-Mail Address"
 msgstr "_Kopioi sähköpostiosoite"
 
-#: ../pidgin/gtkimhtml.c:1593
+#: ../pidgin/gtkimhtml.c:1591
 msgid "_Open Link in Browser"
 msgstr "_Avaa linkki selaimessa"
 
-#: ../pidgin/gtkimhtml.c:1603
+#: ../pidgin/gtkimhtml.c:1601
 msgid "_Copy Link Location"
 msgstr "_Kopioi linkin osoite"
 
-#: ../pidgin/gtkimhtml.c:3353
+#: ../pidgin/gtkimhtml.c:3356
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15436,7 +15656,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../pidgin/gtkimhtml.c:3356
+#: ../pidgin/gtkimhtml.c:3359
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15446,7 +15666,7 @@
 "\n"
 "Oletetaan PNG-kuvaksi."
 
-#: ../pidgin/gtkimhtml.c:3385
+#: ../pidgin/gtkimhtml.c:3388
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15457,7 +15677,7 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3388
+#: ../pidgin/gtkimhtml.c:3391
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15468,11 +15688,11 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3466 ../pidgin/gtkimhtml.c:3478
+#: ../pidgin/gtkimhtml.c:3469 ../pidgin/gtkimhtml.c:3481
 msgid "Save Image"
 msgstr "Tallenna kuva"
 
-#: ../pidgin/gtkimhtml.c:3506
+#: ../pidgin/gtkimhtml.c:3509
 #, c-format
 msgid "_Save Image..."
 msgstr "_Tallenna kuva nimellä..."
@@ -15481,23 +15701,23 @@
 msgid "Select Font"
 msgstr "Valitse kirjasin"
 
-#: ../pidgin/gtkimhtmltoolbar.c:242
+#: ../pidgin/gtkimhtmltoolbar.c:244
 msgid "Select Text Color"
 msgstr "Valitse tekstin väri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:321
+#: ../pidgin/gtkimhtmltoolbar.c:323
 msgid "Select Background Color"
 msgstr "Valitse taustaväri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:410
+#: ../pidgin/gtkimhtmltoolbar.c:412
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
+#: ../pidgin/gtkimhtmltoolbar.c:420
 msgid "_Description"
 msgstr "_Kuvaus"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
+#: ../pidgin/gtkimhtmltoolbar.c:423
 msgid ""
 "Please enter the URL and description of the link that you want to insert. "
 "The description is optional."
@@ -15505,152 +15725,152 @@
 "Syötä URL, jonka haluat liittää, sekä sen kuvaus. \n"
 "Kuvaus on valinnainen."
 
-#: ../pidgin/gtkimhtmltoolbar.c:425
+#: ../pidgin/gtkimhtmltoolbar.c:427
 msgid "Please enter the URL of the link that you want to insert."
 msgstr "Syötä URL jonka haluat liittää."
 
-#: ../pidgin/gtkimhtmltoolbar.c:430 ../pidgin/gtkimhtmltoolbar.c:1102
+#: ../pidgin/gtkimhtmltoolbar.c:432 ../pidgin/gtkimhtmltoolbar.c:1106
 msgid "Insert Link"
 msgstr "Lisää linkki"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434 ../pidgin/gtkimhtmltoolbar.c:1263
+#: ../pidgin/gtkimhtmltoolbar.c:436 ../pidgin/gtkimhtmltoolbar.c:1267
 msgid "_Insert"
 msgstr "_Lisää"
 
-#: ../pidgin/gtkimhtmltoolbar.c:514
+#: ../pidgin/gtkimhtmltoolbar.c:516
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kuvan tallennus epäonnistui: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:540 ../pidgin/gtkimhtmltoolbar.c:550
+#: ../pidgin/gtkimhtmltoolbar.c:542 ../pidgin/gtkimhtmltoolbar.c:552
 msgid "Insert Image"
 msgstr "Liitä kuva"
 
-#: ../pidgin/gtkimhtmltoolbar.c:761
+#: ../pidgin/gtkimhtmltoolbar.c:765
 msgid "This theme has no available smileys."
 msgstr "Tälle teemalle ei ole saatavissa hymiöitä."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
+#: ../pidgin/gtkimhtmltoolbar.c:782
 msgid "Smile!"
 msgstr "Hymyile!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846 ../pidgin/gtkimhtmltoolbar.c:1220
+#: ../pidgin/gtkimhtmltoolbar.c:850 ../pidgin/gtkimhtmltoolbar.c:1224
 msgid "_Font"
 msgstr "Ki_rjasin"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Group Items"
 msgstr "Ryhmittele kohteet"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
+#: ../pidgin/gtkimhtmltoolbar.c:1058
 msgid "Ungroup Items"
 msgstr "Pura kohteiden ryhmitys"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088 ../pidgin/plugins/convcolors.c:287
+#: ../pidgin/gtkimhtmltoolbar.c:1092 ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Lihavoi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089 ../pidgin/plugins/convcolors.c:294
+#: ../pidgin/gtkimhtmltoolbar.c:1093 ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Kursivoi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090 ../pidgin/plugins/convcolors.c:301
+#: ../pidgin/gtkimhtmltoolbar.c:1094 ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Alleviivaa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
+#: ../pidgin/gtkimhtmltoolbar.c:1095
 msgid "Strikethrough"
 msgstr "Yliviivaa"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
-msgid "Increase Font Size"
-msgstr "Suurenna kirjasimen kokoa"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1094
-msgid "Decrease Font Size"
-msgstr "Pienennä kirjasimen kokoa"
-
-#: ../pidgin/gtkimhtmltoolbar.c:1096
-msgid "Font Face"
-msgstr "Kirjasintyyppi"
-
 #: ../pidgin/gtkimhtmltoolbar.c:1097
-msgid "Background Color"
-msgstr "Taustaväri"
+msgid "Increase Font Size"
+msgstr "Suurenna kirjasimen kokoa"
 
 #: ../pidgin/gtkimhtmltoolbar.c:1098
+msgid "Decrease Font Size"
+msgstr "Pienennä kirjasimen kokoa"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1100
+msgid "Font Face"
+msgstr "Kirjasintyyppi"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1101
+msgid "Background Color"
+msgstr "Taustaväri"
+
+#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Foreground Color"
 msgstr "Etualaväri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
+#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Reset Formatting"
 msgstr "Poista muotoilu"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1103
+#: ../pidgin/gtkimhtmltoolbar.c:1107
 msgid "Insert IM Image"
 msgstr "Lisää IM-kuva"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
+#: ../pidgin/gtkimhtmltoolbar.c:1108
 msgid "Insert Smiley"
 msgstr "Lisää hymiö"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
+#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<b>_Bold</b>"
 msgstr "<b>_Lihavoi</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
+#: ../pidgin/gtkimhtmltoolbar.c:1185
 msgid "<i>_Italic</i>"
 msgstr "<i>_Kursivoi</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
+#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "<u>_Underline</u>"
 msgstr "<u>_Alleviivaa</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
+#: ../pidgin/gtkimhtmltoolbar.c:1187
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Yliviivaa</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
+#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>_Suurempi</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1186
+#: ../pidgin/gtkimhtmltoolbar.c:1190
 msgid "_Normal"
 msgstr "_Normaali"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1188
+#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Pienempi</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1192
+#: ../pidgin/gtkimhtmltoolbar.c:1196
 msgid "_Font face"
 msgstr "Ki_rjasintyyppi"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
+#: ../pidgin/gtkimhtmltoolbar.c:1197
 msgid "Foreground _color"
 msgstr "Etuala_väri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1194
+#: ../pidgin/gtkimhtmltoolbar.c:1198
 msgid "Bac_kground color"
 msgstr "_Taustaväri"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1271
+#: ../pidgin/gtkimhtmltoolbar.c:1275
 msgid "_Image"
 msgstr "Ku_va"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1277
+#: ../pidgin/gtkimhtmltoolbar.c:1281
 msgid "_Link"
 msgstr "_Linkki"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1283
+#: ../pidgin/gtkimhtmltoolbar.c:1287
 msgid "_Horizontal rule"
 msgstr "_Vaakaviiva"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1305
+#: ../pidgin/gtkimhtmltoolbar.c:1309
 msgid "_Smile!"
 msgstr "_Hymyile!"
 
@@ -15729,26 +15949,26 @@
 msgid "Total log size:"
 msgstr "Lokin kokonaiskoko:"
 
-#: ../pidgin/gtklog.c:710
+#: ../pidgin/gtklog.c:714
 #, c-format
 msgid "Conversations in %s"
 msgstr "Keskustelut paikassa %s"
 
-#: ../pidgin/gtklog.c:718 ../pidgin/gtklog.c:785
+#: ../pidgin/gtklog.c:722 ../pidgin/gtklog.c:793
 #, c-format
 msgid "Conversations with %s"
 msgstr "Keskustelut käyttäjän %s kanssa"
 
-#: ../pidgin/gtklog.c:810
+#: ../pidgin/gtklog.c:823
 msgid "System Log"
 msgstr "Järjestelmäloki"
 
-#: ../pidgin/gtkmain.c:386
+#: ../pidgin/gtkmain.c:398
 #, c-format
 msgid "%s %s. Try `%s -h' for more information.\n"
 msgstr "%s %s. Kirjoita \"%s -h\" saadaksesi lisää tietoja.\n"
 
-#: ../pidgin/gtkmain.c:388
+#: ../pidgin/gtkmain.c:400
 #, c-format
 msgid ""
 "%s %s\n"
@@ -15777,7 +15997,7 @@
 "  --display=NÄYTTÖ    käytettävä X-näyttö\n"
 "  -v, --version       näytä nykyinen versionumero ja poistu\n"
 
-#: ../pidgin/gtkmain.c:516
+#: ../pidgin/gtkmain.c:528
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -15818,48 +16038,48 @@
 
 #. Translators may want to transliterate the name.
 #. It is not to be translated.
-#: ../pidgin/gtkmain.c:706 ../pidgin/pidgin.h:51
+#: ../pidgin/gtkmain.c:718 ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:349
+#: ../pidgin/gtknotify.c:350
 msgid "Open All Messages"
 msgstr "Avaa kaikki viestit"
 
-#: ../pidgin/gtknotify.c:402
+#: ../pidgin/gtknotify.c:403
 msgid "<span weight=\"bold\" size=\"larger\">You have mail!</span>"
 msgstr "<span weight=\"bold\" size=\"larger\">Sinulle on postia!</span>"
 
-#: ../pidgin/gtknotify.c:545
+#: ../pidgin/gtknotify.c:546
 #, c-format
 msgid "%s has %d new message."
 msgid_plural "%s has %d new messages."
 msgstr[0] "%s:lla on %d uusi viesti."
 msgstr[1] "%s:lla on %d uutta viestiä."
 
-#: ../pidgin/gtknotify.c:569
+#: ../pidgin/gtknotify.c:570
 #, c-format
 msgid "<b>%d new e-mail.</b>"
 msgid_plural "<b>%d new e-mails.</b>"
 msgstr[0] "<b>%d uusi sähköposti.</b>"
 msgstr[1] "<b>%d uutta sähköpostia.</b>"
 
-#: ../pidgin/gtknotify.c:997
+#: ../pidgin/gtknotify.c:998
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Selainkomento \"%s\" on virheellinen."
 
-#: ../pidgin/gtknotify.c:999 ../pidgin/gtknotify.c:1011
-#: ../pidgin/gtknotify.c:1024 ../pidgin/gtknotify.c:1152
+#: ../pidgin/gtknotify.c:1000 ../pidgin/gtknotify.c:1012
+#: ../pidgin/gtknotify.c:1025 ../pidgin/gtknotify.c:1153
 msgid "Unable to open URL"
 msgstr "URL:n avaaminen epäonnistui"
 
-#: ../pidgin/gtknotify.c:1009 ../pidgin/gtknotify.c:1022
+#: ../pidgin/gtknotify.c:1010 ../pidgin/gtknotify.c:1023
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Virhe käynnistettäessä \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1153
+#: ../pidgin/gtknotify.c:1154
 msgid ""
 "The 'Manual' browser command has been chosen, but no command has been set."
 msgstr "Oma selainkomento -asetus valittu, mutta komentoa ei ole asetettu."
@@ -15876,7 +16096,19 @@
 msgid "Unload Plugins"
 msgstr "Poista liitännäiset käytöstä"
 
-#: ../pidgin/gtkplugin.c:400
+#: ../pidgin/gtkplugin.c:308
+msgid "Could not unload plugin"
+msgstr "Liitännäistä ei voi poistaa käytöstä"
+
+#: ../pidgin/gtkplugin.c:309
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr ""
+"Liitännäistä ei voi poistaa käytöstä nyt, mutta se poistetaan käytöstä "
+"seuraavalla käynnistymiskerralla."
+
+#: ../pidgin/gtkplugin.c:417
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -15887,7 +16119,7 @@
 "<span weight=\"bold\">Web-sivusto:</span>\t\t%s\n"
 "<span weight=\"bold\">Tiedostopolku:</span>\t%s"
 
-#: ../pidgin/gtkplugin.c:410
+#: ../pidgin/gtkplugin.c:427
 #, c-format
 msgid ""
 "%s\n"
@@ -15898,11 +16130,11 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Virhe: %s\n"
 "Tarkista onko liitännäiswebsivustolla päivitystä.</span>"
 
-#: ../pidgin/gtkplugin.c:536
+#: ../pidgin/gtkplugin.c:562
 msgid "Configure Pl_ugin"
 msgstr "Liitännäisen _asetukset"
 
-#: ../pidgin/gtkplugin.c:599
+#: ../pidgin/gtkplugin.c:625
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Liitännäisen yksityiskohdat</b>"
 
@@ -15911,95 +16143,95 @@
 msgstr "Valitse tiedosto"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:539
+#: ../pidgin/gtkpounce.c:547
 msgid "Pounce on Whom"
 msgstr "Kenestä ilmoitetaan"
 
-#: ../pidgin/gtkpounce.c:566
+#: ../pidgin/gtkpounce.c:574
 msgid "_Buddy name:"
 msgstr "_Tuttavan nimi:"
 
-#: ../pidgin/gtkpounce.c:600
+#: ../pidgin/gtkpounce.c:608
 msgid "Si_gns on"
 msgstr "_kirjautuu sisään"
 
-#: ../pidgin/gtkpounce.c:602
+#: ../pidgin/gtkpounce.c:610
 msgid "Signs o_ff"
 msgstr "kirjautuu _ulos"
 
-#: ../pidgin/gtkpounce.c:604
+#: ../pidgin/gtkpounce.c:612
 msgid "Goes a_way"
 msgstr "poi_stuu"
 
-#: ../pidgin/gtkpounce.c:606
+#: ../pidgin/gtkpounce.c:614
 msgid "Ret_urns from away"
 msgstr "_palaa"
 
-#: ../pidgin/gtkpounce.c:608
+#: ../pidgin/gtkpounce.c:616
 msgid "Becomes _idle"
 msgstr "on _jouten"
 
-#: ../pidgin/gtkpounce.c:610
-msgid "Is no longer i_dle"
-msgstr "ei enää ole j_outen"
-
-#: ../pidgin/gtkpounce.c:612
-msgid "Starts _typing"
-msgstr "_alkaa kirjoittaa"
-
-#: ../pidgin/gtkpounce.c:614
-msgid "P_auses while typing"
-msgstr "_keskeyttää kirjoittamisen"
-
-#: ../pidgin/gtkpounce.c:616
-msgid "Stops t_yping"
-msgstr "lope_ttaa kirjoittamisen"
-
 #: ../pidgin/gtkpounce.c:618
+msgid "Is no longer i_dle"
+msgstr "ei enää ole j_outen"
+
+#: ../pidgin/gtkpounce.c:620
+msgid "Starts _typing"
+msgstr "_alkaa kirjoittaa"
+
+#: ../pidgin/gtkpounce.c:622
+msgid "P_auses while typing"
+msgstr "_keskeyttää kirjoittamisen"
+
+#: ../pidgin/gtkpounce.c:624
+msgid "Stops t_yping"
+msgstr "lope_ttaa kirjoittamisen"
+
+#: ../pidgin/gtkpounce.c:626
 msgid "Sends a _message"
 msgstr "lähettää _viestin"
 
-#: ../pidgin/gtkpounce.c:661
+#: ../pidgin/gtkpounce.c:669
 msgid "Ope_n an IM window"
 msgstr "Avaa pikav_iesti-ikkuna"
 
-#: ../pidgin/gtkpounce.c:663
+#: ../pidgin/gtkpounce.c:671
 msgid "_Pop up a notification"
 msgstr "_Ponnahdusilmoitus"
 
-#: ../pidgin/gtkpounce.c:665
+#: ../pidgin/gtkpounce.c:673
 msgid "Send a _message"
 msgstr "Lähetä _viesti"
 
-#: ../pidgin/gtkpounce.c:667
+#: ../pidgin/gtkpounce.c:675
 msgid "E_xecute a command"
 msgstr "Suorita _komento"
 
-#: ../pidgin/gtkpounce.c:669
+#: ../pidgin/gtkpounce.c:677
 msgid "P_lay a sound"
 msgstr "S_oita ääni"
 
-#: ../pidgin/gtkpounce.c:675
+#: ../pidgin/gtkpounce.c:683
 msgid "Brows_e..."
 msgstr "_Selaa"
 
-#: ../pidgin/gtkpounce.c:677
+#: ../pidgin/gtkpounce.c:685
 msgid "Br_owse..."
 msgstr "S_elaa"
 
-#: ../pidgin/gtkpounce.c:678
+#: ../pidgin/gtkpounce.c:686
 msgid "Pre_view"
 msgstr "_Esikatselu"
 
-#: ../pidgin/gtkpounce.c:810
+#: ../pidgin/gtkpounce.c:818
 msgid "P_ounce only when my status is not Available"
 msgstr "I_lmoita vain kun tilani on \"tavoittamattomissa\""
 
-#: ../pidgin/gtkpounce.c:815
+#: ../pidgin/gtkpounce.c:823
 msgid "_Recurring"
 msgstr "_Toistuva"
 
-#: ../pidgin/gtkpounce.c:1258
+#: ../pidgin/gtkpounce.c:1266
 msgid "Pounce Target"
 msgstr "Ilmoituksen kohde"
 
@@ -16016,7 +16248,7 @@
 msgid "Install Theme"
 msgstr "Asenna teema"
 
-#: ../pidgin/gtkprefs.c:697
+#: ../pidgin/gtkprefs.c:698
 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."
@@ -16024,15 +16256,15 @@
 "Valitse haluamasi hymiöteema alla olevasta listasta. Uudet teemat voi "
 "asentaa vedä&pudota-menetelmällä pudottamalla ne teemalistaan."
 
-#: ../pidgin/gtkprefs.c:732
+#: ../pidgin/gtkprefs.c:733
 msgid "Icon"
 msgstr "Kuvake"
 
-#: ../pidgin/gtkprefs.c:894
+#: ../pidgin/gtkprefs.c:895
 msgid "System Tray Icon"
 msgstr "Tarjotinkuvake"
 
-#: ../pidgin/gtkprefs.c:895
+#: ../pidgin/gtkprefs.c:896
 msgid "_Show system tray icon:"
 msgstr "_Näytä tarjotinkuvake:"
 
@@ -16040,120 +16272,120 @@
 msgid "On unread messages"
 msgstr "Kun lukemattomia viestejä"
 
-#: ../pidgin/gtkprefs.c:904
+#: ../pidgin/gtkprefs.c:905
 msgid "Conversation Window Hiding"
 msgstr "Keskusteluikkunan piilottaminen"
 
-#: ../pidgin/gtkprefs.c:905
+#: ../pidgin/gtkprefs.c:906
 msgid "_Hide new IM conversations:"
 msgstr "_Piilota uudet pikaviestikeskustelut:"
 
-#: ../pidgin/gtkprefs.c:908 ../pidgin/gtkprefs.c:2044
+#: ../pidgin/gtkprefs.c:909 ../pidgin/gtkprefs.c:2045
 msgid "When away"
 msgstr "Poissaollessa"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:916
+#: ../pidgin/gtkprefs.c:917
 msgid "Tabs"
 msgstr "Välilehdet"
 
-#: ../pidgin/gtkprefs.c:918
+#: ../pidgin/gtkprefs.c:919
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Näytä pikaviestit ja ryhmäkeskustelut _jaetuissa ikkunoissa"
 
-#: ../pidgin/gtkprefs.c:932
+#: ../pidgin/gtkprefs.c:933
 msgid "Show close b_utton on tabs"
 msgstr "Näytä _sulkemispainikkeet välilehdissä"
 
-#: ../pidgin/gtkprefs.c:935
+#: ../pidgin/gtkprefs.c:936
 msgid "_Placement:"
 msgstr "_Asettelu:"
 
-#: ../pidgin/gtkprefs.c:937
+#: ../pidgin/gtkprefs.c:938
 msgid "Top"
 msgstr "Ylhäällä"
 
-#: ../pidgin/gtkprefs.c:938
-msgid "Bottom"
-msgstr "Alhaalla"
-
 #: ../pidgin/gtkprefs.c:939
-msgid "Left"
-msgstr "Vasemmalla"
+msgid "Bottom"
+msgstr "Alhaalla"
 
 #: ../pidgin/gtkprefs.c:940
+msgid "Left"
+msgstr "Vasemmalla"
+
+#: ../pidgin/gtkprefs.c:941
 msgid "Right"
 msgstr "Oikealla"
 
-#: ../pidgin/gtkprefs.c:942
-msgid "Left Vertical"
-msgstr "Vasemmalla pystysuuntaisesti"
-
 #: ../pidgin/gtkprefs.c:943
+msgid "Left Vertical"
+msgstr "Vasemmalla pystysuuntaisesti"
+
+#: ../pidgin/gtkprefs.c:944
 msgid "Right Vertical"
 msgstr "Oikealla pystysuuntaisesti"
 
-#: ../pidgin/gtkprefs.c:950
+#: ../pidgin/gtkprefs.c:951
 msgid "N_ew conversations:"
 msgstr "_Uudet keskustelut:"
 
-#: ../pidgin/gtkprefs.c:996
+#: ../pidgin/gtkprefs.c:997
 msgid "Show _formatting on incoming messages"
 msgstr "Näytä _muotoilu tulevissa viesteissä"
 
-#: ../pidgin/gtkprefs.c:998
+#: ../pidgin/gtkprefs.c:999
 msgid "Close IMs immediately when the tab is closed"
 msgstr "Sulje pikaviestit heti kun välilehti on suljettu"
 
-#: ../pidgin/gtkprefs.c:1001
+#: ../pidgin/gtkprefs.c:1002
 msgid "Show _detailed information"
 msgstr "Näytä _yksityiskohtaiset tiedot"
 
-#: ../pidgin/gtkprefs.c:1003
+#: ../pidgin/gtkprefs.c:1004
 msgid "Enable buddy ic_on animation"
 msgstr "Näytä tuttavakuvakkeen a_nimaatio"
 
-#: ../pidgin/gtkprefs.c:1010
+#: ../pidgin/gtkprefs.c:1011
 msgid "_Notify buddies that you are typing to them"
 msgstr "Ilmoita tuttaville kun _kirjoitat heille"
 
-#: ../pidgin/gtkprefs.c:1013
+#: ../pidgin/gtkprefs.c:1014
 msgid "Highlight _misspelled words"
 msgstr "Korosta _väärinkirjoitetut sanat"
 
-#: ../pidgin/gtkprefs.c:1017
+#: ../pidgin/gtkprefs.c:1018
 msgid "Use smooth-scrolling"
 msgstr "Käytä portaatonta tekstinvieritystä"
 
-#: ../pidgin/gtkprefs.c:1020
+#: ../pidgin/gtkprefs.c:1021
 msgid "F_lash window when IMs are received"
 msgstr "_Vilkuta ikkunaa pikaviestien saapuessa"
 
-#: ../pidgin/gtkprefs.c:1022
+#: ../pidgin/gtkprefs.c:1023
 msgid "Minimi_ze new conversation windows"
 msgstr "Piene_nnä uudet keskusteluikkunat"
 
-#: ../pidgin/gtkprefs.c:1026
+#: ../pidgin/gtkprefs.c:1027
 msgid "Font"
 msgstr "Kirjasin"
 
-#: ../pidgin/gtkprefs.c:1028
+#: ../pidgin/gtkprefs.c:1029
 msgid "Use document font from _theme"
 msgstr "Käytä asiakirjojen kirjasinta _teemasta"
 
-#: ../pidgin/gtkprefs.c:1030
+#: ../pidgin/gtkprefs.c:1031
 msgid "Use font from _theme"
 msgstr "Käytä kirjasinta _teemasta"
 
-#: ../pidgin/gtkprefs.c:1032
+#: ../pidgin/gtkprefs.c:1033
 msgid "Conversation _font:"
 msgstr "Keskustelujen _kirjasin:"
 
-#: ../pidgin/gtkprefs.c:1046
+#: ../pidgin/gtkprefs.c:1047
 msgid "Default Formatting"
 msgstr "Oletusmuotoilu"
 
-#: ../pidgin/gtkprefs.c:1065
+#: ../pidgin/gtkprefs.c:1066
 msgid ""
 "This is how your outgoing message text will appear when you use protocols "
 "that support formatting."
@@ -16161,59 +16393,59 @@
 "Tältä ulosmenevä viesti näyttää kun käytät yhteyskäytäntöä joka tukee "
 "muotoiluja."
 
-#: ../pidgin/gtkprefs.c:1125
+#: ../pidgin/gtkprefs.c:1126
 msgid "Cannot start proxy configuration program."
 msgstr "Välipalvelimen asetusohjelmaa ei voi käynnistää."
 
-#: ../pidgin/gtkprefs.c:1137
+#: ../pidgin/gtkprefs.c:1138
 msgid "Cannot start browser configuration program."
 msgstr "Selaimen asetusohjelmaa ei voi käynnistää."
 
-#: ../pidgin/gtkprefs.c:1157
+#: ../pidgin/gtkprefs.c:1158
 msgid "ST_UN server:"
 msgstr "ST_UN-palvelin:"
 
-#: ../pidgin/gtkprefs.c:1169
+#: ../pidgin/gtkprefs.c:1170
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Esimerkki: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1173
+#: ../pidgin/gtkprefs.c:1174
 msgid "_Autodetect IP address"
 msgstr "_Hae IP-osoite automaattisesti"
 
-#: ../pidgin/gtkprefs.c:1182
+#: ../pidgin/gtkprefs.c:1183
 msgid "Public _IP:"
 msgstr "Julkinen _IP:"
 
-#: ../pidgin/gtkprefs.c:1213
+#: ../pidgin/gtkprefs.c:1214
 msgid "Ports"
 msgstr "Portit"
 
-#: ../pidgin/gtkprefs.c:1216
+#: ../pidgin/gtkprefs.c:1217
 msgid "_Manually specify range of ports to listen on"
 msgstr "_Aseta kuunneltava porttialue"
 
-#: ../pidgin/gtkprefs.c:1219
+#: ../pidgin/gtkprefs.c:1220
 msgid "_Start port:"
 msgstr "_Ensimmäinen portti:"
 
-#: ../pidgin/gtkprefs.c:1226
+#: ../pidgin/gtkprefs.c:1227
 msgid "_End port:"
 msgstr "Viimeinen _portti:"
 
-#: ../pidgin/gtkprefs.c:1234
+#: ../pidgin/gtkprefs.c:1235
 msgid "Proxy Server &amp; Browser"
 msgstr "Välipalvelin &amp; selain"
 
-#: ../pidgin/gtkprefs.c:1242
+#: ../pidgin/gtkprefs.c:1243
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>Välipalvelimen asetusohjelmaa ei löydy.</b>"
 
-#: ../pidgin/gtkprefs.c:1250
+#: ../pidgin/gtkprefs.c:1251
 msgid "<b>Browser configuration program was not found.</b>"
 msgstr "<b>Selaimen asetusohjelmaa ei löydy.</b>"
 
-#: ../pidgin/gtkprefs.c:1255
+#: ../pidgin/gtkprefs.c:1256
 msgid ""
 "Proxy & Browser preferences are configured\n"
 "in GNOME Preferences"
@@ -16221,95 +16453,95 @@
 "Välipalvelimen & selaimen asetukset määritetään \n"
 "Gnomen asetuksissa"
 
-#: ../pidgin/gtkprefs.c:1262
+#: ../pidgin/gtkprefs.c:1263
 msgid "Configure _Proxy"
 msgstr "Aseta _välipalvelin"
 
-#: ../pidgin/gtkprefs.c:1267
+#: ../pidgin/gtkprefs.c:1268
 msgid "Configure _Browser"
 msgstr "Aseta _selain"
 
-#: ../pidgin/gtkprefs.c:1273
+#: ../pidgin/gtkprefs.c:1274
 msgid "Proxy Server"
 msgstr "Välipalvelin"
 
-#: ../pidgin/gtkprefs.c:1278
+#: ../pidgin/gtkprefs.c:1279
 msgid "No proxy"
 msgstr "Ei välipalvelinta"
 
-#: ../pidgin/gtkprefs.c:1334
+#: ../pidgin/gtkprefs.c:1335
 msgid "_User:"
 msgstr "_Käyttäjä:"
 
-#: ../pidgin/gtkprefs.c:1422
+#: ../pidgin/gtkprefs.c:1423
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1423
+#: ../pidgin/gtkprefs.c:1424
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1424
+#: ../pidgin/gtkprefs.c:1425
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1425
+#: ../pidgin/gtkprefs.c:1426
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1426
+#: ../pidgin/gtkprefs.c:1427
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1427
-msgid "GNOME Default"
-msgstr "Gnomen oletus"
-
 #: ../pidgin/gtkprefs.c:1428
-msgid "Galeon"
-msgstr "Galeon"
+msgid "GNOME Default"
+msgstr "Gnomen oletus"
 
 #: ../pidgin/gtkprefs.c:1429
+msgid "Galeon"
+msgstr "Galeon"
+
+#: ../pidgin/gtkprefs.c:1430
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1430
+#: ../pidgin/gtkprefs.c:1431
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1431
+#: ../pidgin/gtkprefs.c:1432
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1440
+#: ../pidgin/gtkprefs.c:1441
 msgid "Manual"
 msgstr "Oma komento"
 
-#: ../pidgin/gtkprefs.c:1493
+#: ../pidgin/gtkprefs.c:1494
 msgid "Browser Selection"
 msgstr "Selaimen valinta"
 
-#: ../pidgin/gtkprefs.c:1497
+#: ../pidgin/gtkprefs.c:1498
 msgid "_Browser:"
 msgstr "_Selain:"
 
-#: ../pidgin/gtkprefs.c:1505
+#: ../pidgin/gtkprefs.c:1506
 msgid "_Open link in:"
 msgstr "_Avaa linkki:"
 
-#: ../pidgin/gtkprefs.c:1507
+#: ../pidgin/gtkprefs.c:1508
 msgid "Browser default"
 msgstr "Selaimen oletus"
 
-#: ../pidgin/gtkprefs.c:1508
+#: ../pidgin/gtkprefs.c:1509
 msgid "Existing window"
 msgstr "Olemassaolevaan ikkunaan"
 
-#: ../pidgin/gtkprefs.c:1510
+#: ../pidgin/gtkprefs.c:1511
 msgid "New tab"
 msgstr "Uuteen välilehteen"
 
-#: ../pidgin/gtkprefs.c:1524
+#: ../pidgin/gtkprefs.c:1525
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16318,69 +16550,69 @@
 "_Komento:\n"
 "(URL:ksi %s)"
 
-#: ../pidgin/gtkprefs.c:1565
+#: ../pidgin/gtkprefs.c:1566
 msgid "Log _format:"
 msgstr "Lokin _muoto:"
 
-#: ../pidgin/gtkprefs.c:1570
+#: ../pidgin/gtkprefs.c:1571
 msgid "Log all _instant messages"
 msgstr "Kirjaa kaikki pikaviestit _lokiin"
 
-#: ../pidgin/gtkprefs.c:1572
+#: ../pidgin/gtkprefs.c:1573
 msgid "Log all c_hats"
 msgstr "Kirjaa kaikki ryhmä_keskustelut lokiin"
 
-#: ../pidgin/gtkprefs.c:1574
+#: ../pidgin/gtkprefs.c:1575
 msgid "Log all _status changes to system log"
 msgstr "Kirjaa kaikki _tilamuutokset järjestelmälokiin"
 
-#: ../pidgin/gtkprefs.c:1724
+#: ../pidgin/gtkprefs.c:1725
 msgid "Sound Selection"
 msgstr "Äänivalinta"
 
-#: ../pidgin/gtkprefs.c:1734
+#: ../pidgin/gtkprefs.c:1735
 #, c-format
 msgid "Quietest"
 msgstr "Hiljaisin"
 
-#: ../pidgin/gtkprefs.c:1736
+#: ../pidgin/gtkprefs.c:1737
 #, c-format
 msgid "Quieter"
 msgstr "Hiljaisempi"
 
-#: ../pidgin/gtkprefs.c:1738
+#: ../pidgin/gtkprefs.c:1739
 #, c-format
 msgid "Quiet"
 msgstr "Hiljainen"
 
-#: ../pidgin/gtkprefs.c:1742
+#: ../pidgin/gtkprefs.c:1743
 #, c-format
 msgid "Loud"
 msgstr "Äänekäs"
 
-#: ../pidgin/gtkprefs.c:1744
+#: ../pidgin/gtkprefs.c:1745
 #, c-format
 msgid "Louder"
 msgstr "Äänekkäämpi"
 
-#: ../pidgin/gtkprefs.c:1746
+#: ../pidgin/gtkprefs.c:1747
 #, c-format
 msgid "Loudest"
 msgstr "Äänekkäin"
 
-#: ../pidgin/gtkprefs.c:1812
+#: ../pidgin/gtkprefs.c:1813
 msgid "_Method:"
 msgstr "_Menetelmä:"
 
-#: ../pidgin/gtkprefs.c:1814
+#: ../pidgin/gtkprefs.c:1815
 msgid "Console beep"
 msgstr "Konsoliäänimerkki"
 
-#: ../pidgin/gtkprefs.c:1821
+#: ../pidgin/gtkprefs.c:1822
 msgid "No sounds"
 msgstr "Ei ääniä"
 
-#: ../pidgin/gtkprefs.c:1829
+#: ../pidgin/gtkprefs.c:1830
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16389,81 +16621,81 @@
 "Äänik_omento:\n"
 "(%s tiedostonimeksi)"
 
-#: ../pidgin/gtkprefs.c:1856
+#: ../pidgin/gtkprefs.c:1857
 msgid "Sounds when conversation has _focus"
 msgstr "Äänet kun keskusteluikkuna on _aktiivinen"
 
-#: ../pidgin/gtkprefs.c:1858
+#: ../pidgin/gtkprefs.c:1859
 msgid "Enable sounds:"
 msgstr "Ota äänet käyttöön:"
 
-#: ../pidgin/gtkprefs.c:1869
+#: ../pidgin/gtkprefs.c:1870
 msgid "Volume:"
 msgstr "Äänenvoimakkuus:"
 
-#: ../pidgin/gtkprefs.c:1949
+#: ../pidgin/gtkprefs.c:1950
 msgid "Play"
 msgstr "Soita"
 
-#: ../pidgin/gtkprefs.c:2027
+#: ../pidgin/gtkprefs.c:2028
 msgid "_Report idle time:"
 msgstr "_Ilmoita joutenoloaika:"
 
-#: ../pidgin/gtkprefs.c:2032
+#: ../pidgin/gtkprefs.c:2033
 msgid "Based on keyboard or mouse use"
 msgstr "Perustuen näppäimistön tai hiiren käyttöön"
 
-#: ../pidgin/gtkprefs.c:2041
+#: ../pidgin/gtkprefs.c:2042
 msgid "_Auto-reply:"
 msgstr "_Automaattivastaus:"
 
-#: ../pidgin/gtkprefs.c:2045
+#: ../pidgin/gtkprefs.c:2046
 msgid "When both away and idle"
 msgstr "Poissa ja jouten ollessa"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:2051
+#: ../pidgin/gtkprefs.c:2052
 msgid "Auto-away"
 msgstr "Automaattinen poissaoloasetus"
 
-#: ../pidgin/gtkprefs.c:2053
+#: ../pidgin/gtkprefs.c:2054
 msgid "Change status when _idle"
 msgstr "Vaihda tila, kun ollaan _jouten"
 
-#: ../pidgin/gtkprefs.c:2057
+#: ../pidgin/gtkprefs.c:2058
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuutteja ennen joutenolevaksi asettamista:"
 
-#: ../pidgin/gtkprefs.c:2065
+#: ../pidgin/gtkprefs.c:2066
 msgid "Change _status to:"
 msgstr "Vaihda tila seuraavaksi:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2086
+#: ../pidgin/gtkprefs.c:2087
 msgid "Status at Startup"
 msgstr "Tila käynnistettäessä"
 
-#: ../pidgin/gtkprefs.c:2088
+#: ../pidgin/gtkprefs.c:2089
 msgid "Use status from last _exit at startup"
 msgstr "Käytä viimeksi poistuttaessa ollutta tilaa"
 
-#: ../pidgin/gtkprefs.c:2094
+#: ../pidgin/gtkprefs.c:2095
 msgid "Status to a_pply at startup:"
 msgstr "Tila jota _käytetään käynnistettäessä:"
 
-#: ../pidgin/gtkprefs.c:2133
+#: ../pidgin/gtkprefs.c:2134
 msgid "Interface"
 msgstr "Käyttöliittymä"
 
-#: ../pidgin/gtkprefs.c:2135
+#: ../pidgin/gtkprefs.c:2136
 msgid "Smiley Themes"
 msgstr "Hymiöteemat"
 
-#: ../pidgin/gtkprefs.c:2142
+#: ../pidgin/gtkprefs.c:2143
 msgid "Browser"
 msgstr "Selain"
 
-#: ../pidgin/gtkprefs.c:2146
+#: ../pidgin/gtkprefs.c:2147
 msgid "Status / Idle"
 msgstr "Tila / jouten"
 
@@ -16473,7 +16705,7 @@
 
 #: ../pidgin/gtkprivacy.c:81
 msgid "Allow only the users on my buddy list"
-msgstr "Salli vain käyttäjät tuttavalistassa"
+msgstr "Salli vain käyttäjät tuttavissa"
 
 #: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users below"
@@ -16487,112 +16719,112 @@
 msgid "Block only the users below"
 msgstr "Estä vain allaolevat käyttäjät"
 
-#: ../pidgin/gtkprivacy.c:370
+#: ../pidgin/gtkprivacy.c:372
 msgid "Privacy"
 msgstr "Yksityisyys"
 
-#: ../pidgin/gtkprivacy.c:382
+#: ../pidgin/gtkprivacy.c:384
 msgid "Changes to privacy settings take effect immediately."
 msgstr "Muutokset yksityisyysasetuksiin tulevat voimaan heti."
 
 #. "Set privacy for:" label
-#: ../pidgin/gtkprivacy.c:394
+#: ../pidgin/gtkprivacy.c:396
 msgid "Set privacy for:"
 msgstr "Yksityisyysasetukset tilille:"
 
-#: ../pidgin/gtkprivacy.c:557 ../pidgin/gtkprivacy.c:574
+#: ../pidgin/gtkprivacy.c:559 ../pidgin/gtkprivacy.c:576
 msgid "Permit User"
 msgstr "Salli käyttäjä"
 
-#: ../pidgin/gtkprivacy.c:558
+#: ../pidgin/gtkprivacy.c:560
 msgid "Type a user you permit to contact you."
 msgstr "Kirjoita tuttavan nimi jonka valtuutat ottamaan yhteyttä sinuun."
 
-#: ../pidgin/gtkprivacy.c:559
+#: ../pidgin/gtkprivacy.c:561
 msgid "Please enter the name of the user you wish to be able to contact you."
 msgstr "Syötä käyttäjän nimi, jonka tahdot voivan ottaa sinuun yhteyttä."
 
-#: ../pidgin/gtkprivacy.c:562 ../pidgin/gtkprivacy.c:578
+#: ../pidgin/gtkprivacy.c:564 ../pidgin/gtkprivacy.c:580
 msgid "_Permit"
 msgstr "_Salli"
 
-#: ../pidgin/gtkprivacy.c:568
+#: ../pidgin/gtkprivacy.c:570
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Sallitaanko %s:n yhteydenotot?"
 
-#: ../pidgin/gtkprivacy.c:570
+#: ../pidgin/gtkprivacy.c:572
 #, c-format
 msgid "Are you sure you wish to allow %s to contact you?"
 msgstr "Sallitaanko varmasti %s:n yhteydenotot?"
 
-#: ../pidgin/gtkprivacy.c:599 ../pidgin/gtkprivacy.c:613
+#: ../pidgin/gtkprivacy.c:601 ../pidgin/gtkprivacy.c:615
 msgid "Block User"
 msgstr "Estä käyttäjää"
 
-#: ../pidgin/gtkprivacy.c:600
+#: ../pidgin/gtkprivacy.c:602
 msgid "Type a user to block."
 msgstr "Kirjoita estettävä käyttäjä."
 
-#: ../pidgin/gtkprivacy.c:601
+#: ../pidgin/gtkprivacy.c:603
 msgid "Please enter the name of the user you wish to block."
 msgstr "Kirjoita käyttäjän nimi jonka tahdot estää ottamasta yhteyttä."
 
-#: ../pidgin/gtkprivacy.c:609
+#: ../pidgin/gtkprivacy.c:611
 #, c-format
 msgid "Block %s?"
 msgstr "Estetäänkö %s?"
 
-#: ../pidgin/gtkprivacy.c:611
+#: ../pidgin/gtkprivacy.c:613
 #, c-format
 msgid "Are you sure you want to block %s?"
 msgstr "Haluatko varmasti estää %s?"
 
-#: ../pidgin/gtkrequest.c:272
+#: ../pidgin/gtkrequest.c:322
 msgid "Apply"
 msgstr "Toteuta"
 
-#: ../pidgin/gtkrequest.c:1507
+#: ../pidgin/gtkrequest.c:1651
 msgid "That file already exists"
 msgstr "Tiedosto on jo olemassa"
 
-#: ../pidgin/gtkrequest.c:1508
+#: ../pidgin/gtkrequest.c:1652
 msgid "Would you like to overwrite it?"
 msgstr "Haluatko korvata sen?"
 
-#: ../pidgin/gtkrequest.c:1511
+#: ../pidgin/gtkrequest.c:1655
 msgid "Overwrite"
 msgstr "Korvaa"
 
-#: ../pidgin/gtkrequest.c:1512
+#: ../pidgin/gtkrequest.c:1656
 msgid "Choose New Name"
 msgstr "Valitse uusi nimi"
 
-#: ../pidgin/gtkrequest.c:1650 ../pidgin/gtkrequest.c:1664
+#: ../pidgin/gtkrequest.c:1797 ../pidgin/gtkrequest.c:1811
 msgid "Select Folder..."
 msgstr "Valitse kansio..."
 
 #. Create the window.
-#: ../pidgin/gtkroomlist.c:375
+#: ../pidgin/gtkroomlist.c:518 ../pidgin/gtkroomlist.c:688
 msgid "Room List"
-msgstr "Huonelista"
+msgstr "Huoneluettelo"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:443
+#: ../pidgin/gtkroomlist.c:756
 msgid "_Get List"
-msgstr "_Hae lista"
+msgstr "_Hae luettelo"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:451
+#: ../pidgin/gtkroomlist.c:764
 msgid "_Add Chat"
 msgstr "_Lisää ryhmäkeskustelu"
 
 #: ../pidgin/gtksavedstatuses.c:337
 msgid "Are you sure you want to delete the selected saved statuses?"
-msgstr "Haluatko varmasti poistaa valitut tallenetut tilat?"
+msgstr "Haluatko varmasti poistaa valitut tallennetut tilat?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1266
+#: ../pidgin/gtksavedstatuses.c:620 ../pidgin/gtksavedstatuses.c:1273
 msgid "_Use"
 msgstr "_Käytä"
 
@@ -16600,29 +16832,29 @@
 msgid "Title already in use.  You must choose a unique title."
 msgstr "Otsikko on käytössä. Sinun täytyy valita yksilöllinen otsikko."
 
-#: ../pidgin/gtksavedstatuses.c:970
+#: ../pidgin/gtksavedstatuses.c:976
 msgid "Different"
 msgstr "Eriävyys"
 
-#: ../pidgin/gtksavedstatuses.c:1159
+#: ../pidgin/gtksavedstatuses.c:1165
 msgid "_Title:"
 msgstr "_Otsikko"
 
-#: ../pidgin/gtksavedstatuses.c:1178 ../pidgin/gtksavedstatuses.c:1498
+#: ../pidgin/gtksavedstatuses.c:1184 ../pidgin/gtksavedstatuses.c:1505
 msgid "_Status:"
 msgstr "_Tila:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
+#: ../pidgin/gtksavedstatuses.c:1217
 msgid "Use a _different status for some accounts"
 msgstr "Käytä eri tilaa joillekin käyttäjätileille"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
+#: ../pidgin/gtksavedstatuses.c:1281
 msgid "Sa_ve & Use"
 msgstr "Tallenna ja _käytä"
 
-#: ../pidgin/gtksavedstatuses.c:1481
+#: ../pidgin/gtksavedstatuses.c:1488
 #, c-format
 msgid "Status for %s"
 msgstr "%s:n tila"
@@ -16631,25 +16863,33 @@
 msgid "Waiting for network connection"
 msgstr "Odotetaan verkkoyhteyttä"
 
-#: ../pidgin/gtkutils.c:633
+#: ../pidgin/gtkstatusbox.c:1072
+msgid "New status..."
+msgstr "Uusi tila..."
+
+#: ../pidgin/gtkstatusbox.c:1073
+msgid "Saved statuses..."
+msgstr "Tallennetut tilat..."
+
+#: ../pidgin/gtkutils.c:634
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1400 ../pidgin/gtkutils.c:1423
+#: ../pidgin/gtkutils.c:1401 ../pidgin/gtkutils.c:1424
 #, c-format
 msgid "The following error has occurred loading %s: %s"
 msgstr "Seuraava virhe esiintyi ladattaessa komponenttia %s: %s"
 
-#: ../pidgin/gtkutils.c:1403 ../pidgin/gtkutils.c:1425
+#: ../pidgin/gtkutils.c:1404 ../pidgin/gtkutils.c:1426
 msgid "Failed to load image"
 msgstr "Kuvan avaus epäonnistui"
 
-#: ../pidgin/gtkutils.c:1499
+#: ../pidgin/gtkutils.c:1500
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Ei voida lähettää kansiota %s."
 
-#: ../pidgin/gtkutils.c:1500
+#: ../pidgin/gtkutils.c:1501
 #, c-format
 msgid ""
 "%s cannot transfer a folder. You will need to send the files within "
@@ -16658,12 +16898,12 @@
 "%s ei voi siirtää kansiota. Kansion sisältämät tiedostot täytyy lähettää "
 "erikseen."
 
-#: ../pidgin/gtkutils.c:1534 ../pidgin/gtkutils.c:1546
-#: ../pidgin/gtkutils.c:1553
+#: ../pidgin/gtkutils.c:1535 ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1554
 msgid "You have dragged an image"
 msgstr "Olet raahannut kuvan"
 
-#: ../pidgin/gtkutils.c:1535
+#: ../pidgin/gtkutils.c:1536
 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."
@@ -16671,23 +16911,23 @@
 "Voit lähettää tämän kuvan tiedostonsiirtona, sisällyttää sen tähän viestiin "
 "tai käyttää sitä tuttavakuvakkeena tälle käyttäjälle."
 
-#: ../pidgin/gtkutils.c:1541 ../pidgin/gtkutils.c:1561
+#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
 msgid "Set as buddy icon"
 msgstr "Aseta tuttavakuvakkeeksi"
 
-#: ../pidgin/gtkutils.c:1542 ../pidgin/gtkutils.c:1562
+#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1563
 msgid "Send image file"
 msgstr "Lähetä kuvatiedosto"
 
-#: ../pidgin/gtkutils.c:1543 ../pidgin/gtkutils.c:1562
+#: ../pidgin/gtkutils.c:1544 ../pidgin/gtkutils.c:1563
 msgid "Insert in message"
 msgstr "Liitä viestiin"
 
-#: ../pidgin/gtkutils.c:1547
+#: ../pidgin/gtkutils.c:1548
 msgid "Would you like to set it as the buddy icon for this user?"
 msgstr "Haluatko asettaa sen tuttavakuvakkeeksi tälle käyttäjälle?"
 
-#: ../pidgin/gtkutils.c:1554
+#: ../pidgin/gtkutils.c:1555
 msgid ""
 "You can send this image as a file transfer, or use it as the buddy icon for "
 "this user."
@@ -16695,7 +16935,7 @@
 "Voit lähettää tämän kuvan tiedostonsiirtona tai käyttää sitä "
 "tuttavakuvakkeena tälle käyttäjälle."
 
-#: ../pidgin/gtkutils.c:1555
+#: ../pidgin/gtkutils.c:1556
 msgid ""
 "You can insert this image into this message, or use it as the buddy icon for "
 "this user"
@@ -16708,11 +16948,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:1614
+#: ../pidgin/gtkutils.c:1615
 msgid "Cannot send launcher"
 msgstr "Ei voida lähettää käynnistintä"
 
-#: ../pidgin/gtkutils.c:1614
+#: ../pidgin/gtkutils.c:1615
 msgid ""
 "You dragged a desktop launcher. Most likely you wanted to send whatever this "
 "launcher points to instead of this launcher itself."
@@ -16720,7 +16960,7 @@
 "Raahasit työpöytäkäynnistimen. Luultavasti halusit lähettää tiedoston johon "
 "käynnistin osoittaa, käynnistimen itsensä sijaan."
 
-#: ../pidgin/gtkutils.c:2349
+#: ../pidgin/gtkutils.c:2350
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16731,30 +16971,30 @@
 "<b>Tiedoston koko:</b> %s\n"
 "<b>Kuvan koko:</b> %d × %d"
 
-#: ../pidgin/gtkutils.c:2645
+#: ../pidgin/gtkutils.c:2646
 #, c-format
 msgid "The file '%s' is too large for %s.  Please try a smaller image.\n"
 msgstr "Tiedosto \"%s\" on liian suuri \"%s\":lle. Kokeile pienempää kuvaa.\n"
 
-#: ../pidgin/gtkutils.c:2647
+#: ../pidgin/gtkutils.c:2648
 msgid "Icon Error"
 msgstr "Kuvakevirhe"
 
-#: ../pidgin/gtkutils.c:2648
+#: ../pidgin/gtkutils.c:2649
 msgid "Could not set icon"
-msgstr "Kuvaketta ei voitu asettaa"
-
-#: ../pidgin/gtkutils.c:2748
+msgstr "Kuvaketta ei voi asettaa"
+
+#: ../pidgin/gtkutils.c:2749
 #, c-format
 msgid "Failed to open file '%s': %s"
-msgstr "Ei voitu avata tiedostoa \"%s\": %s"
-
-#: ../pidgin/gtkutils.c:2797
+msgstr "Ei voi avata tiedostoa \"%s\": %s"
+
+#: ../pidgin/gtkutils.c:2798
 #, c-format
 msgid ""
 "Failed to load image '%s': reason not known, probably a corrupt image file"
 msgstr ""
-"Ei voitu ladata kuvaa \"%s\": syy ei ole tiedossa, mahdollisesti vioittunut "
+"Ei voi ladata kuvaa \"%s\": syy ei ole tiedossa, mahdollisesti vioittunut "
 "kuvatiedosto"
 
 #: ../pidgin/gtkwhiteboard.c:754 ../pidgin/gtkwhiteboard.c:773
@@ -16805,35 +17045,35 @@
 msgid "none"
 msgstr "ei mitään"
 
-#: ../pidgin/plugins/cap/cap.c:450
+#: ../pidgin/plugins/cap/cap.c:451
 msgid "Display Statistics"
 msgstr "Näytä tilastot"
 
-#: ../pidgin/plugins/cap/cap.c:462 ../pidgin/plugins/cap/cap.c:465
+#: ../pidgin/plugins/cap/cap.c:464 ../pidgin/plugins/cap/cap.c:467
 msgid "Response Probability:"
 msgstr "Vastaustodennäköisyys:"
 
-#: ../pidgin/plugins/cap/cap.c:811
+#: ../pidgin/plugins/cap/cap.c:813
 msgid "Statistics Configuration"
 msgstr "Tilastoinnin asetukset"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
+#: ../pidgin/plugins/cap/cap.c:816
 msgid "Maximum response timeout:"
 msgstr "Suurin vastauksen aikakatkaisu:"
 
-#: ../pidgin/plugins/cap/cap.c:817 ../pidgin/plugins/cap/cap.c:824
-#: ../pidgin/plugins/cap/cap.c:831 ../pidgin/plugins/timestamp.c:150
+#: ../pidgin/plugins/cap/cap.c:819 ../pidgin/plugins/cap/cap.c:826
+#: ../pidgin/plugins/cap/cap.c:833 ../pidgin/plugins/timestamp.c:150
 msgid "minutes"
 msgstr "minuuttia"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
+#: ../pidgin/plugins/cap/cap.c:823
 msgid "Maximum last-seen difference:"
 msgstr "Suurin viimeksi-nähty -arvon ero:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
+#: ../pidgin/plugins/cap/cap.c:830
 msgid "Threshold:"
 msgstr "Kynnys:"
 
@@ -16843,24 +17083,24 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:936
+#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction"
 msgstr "Tuttavan paikallaolon ennustus"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:938
+#: ../pidgin/plugins/cap/cap.c:940
 msgid "Contact Availability Prediction plugin."
 msgstr "Tuttavan paikallaolon ennustava liitännäinen."
 
 #. *  summary
-#: ../pidgin/plugins/cap/cap.c:939
+#: ../pidgin/plugins/cap/cap.c:941
 msgid ""
 "The contact availability plugin (cap) is used to display statistical "
 "information about buddies in a users contact list."
 msgstr ""
 "Tuttavan paikallaolon liitännäinen (cap) näyttää tilastollisia tietoja "
-"tuttavalistalla olevista tuttavista."
+"tuttavista."
 
 #: ../pidgin/plugins/contact_priority.c:61
 msgid "Buddy is idle"
@@ -17125,7 +17365,7 @@
 #: ../pidgin/plugins/gevolution/gevolution.c:240
 #: ../pidgin/plugins/gevolution/gevolution.c:246
 msgid "Unable to send e-mail"
-msgstr "Sähköpostia ei voitu lähettää."
+msgstr "Sähköpostia ei voi lähettää."
 
 #: ../pidgin/plugins/gevolution/gevolution.c:241
 msgid "The evolution executable was not found in the PATH."
@@ -17250,7 +17490,7 @@
 #. *  description
 #: ../pidgin/plugins/iconaway.c:85 ../pidgin/plugins/iconaway.c:87
 msgid "Iconifies the buddy list and your conversations when you go away."
-msgstr "Pienentää tuttavalista- ja keskusteluikkunan poissaoloajaksi."
+msgstr "Pienentää tuttavat- ja keskusteluikkunan poissaoloajaksi."
 
 #: ../pidgin/plugins/mailchk.c:160
 msgid "Mail Checker"
@@ -17262,8 +17502,7 @@
 
 #: ../pidgin/plugins/mailchk.c:163
 msgid "Adds a small box to the buddy list that shows if you have new mail."
-msgstr ""
-"Lisää pienen neliön tuttavalistaan, joka ilmoittaa uudesta sähköpostista."
+msgstr "Lisää pienen neliön tuttaviin, joka ilmoittaa uudesta sähköpostista."
 
 #: ../pidgin/plugins/markerline.c:23
 msgid "Markerline"
@@ -17466,7 +17705,7 @@
 "Tämä liitännäinen on tosi viilee ja tekee vaikka mitä:\n"
 "- Kertoo kuka laati ohjelman kun kirjaudut sisään\n"
 "- Kääntää kaiken tulevan tekstin ympäri\n"
-"- Lähettää viestin listallaoleville tuttavillesi aina kun he kirjautuvat "
+"- Lähettää viestin listalla oleville tuttavillesi aina kun he kirjautuvat "
 "sisään"
 
 #: ../pidgin/plugins/pidginrc.c:41
@@ -17700,7 +17939,7 @@
 
 #: ../pidgin/plugins/spellchk.c:2374 ../pidgin/plugins/spellchk.c:2375
 msgid "Replaces text in outgoing messages according to user-defined rules."
-msgstr "Korvaa lähetetettävän tekstin käyttäjän määritelmän mukaan."
+msgstr "Korvaa lähetettävän tekstin käyttäjän määritelmän mukaan."
 
 #. *< type
 #. *< ui_requirement
@@ -17718,7 +17957,7 @@
 #. *  description
 #: ../pidgin/plugins/ticker/ticker.c:359 ../pidgin/plugins/ticker/ticker.c:361
 msgid "A horizontal scrolling version of the buddy list."
-msgstr "Vaakatasossa rullaava versio tuttavalistasta."
+msgstr "Vaakatasossa rullaava versio tuttavista."
 
 #: ../pidgin/plugins/timestamp.c:137
 msgid "Display Timestamps Every"
@@ -17836,17 +18075,17 @@
 #. Buddy List trans options
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
-msgstr "Tuttavalistaikkuna"
+msgstr "Tuttavat-ikkuna"
 
 # NOTE source: gimp + google
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
-msgstr "_Tuttavalistaikkunan läpinäkyvyys"
+msgstr "_Tuttavat-ikkunan läpinäkyvyys"
 
 # NOTE source: gimp + google
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
-msgstr "Poista tuttavalistaikkunan läpinäkyvyys sen ollessa kohdistettuna"
+msgstr "Poista tuttavat-ikkunan läpinäkyvyys sen ollessa kohdistettuna"
 
 # NOTE source: gimp + google
 #. *< type
@@ -17864,7 +18103,7 @@
 #. *  summary
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
-msgstr "Vaihteleva läpinäkyvyys tuttavalistalle ja keskusteluille."
+msgstr "Vaihteleva läpinäkyvyys tuttavat-ikkunalle ja keskusteluille."
 
 #. *  description
 #: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
@@ -17874,7 +18113,7 @@
 "\n"
 "* Note: This plugin requires Win2000 or greater."
 msgstr ""
-"Tämä liitännäinen mahdollistaa keskusteluikkunoiden ja tuttavalistaikkunan "
+"Tämä liitännäinen mahdollistaa keskusteluikkunoiden ja tuttavat-ikkunan "
 "läpinäkyvyyden.\n"
 "\n"
 "Huomaa: Tämä liitännäinen vaatii Win2000 tai uudemman."
@@ -17895,12 +18134,12 @@
 
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
-msgstr "_Telakoi tuttavalista ruudun reunaan"
+msgstr "_Telakoi tuttavat-ikkuna ruudun reunaan"
 
 #. Blist On Top
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
-msgstr "_Pidä tuttavalistaikkuna päällimmäisenä:"
+msgstr "_Pidä tuttavat-ikkuna päällimmäisenä:"
 
 #. XXX: Did this ever work?
 #: ../pidgin/plugins/win32/winprefs/winprefs.c:336
@@ -17923,7 +18162,7 @@
 msgid ""
 "Provides options specific to Pidgin for Windows , such as buddy list docking."
 msgstr ""
-"Tarjoaa Windows Pidgin -sidonnaisia valintoja, kuten tuttavalistan "
+"Tarjoaa Windows Pidgin -sidonnaisia valintoja, kuten tuttavat-ikkunan "
 "telakoinnin."
 
 #: ../pidgin/plugins/xmppconsole.c:670
@@ -17975,6 +18214,32 @@
 "Tätä liitännäistä voidaan käyttää XMPP-palvelimien tai -asiakasohjelmien "
 "virheenjäljitykseen."
 
+#~ msgid "There were errors unloading the plugin."
+#~ msgstr "Poistettaessa liitännäistä käytöstä tapahtui virheitä."
+
+#~ msgid "Couldn't open file"
+#~ msgstr "Tiedoston avaus ei onnistunut"
+
+#~ msgid "Error initializing session"
+#~ msgstr "Virhe istunnon alustuksessa"
+
+#~ msgid "Unable to make SSL connection to server."
+#~ msgstr "Palvelimeen ei kyetty muodostamaan SSL-yhteyttä."
+
+#~ msgid "<span color=\"red\">%s disconnected: %s</span>"
+#~ msgstr "<span color=\"red\">%s kirjautui ulos: %s</span>"
+
+#~ 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 ei yritä uudelleenyhdistää käyttäjätiliä kunnes korjaat virheen ja "
+#~ "otat tilin uudelleen käyttöön."
+
 #, fuzzy
 #~ msgid "Unable to connect to contact server"
 #~ msgstr "Palvelimeen ei kyetty muodostamaan yhteyttä."
@@ -17996,12 +18261,6 @@
 #~ msgid "Sort by log size"
 #~ msgstr "Lajittele lokin koon mukaan"
 
-#~ msgid "Has you"
-#~ msgstr "Olet hänen listallaan"
-
-#~ msgid "MSN Protocol Plugin"
-#~ msgstr "MSN-yhteyskäytäntöliitännäinen"
-
 #, fuzzy
 #~ msgid "_Send File"
 #~ msgstr "Lähetä tiedosto"
@@ -18758,9 +19017,6 @@
 #~ msgid "Feature Calibration"
 #~ msgstr "Piirteiden tarkistus"
 
-#~ msgid "Disabled"
-#~ msgstr "Pois päältä"
-
 #~ msgid "gaim_proxy_connect() failed"
 #~ msgstr "gaim_proxy_connect() epäonnistui"
 
@@ -19051,12 +19307,6 @@
 #~ msgid "Use AIM/ICQ proxy server (slower, but usually works)"
 #~ msgstr "Käytä AIM/ICQ-välipalvelinta (hitaampi, mutta toimii useimmiten)"
 
-#~ msgid "New Status..."
-#~ msgstr "Uusi tila..."
-
-#~ msgid "Saved Status..."
-#~ msgstr "Tallennettu tila..."
-
 #~ msgid "Custom Status..."
 #~ msgstr "Mukautettu tila..."
 
@@ -19481,9 +19731,6 @@
 #~ msgid "Trepia Protocol Plugin"
 #~ msgstr "Trepia-protokollaliitännäinen"
 
-#~ msgid "Reconnect"
-#~ msgstr "Uudelleenyhdistä"
-
 #~ msgid "Reason Unknown."
 #~ msgstr "Tuntematon syy."
 
@@ -19779,9 +20026,6 @@
 #~ msgid "Burmese"
 #~ msgstr "burma"
 
-#~ msgid "Punjabi"
-#~ msgstr "punjabi"
-
 #~ msgid "Ukrainian"
 #~ msgstr "ukraina"
 
@@ -19999,9 +20243,6 @@
 #~ msgid "Sex"
 #~ msgstr "Sukupuoli"
 
-#~ msgid "Couldn't Import Buddy List from Server"
-#~ msgstr "Ei voitu tuoda tuttavalistaa palvelimelta"
-
 #~ msgid "Buddy List successfully transferred to Gadu-Gadu server"
 #~ msgstr "Tuttavalista siirretty onnistuneesti Gadu-Gadu-palvelimelle"
 
--- a/po/sv.po	Wed Nov 14 12:42:23 2007 +0000
+++ b/po/sv.po	Wed Nov 14 12:44:45 2007 +0000
@@ -1,7 +1,7 @@
 # Pidgin Swedish translation
 # Copyright (C) 2001, Christian Rose <menthos@menthos.com>
 # Copyright (C) 2003-2004, Tore Lundqvist
-# Copyright (C) 2004-2007, Peter Hjalmarsson
+# Copyright (C) 2004-2007, Peter Hjalmarsson <xake@rymdraket.net>
 #
 # This file is distributed under the same license as the Pidgin package.
 #
@@ -9,8 +9,8 @@
 msgstr ""
 "Project-Id-Version: Pidgin\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-10-31 21:20+0100\n"
-"PO-Revision-Date: 2007-10-31 21:23+0100\n"
+"POT-Creation-Date: 2007-11-14 11:04+0100\n"
+"PO-Revision-Date: 2007-11-14 11:02+0100\n"
 "Last-Translator: Peter Hjalmarsson <xake@rymdraket.net>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -18,19 +18,13 @@
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
-#: ../finch/finch.c:64
-#: ../finch/finch.c:301
-#: ../finch/finch.c:330
-#: ../finch/finch.c:418
 msgid "Finch"
 msgstr "Finch"
 
-#: ../finch/finch.c:206
 #, c-format
 msgid "%s. Try `%s -h' for more information.\n"
 msgstr "%s. Försök med '%s -h' för mer information.\n"
 
-#: ../finch/finch.c:208
 #, c-format
 msgid ""
 "%s\n"
@@ -51,649 +45,256 @@
 "  -n, --nologin       logga inte in automatiskt\n"
 "  -v, --version       visa den nuvarande versionen och avsluta\n"
 
-#: ../finch/finch.c:328
-#: ../pidgin/gtkmain.c:718
-#, 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:124
-#: ../finch/gntaccount.c:484
-#: ../finch/gntblist.c:300
-#: ../finch/gntblist.c:433
-#: ../finch/gntblist.c:446
-#: ../finch/gntplugin.c:187
-#: ../finch/gntplugin.c:235
-#: ../finch/gntstatus.c:301
-#: ../finch/gntstatus.c:310
-#: ../finch/plugins/gntclipboard.c:115
-#: ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
-#: ../libpurple/protocols/jabber/buddy.c:2032
-#: ../libpurple/protocols/jabber/chat.c:677
-#: ../libpurple/protocols/jabber/chat.c:688
-#: ../libpurple/protocols/jabber/jabber.c:1515
-#: ../libpurple/protocols/qq/group_join.c:328
-#: ../libpurple/protocols/qq/im.c:576
-#: ../libpurple/protocols/silc/ops.c:57
-#: ../libpurple/protocols/silc/ops.c:1460
-#: ../libpurple/protocols/silc10/ops.c:1451
+#, 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"
+
 msgid "Error"
 msgstr "Fel"
 
-#: ../finch/gntaccount.c:124
 msgid "Account was not added"
 msgstr "Kontot lades inte till"
 
-#: ../finch/gntaccount.c:125
 msgid "Screenname of an account must be non-empty."
 msgstr "Skärmnamnet för ett konto får inte vara tomt."
 
-#: ../finch/gntaccount.c:437
 msgid "New mail notifications"
 msgstr "Rapportering av ny e-post"
 
-#: ../finch/gntaccount.c:447
 msgid "Remember password"
 msgstr "Kom ihåg lösenordet"
 
-#: ../finch/gntaccount.c:485
 msgid "There's no protocol plugins installed."
 msgstr "Det finns inga moduler för protokoll installerade."
 
-#: ../finch/gntaccount.c:486
 msgid "(You probably forgot to 'make install'.)"
 msgstr "(Du glömde antagligen att köra 'make install'.)"
 
-#: ../finch/gntaccount.c:496
-#: ../finch/gntconn.c:137
-#: ../pidgin/gtkaccount.c:1478
-#: ../pidgin/gtkblist.c:4371
 msgid "Modify Account"
 msgstr "Ändra konto"
 
-#: ../finch/gntaccount.c:496
 msgid "New Account"
 msgstr "Nytt konto"
 
-#: ../finch/gntaccount.c:521
-#: ../pidgin/gtkft.c:696
 msgid "Protocol:"
 msgstr "Protokoll:"
 
-#: ../finch/gntaccount.c:529
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:290
 msgid "Screen name:"
 msgstr "Skärmnamn:"
 
-#: ../finch/gntaccount.c:542
 msgid "Password:"
 msgstr "Lösenord:"
 
-#: ../finch/gntaccount.c:552
 msgid "Alias:"
 msgstr "Alias:"
 
 #. Cancel button
 #. Cancel
-#: ../finch/gntaccount.c:575
-#: ../finch/gntaccount.c:638
-#: ../finch/gntaccount.c:889
-#: ../finch/gntblist.c:344
-#: ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456
-#: ../finch/gntblist.c:803
-#: ../finch/gntblist.c:1005
-#: ../finch/gntblist.c:1101
-#: ../finch/gntblist.c:2224
-#: ../finch/gntblist.c:2287
-#: ../finch/gntcertmgr.c:91
-#: ../finch/gntplugin.c:472
-#: ../finch/gntpounce.c:459
-#: ../finch/gntpounce.c:667
-#: ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1058
-#: ../finch/gntstatus.c:145
-#: ../finch/gntstatus.c:485
-#: ../finch/gntstatus.c:610
-#: ../libpurple/account.c:1013
-#: ../libpurple/account.c:1263
-#: ../libpurple/account.c:1298
-#: ../libpurple/conversation.c:1215
-#: ../libpurple/plugins/buddynote.c:51
-#: ../libpurple/protocols/gg/gg.c:507
-#: ../libpurple/protocols/gg/gg.c:666
-#: ../libpurple/protocols/gg/gg.c:803
-#: ../libpurple/protocols/gg/gg.c:884
-#: ../libpurple/protocols/jabber/buddy.c:728
-#: ../libpurple/protocols/jabber/buddy.c:2416
-#: ../libpurple/protocols/jabber/buddy.c:2452
-#: ../libpurple/protocols/jabber/chat.c:786
-#: ../libpurple/protocols/jabber/jabber.c:1008
-#: ../libpurple/protocols/jabber/jabber.c:1017
-#: ../libpurple/protocols/jabber/jabber.c:1737
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/jabber/usermood.c:202
-#: ../libpurple/protocols/jabber/usernick.c:78
-#: ../libpurple/protocols/jabber/xdata.c:400
-#: ../libpurple/protocols/msn/msn.c:291
-#: ../libpurple/protocols/msn/msn.c:308
-#: ../libpurple/protocols/msn/msn.c:325
-#: ../libpurple/protocols/msn/msn.c:342
-#: ../libpurple/protocols/msn/msn.c:363
-#: ../libpurple/protocols/oscar/oscar.c:6149
-#: ../libpurple/protocols/oscar/peer.c:1048
-#: ../libpurple/protocols/qq/buddy_info.c:525
-#: ../libpurple/protocols/qq/buddy_opt.c:214
-#: ../libpurple/protocols/qq/buddy_opt.c:411
-#: ../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:113
-#: ../libpurple/protocols/qq/sys_msg.c:172
-#: ../libpurple/protocols/qq/sys_msg.c:266
-#: ../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:1079
-#: ../libpurple/protocols/silc/buddy.c:1194
-#: ../libpurple/protocols/silc/chat.c:620
-#: ../libpurple/protocols/silc/chat.c:750
-#: ../libpurple/protocols/silc/ops.c:1820
-#: ../libpurple/protocols/silc/silc.c:954
-#: ../libpurple/protocols/silc/silc.c:1162
-#: ../libpurple/protocols/silc10/buddy.c:468
-#: ../libpurple/protocols/silc10/buddy.c:1087
-#: ../libpurple/protocols/silc10/buddy.c:1192
-#: ../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:1034
-#: ../libpurple/protocols/yahoo/yahoo.c:3500
-#: ../libpurple/protocols/yahoo/yahoo.c:3511
-#: ../pidgin/gtkaccount.c:1913
-#: ../pidgin/gtkaccount.c:2501
-#: ../pidgin/gtkblist.c:6325
-#: ../pidgin/gtkcertmgr.c:197
-#: ../pidgin/gtkdialogs.c:772
-#: ../pidgin/gtkdialogs.c:911
-#: ../pidgin/gtkdialogs.c:1003
-#: ../pidgin/gtkdialogs.c:1023
-#: ../pidgin/gtkdialogs.c:1047
-#: ../pidgin/gtkdialogs.c:1069
-#: ../pidgin/gtkdialogs.c:1117
-#: ../pidgin/gtkdialogs.c:1158
-#: ../pidgin/gtkdialogs.c:1214
-#: ../pidgin/gtkdialogs.c:1253
-#: ../pidgin/gtkdialogs.c:1280
-#: ../pidgin/gtkimhtmltoolbar.c:435
-#: ../pidgin/gtklog.c:328
-#: ../pidgin/gtkplugin.c:289
-#: ../pidgin/gtkpounce.c:1113
-#: ../pidgin/gtkprivacy.c:563
-#: ../pidgin/gtkprivacy.c:579
-#: ../pidgin/gtkprivacy.c:604
-#: ../pidgin/gtkprivacy.c:618
-#: ../pidgin/gtkrequest.c:271
-#: ../pidgin/gtksavedstatuses.c:345
-#: ../pidgin/gtkstatusbox.c:1593
 msgid "Cancel"
 msgstr "Avbryt"
 
-# src/menus.c:280
 #. Save button
 #. Save
-#: ../finch/gntaccount.c:579
-#: ../finch/gntcertmgr.c:311
-#: ../finch/gntdebug.c:297
-#: ../finch/gntplugin.c:472
-#: ../finch/gntpounce.c:465
-#: ../finch/gntprefs.c:265
-#: ../finch/gntsound.c:1055
-#: ../finch/gntstatus.c:488
-#: ../finch/gntstatus.c:598
-#: ../libpurple/account.c:1297
-#: ../libpurple/plugins/buddynote.c:50
-#: ../libpurple/protocols/jabber/buddy.c:727
-#: ../pidgin/gtkdebug.c:749
-#: ../pidgin/gtkrequest.c:277
 msgid "Save"
 msgstr "Spara"
 
-#: ../finch/gntaccount.c:632
-#: ../pidgin/gtkaccount.c:1905
-#: ../pidgin/gtksavedstatuses.c:333
-#: ../pidgin/gtkstatusbox.c:1587
 #, 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:635
 msgid "Delete Account"
 msgstr "Ta bort konto"
 
 #. Delete button
-#: ../finch/gntaccount.c:637
-#: ../finch/gntaccount.c:707
-#: ../finch/gntcertmgr.c:319
-#: ../finch/gntpounce.c:666
-#: ../finch/gntpounce.c:729
-#: ../finch/gntstatus.c:144
-#: ../finch/gntstatus.c:210
-#: ../pidgin/gtkaccount.c:1912
-#: ../pidgin/gtklog.c:327
-#: ../pidgin/gtkpounce.c:1112
-#: ../pidgin/gtkrequest.c:274
-#: ../pidgin/gtksavedstatuses.c:344
-#: ../pidgin/gtkstatusbox.c:1592
 msgid "Delete"
 msgstr "Ta bort"
 
-#: ../finch/gntaccount.c:669
-#: ../finch/gntblist.c:2121
-#: ../finch/gntui.c:82
-#: ../pidgin/gtkaccount.c:2331
-#: ../pidgin/gtkdocklet.c:715
 msgid "Accounts"
 msgstr "Konton"
 
-#: ../finch/gntaccount.c:675
 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:698
-#: ../finch/gntaccount.c:888
-#: ../finch/gntblist.c:343
-#: ../finch/gntblist.c:421
-#: ../finch/gntblist.c:456
-#: ../finch/gntblist.c:2372
-#: ../finch/gntcertmgr.c:306
-#: ../finch/gntnotify.c:385
-#: ../finch/gntpounce.c:713
-#: ../finch/gntstatus.c:199
-#: ../libpurple/protocols/gg/gg.c:883
-#: ../libpurple/protocols/qq/sys_msg.c:114
-#: ../libpurple/protocols/qq/sys_msg.c:173
-#: ../libpurple/protocols/qq/sys_msg.c:267
-#: ../libpurple/protocols/sametime/sametime.c:5486
-#: ../libpurple/protocols/silc/chat.c:619
-#: ../libpurple/protocols/silc10/chat.c:599
-#: ../pidgin/gtkaccount.c:2500
-#: ../pidgin/gtkblist.c:6324
-#: ../pidgin/gtkconv.c:1713
-#: ../pidgin/gtkrequest.c:275
 msgid "Add"
 msgstr "Lägg till"
 
 #. Modify button
-#: ../finch/gntaccount.c:703
-#: ../finch/gntpounce.c:721
 msgid "Modify"
 msgstr "Ändra"
 
-#: ../finch/gntaccount.c:811
-#: ../pidgin/gtkaccount.c:2447
 #, 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:884
-#: ../pidgin/gtkaccount.c:2499
 msgid "Add buddy to your list?"
 msgstr "Lägg till kompisen i din lista?"
 
-#: ../finch/gntaccount.c:944
-#: ../pidgin/gtkaccount.c:2557
 #, 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:969
-#: ../finch/gntaccount.c:972
-#: ../finch/gntaccount.c:999
-#: ../pidgin/gtkaccount.c:2580
-#: ../pidgin/gtkaccount.c:2586
 msgid "Authorize buddy?"
 msgstr "Auktorisera kompis?"
 
-#: ../finch/gntaccount.c:976
-#: ../finch/gntaccount.c:1003
-#: ../pidgin/gtkaccount.c:2581
-#: ../pidgin/gtkaccount.c:2587
 msgid "Authorize"
 msgstr "Auktorisera"
 
-#: ../finch/gntaccount.c:977
-#: ../finch/gntaccount.c:1004
-#: ../pidgin/gtkaccount.c:2582
-#: ../pidgin/gtkaccount.c:2588
 msgid "Deny"
 msgstr "Neka"
 
-#: ../finch/gntblist.c:289
 msgid "You must provide a screename for the buddy."
 msgstr "Du måste ange ett skrämnamn för kompisen."
 
-#: ../finch/gntblist.c:291
 msgid "You must provide a group."
 msgstr "Du måste ange en grupp."
 
-#: ../finch/gntblist.c:293
 msgid "You must select an account."
 msgstr "Du måste välja ett konto."
 
-#: ../finch/gntblist.c:295
 msgid "The selected account is not online."
 msgstr "Det valda kontot är inte anslutet."
 
-#: ../finch/gntblist.c:300
 msgid "Error adding buddy"
 msgstr "Gick inte lägga till kompis"
 
-#: ../finch/gntblist.c:325
-#: ../libpurple/protocols/oscar/oscar.c:2903
-#: ../pidgin/gtkaccount.c:1986
-#: ../pidgin/gtksavedstatuses.c:980
 msgid "Screen Name"
 msgstr "Användar-ID"
 
-#: ../finch/gntblist.c:328
-#: ../finch/gntblist.c:410
-#: ../finch/gntblist.c:1250
-#: ../libpurple/protocols/msn/msn.c:1514
-#: ../libpurple/protocols/silc/chat.c:610
-#: ../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:1022
-#: ../pidgin/gtkdialogs.c:1046
-#: ../pidgin/gtkdialogs.c:1068
-#: ../pidgin/gtkrequest.c:278
 msgid "Alias"
 msgstr "Alias"
 
-#: ../finch/gntblist.c:331
-#: ../finch/gntblist.c:413
 msgid "Group"
 msgstr "Grupp"
 
-#: ../finch/gntblist.c:335
-#: ../finch/gntblist.c:401
-#: ../finch/gntblist.c:1305
-#: ../finch/gntblist.c:2210
-#: ../finch/gntblist.c:2274
-#: ../finch/gntnotify.c:174
-#: ../finch/gntstatus.c:576
-#: ../libpurple/plugins/idle.c:153
-#: ../libpurple/plugins/idle.c:190
-#: ../pidgin/gtkblist.c:3209
-#: ../pidgin/gtknotify.c:511
-#: ../pidgin/gtkpounce.c:1280
-#: ../pidgin/plugins/gevolution/gevolution.c:445
 msgid "Account"
 msgstr "Konto"
 
-#: ../finch/gntblist.c:341
-#: ../finch/gntblist.c:852
-#: ../libpurple/protocols/silc/buddy.c:725
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/buddy.c:1075
-#: ../libpurple/protocols/silc/buddy.c:1185
-#: ../libpurple/protocols/silc10/buddy.c:737
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/buddy.c:1083
-#: ../libpurple/protocols/silc10/buddy.c:1183
-#: ../libpurple/protocols/yahoo/yahoo.c:3345
-#: ../pidgin/gtkblist.c:5830
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:445
 msgid "Add Buddy"
 msgstr "Lägg till kompis"
 
-#: ../finch/gntblist.c:341
 msgid "Please enter buddy information."
 msgstr "Fel då kompisen skulle läggas till"
 
-#: ../finch/gntblist.c:370
-#: ../libpurple/blist.c:1210
 msgid "Chats"
 msgstr "Chattar"
 
 #. Extract their Name and put it in
-#: ../finch/gntblist.c:407
-#: ../finch/gntblist.c:2205
-#: ../libpurple/protocols/jabber/jabber.c:924
-#: ../libpurple/protocols/jabber/jabber.c:927
-#: ../libpurple/protocols/msn/msn.c:1695
-#: ../libpurple/protocols/msn/msn.c:1760
-#: ../libpurple/protocols/msn/msn.c:1787
-#: ../libpurple/protocols/qq/buddy_info.c:44
-#: ../pidgin/gtkplugin.c:582
-#: ../pidgin/gtkroomlist.c:618
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:132
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:123
 msgid "Name"
 msgstr "Namn"
 
-#: ../finch/gntblist.c:416
-#: ../finch/gntblist.c:819
 msgid "Auto-join"
 msgstr "Anslut automatiskt"
 
-#: ../finch/gntblist.c:419
-#: ../finch/gntblist.c:854
-#: ../pidgin/gtkblist.c:6212
 msgid "Add Chat"
 msgstr "Lägg till chatt"
 
-#: ../finch/gntblist.c:420
 msgid "You can edit more information from the context menu later."
 msgstr "Du kan ändra mer information från omgivningsmenyn senare."
 
-#: ../finch/gntblist.c:433
-#: ../finch/gntblist.c:446
 msgid "Error adding group"
 msgstr "Fel då gruppen skulle läggas till"
 
-#: ../finch/gntblist.c:434
 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:447
 msgid "A group with the name already exists."
 msgstr "En grupp med det namnet finns redan."
 
-#: ../finch/gntblist.c:454
-#: ../finch/gntblist.c:856
-#: ../libpurple/protocols/sametime/sametime.c:5396
-#: ../libpurple/protocols/sametime/sametime.c:5484
-#: ../pidgin/gtkblist.c:6321
 msgid "Add Group"
 msgstr "Lägg till grupp"
 
-#: ../finch/gntblist.c:454
 msgid "Enter the name of the group"
 msgstr "Ange namnet på gruppen"
 
-#: ../finch/gntblist.c:802
 msgid "Edit Chat"
 msgstr "Ändra chatt"
 
-#: ../finch/gntblist.c:802
 msgid "Please Update the necessary fields."
 msgstr "Var vänlig uppdatera de nödvändiga fälten."
 
-#: ../finch/gntblist.c:803
-#: ../finch/gntstatus.c:205
 msgid "Edit"
 msgstr "Redigera"
 
-#: ../finch/gntblist.c:828
 msgid "Edit Settings"
 msgstr "Ändra inställningar"
 
-#: ../finch/gntblist.c:864
-#: ../pidgin/gtkutils.c:930
 msgid "Information"
 msgstr "Information"
 
-#: ../finch/gntblist.c:864
-#: ../pidgin/gtkutils.c:930
 msgid "Retrieving..."
 msgstr "Hämtar..."
 
-#: ../finch/gntblist.c:904
-#: ../finch/gntconv.c:534
-#: ../libpurple/protocols/silc/chat.c:903
-#: ../libpurple/protocols/silc10/chat.c:883
 msgid "Get Info"
 msgstr "Hämta info"
 
-#: ../finch/gntblist.c:908
 msgid "Add Buddy Pounce"
 msgstr "Lägg till kompisövervakning"
 
 #. if (q_bud && is_online(q_bud->status)) {
-#: ../finch/gntblist.c:915
-#: ../finch/gntconv.c:546
-#: ../libpurple/protocols/jabber/si.c:874
-#: ../libpurple/protocols/oscar/oscar.c:654
-#: ../libpurple/protocols/qq/qq.c:587
-#: ../pidgin/gtkconv.c:1661
 msgid "Send File"
 msgstr "Skicka fil"
 
-#: ../finch/gntblist.c:919
 msgid "View Log"
 msgstr "Visa logg"
 
-#: ../finch/gntblist.c:1000
 #, c-format
 msgid "Please enter the new name for %s"
 msgstr "Ange det nya namnet för %s"
 
-#: ../finch/gntblist.c:1002
-#: ../finch/gntblist.c:1250
 msgid "Rename"
 msgstr "Byt namn"
 
-#: ../finch/gntblist.c:1002
 msgid "Set Alias"
 msgstr "Ange alias"
 
-#: ../finch/gntblist.c:1003
 msgid "Enter empty string to reset the name."
 msgstr "Ange en tom sträng för att nollställa namnet."
 
-#: ../finch/gntblist.c:1079
 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:1087
 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:1092
 #, 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:1095
 msgid "Confirm Remove"
 msgstr "Bekräfta borttagning"
 
-#: ../finch/gntblist.c:1100
-#: ../finch/gntblist.c:1252
-#: ../finch/gntft.c:227
-#: ../pidgin/gtkconv.c:1710
-#: ../pidgin/gtkrequest.c:276
-#: ../pidgin/gtkstatusbox.c:264
 msgid "Remove"
 msgstr "Ta bort"
 
 #. Buddy List
-#: ../finch/gntblist.c:1226
-#: ../finch/gntblist.c:2422
-#: ../finch/gntprefs.c:258
-#: ../finch/gntui.c:83
-#: ../pidgin/gtkblist.c:2889
-#: ../pidgin/gtkblist.c:4614
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:326
 msgid "Buddy List"
 msgstr "Kompislista"
 
-#: ../finch/gntblist.c:1257
 msgid "Place tagged"
 msgstr "Platsen är markerad"
 
-#: ../finch/gntblist.c:1262
 msgid "Toggle Tag"
 msgstr "Välj tagg"
 
 #. General
-#: ../finch/gntblist.c:1298
-#: ../libpurple/protocols/gg/gg.c:637
-#: ../libpurple/protocols/gg/gg.c:1050
-#: ../libpurple/protocols/gg/gg.c:1123
-#: ../libpurple/protocols/gg/gg.c:2207
-#: ../libpurple/protocols/jabber/buddy.c:286
-#: ../libpurple/protocols/jabber/buddy.c:1247
-#: ../libpurple/protocols/jabber/buddy.c:2217
-#: ../libpurple/protocols/jabber/buddy.c:2399
-#: ../libpurple/protocols/jabber/jabber.c:937
-#: ../libpurple/protocols/jabber/jabber.c:1544
-#: ../libpurple/protocols/jabber/jabber.c:1567
-#: ../libpurple/protocols/jabber/jabber.c:1590
-#: ../libpurple/protocols/jabber/jabber.c:1613
-#: ../libpurple/protocols/jabber/jabber.c:1636
-#: ../libpurple/protocols/msn/msn.c:1522
-#: ../libpurple/protocols/msn/msn.c:1698
-#: ../libpurple/protocols/qq/buddy_info.c:43
-#: ../libpurple/protocols/silc/buddy.c:1538
-#: ../libpurple/protocols/silc/ops.c:1002
-#: ../libpurple/protocols/silc/ops.c:1186
-#: ../libpurple/protocols/silc/ops.c:1324
-#: ../libpurple/protocols/silc10/buddy.c:1538
-#: ../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:3233
 msgid "Nickname"
 msgstr "Smeknamn"
 
 #. Idle stuff
-#: ../finch/gntblist.c:1320
-#: ../finch/gntprefs.c:261
-#: ../libpurple/protocols/bonjour/bonjour.c:354
-#: ../libpurple/protocols/jabber/buddy.c:787
-#: ../libpurple/protocols/jabber/buddy.c:951
-#: ../libpurple/protocols/msn/state.c:32
-#: ../libpurple/protocols/novell/novell.c:2830
-#: ../libpurple/protocols/oscar/oscar.c:2927
-#: ../libpurple/protocols/yahoo/yahoo.c:3099
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:710
-#: ../pidgin/gtkblist.c:3261
-#: ../pidgin/gtkblist.c:3667
-#: ../pidgin/gtkprefs.c:1987
 msgid "Idle"
 msgstr "Inaktiv"
 
-#: ../finch/gntblist.c:1334
 msgid "On Mobile"
 msgstr "Mobil"
 
-#: ../finch/gntblist.c:1415
 #, c-format
 msgid ""
 "Online: %d\n"
@@ -702,12 +303,10 @@
 "Ansluten: %d\n"
 "Totalt: %d"
 
-#: ../finch/gntblist.c:1424
 #, c-format
 msgid "Account: %s (%s)"
 msgstr "Konto: %s (%s)"
 
-#: ../finch/gntblist.c:1436
 #, c-format
 msgid ""
 "\n"
@@ -716,163 +315,82 @@
 "\n"
 "Sågs senast: för %s sedan"
 
-#: ../finch/gntblist.c:1704
-#: ../pidgin/gtkdocklet.c:582
-#: ../pidgin/gtkstatusbox.c:1072
 msgid "New..."
 msgstr "Nytt..."
 
-#: ../finch/gntblist.c:1711
-#: ../pidgin/gtkdocklet.c:583
-#: ../pidgin/gtkstatusbox.c:1073
 msgid "Saved..."
 msgstr "Sparad..."
 
-#: ../finch/gntblist.c:2089
-#: ../finch/gntplugin.c:343
-#: ../finch/gntui.c:88
-#: ../pidgin/gtkdocklet.c:716
-#: ../pidgin/gtkplugin.c:531
 msgid "Plugins"
 msgstr "Insticksmoduler"
 
-#: ../finch/gntblist.c:2218
-#: ../pidgin/gtkdialogs.c:766
 msgid "New Instant Message"
 msgstr "Nytt snabbmeddelanden"
 
-#: ../finch/gntblist.c:2220
-#: ../pidgin/gtkdialogs.c:768
-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."
+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."
 
 #. Not multiline
 #. Not masked?
 #. No hints?
-#: ../finch/gntblist.c:2223
-#: ../finch/gntcertmgr.c:90
-#: ../finch/gntconn.c:136
-#: ../finch/gntnotify.c:80
-#: ../libpurple/account.c:1012
-#: ../libpurple/account.c:1262
-#: ../libpurple/protocols/gg/gg.c:506
-#: ../libpurple/protocols/gg/gg.c:665
-#: ../libpurple/protocols/gg/gg.c:802
-#: ../libpurple/protocols/jabber/jabber.c:1736
-#: ../libpurple/protocols/jabber/xdata.c:399
-#: ../libpurple/protocols/msn/msn.c:290
-#: ../libpurple/protocols/msn/msn.c:307
-#: ../libpurple/protocols/msn/msn.c:324
-#: ../libpurple/protocols/msn/msn.c:341
-#: ../libpurple/protocols/oscar/oscar.c:6148
-#: ../libpurple/protocols/silc/buddy.c:454
-#: ../libpurple/protocols/silc/buddy.c:1193
-#: ../libpurple/protocols/silc/chat.c:449
-#: ../libpurple/protocols/silc/chat.c:486
-#: ../libpurple/protocols/silc/chat.c:749
-#: ../libpurple/protocols/silc/ops.c:1293
-#: ../libpurple/protocols/silc/ops.c:1819
-#: ../libpurple/protocols/silc/silc.c:953
-#: ../libpurple/protocols/silc10/buddy.c:467
-#: ../libpurple/protocols/silc10/buddy.c:1191
-#: ../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:1033
-#: ../libpurple/protocols/yahoo/yahoo.c:3499
-#: ../libpurple/protocols/yahoo/yahoo.c:3510
-#: ../pidgin/gtkblist.c:4370
-#: ../pidgin/gtkcertmgr.c:195
-#: ../pidgin/gtkdialogs.c:771
-#: ../pidgin/gtkdialogs.c:910
-#: ../pidgin/gtkdialogs.c:1002
-#: ../pidgin/gtkrequest.c:270
 msgid "OK"
 msgstr "OK"
 
-#: ../finch/gntblist.c:2270
 msgid "Channel"
 msgstr "Kanal"
 
-#: ../finch/gntblist.c:2282
-#: ../pidgin/gtkblist.c:927
 msgid "Join a Chat"
 msgstr "Anslut till chatt"
 
-#: ../finch/gntblist.c:2284
 msgid "Please enter the name of the chat you want to join."
 msgstr "Ange namnet på chatten du vill gå med i."
 
-#: ../finch/gntblist.c:2286
-#: ../finch/gntnotify.c:394
 msgid "Join"
 msgstr "Anslut"
 
-# src/menus.c:311
 #. Create the "Options" frame.
-#: ../finch/gntblist.c:2324
-#: ../finch/gntpounce.c:447
-#: ../pidgin/gtkpounce.c:802
 msgid "Options"
 msgstr "Alternativ"
 
-#: ../finch/gntblist.c:2330
 msgid "Send IM..."
 msgstr "Skicka IM..."
 
-#: ../finch/gntblist.c:2334
 msgid "Join Chat..."
 msgstr "Anslut till chatt..."
 
-#: ../finch/gntblist.c:2338
 msgid "Show"
 msgstr "Visa"
 
-#: ../finch/gntblist.c:2343
 msgid "Empty groups"
 msgstr "Tomma grupper"
 
-#: ../finch/gntblist.c:2349
 msgid "Offline buddies"
 msgstr "Frånkopplade kompisar"
 
-#: ../finch/gntblist.c:2355
 msgid "Sort"
 msgstr "Sortera"
 
-#: ../finch/gntblist.c:2360
 msgid "By Status"
 msgstr "Efter status"
 
-#: ../finch/gntblist.c:2364
-#: ../pidgin/gtkblist.c:4155
 msgid "Alphabetically"
 msgstr "Alfabetiskt"
 
-#: ../finch/gntblist.c:2368
 msgid "By Log Size"
 msgstr "Efter loggstorlek"
 
-#: ../finch/gntcertmgr.c:86
-#: ../pidgin/gtkcertmgr.c:188
 msgid "Certificate Import"
 msgstr "Certifikatsimportering"
 
-#: ../finch/gntcertmgr.c:87
-#: ../pidgin/gtkcertmgr.c:189
 msgid "Specify a hostname"
 msgstr "Ange ett värdnamn"
 
-#: ../finch/gntcertmgr.c:88
-#: ../pidgin/gtkcertmgr.c:190
 msgid "Type the host name this certificate is for."
 msgstr "Ange värden detta certifikatet är för."
 
-#: ../finch/gntcertmgr.c:97
-#: ../pidgin/gtkcertmgr.c:210
 #, c-format
 msgid ""
 "File %s could not be imported.\n"
@@ -881,23 +399,15 @@
 "Filen %s kunde inte importeras.\n"
 "Försäkra dig om att filen är skrivbar och i PEM-format.\n"
 
-#: ../finch/gntcertmgr.c:99
-#: ../pidgin/gtkcertmgr.c:212
 msgid "Certificate Import Error"
 msgstr "Certifikatsimporteringsfel"
 
-#: ../finch/gntcertmgr.c:100
-#: ../pidgin/gtkcertmgr.c:213
 msgid "X.509 certificate import failed"
 msgstr "X.509-certifikatimportering misslyckades"
 
-#: ../finch/gntcertmgr.c:110
-#: ../pidgin/gtkcertmgr.c:224
 msgid "Select a PEM certificate"
 msgstr "Välj et PEM-certifikat"
 
-#: ../finch/gntcertmgr.c:127
-#: ../pidgin/gtkcertmgr.c:245
 #, c-format
 msgid ""
 "Export to file %s failed.\n"
@@ -906,27 +416,19 @@
 "Exportering till filen %s misslyckades.\n"
 "Kontrollera så du har skrivrättigheter i målkatalogen\n"
 
-#: ../finch/gntcertmgr.c:129
-#: ../pidgin/gtkcertmgr.c:247
 msgid "Certificate Export Error"
 msgstr "Certifikatsexporteringsfel"
 
-#: ../finch/gntcertmgr.c:130
-#: ../pidgin/gtkcertmgr.c:248
 msgid "X.509 certificate export failed"
 msgstr "X.509-certifikasexportering misslyckades"
 
-#: ../finch/gntcertmgr.c:159
-#: ../pidgin/gtkcertmgr.c:299
 msgid "PEM X.509 Certificate Export"
 msgstr "PEM X.509-certifikasexportering"
 
-#: ../finch/gntcertmgr.c:188
 #, c-format
 msgid "Certificate for %s"
 msgstr "Certifikat för %s"
 
-#: ../finch/gntcertmgr.c:195
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -939,128 +441,82 @@
 "SHA1-fingeravtryck:\n"
 "%s"
 
-#: ../finch/gntcertmgr.c:198
 msgid "SSL Host Certificate"
 msgstr "SSL Värdcertifikat"
 
-#: ../finch/gntcertmgr.c:233
-#: ../pidgin/gtkcertmgr.c:372
 #, c-format
 msgid "Really delete certificate for %s?"
 msgstr "Säker på att ta bort certifikat för %s?"
 
-#: ../finch/gntcertmgr.c:236
-#: ../pidgin/gtkcertmgr.c:374
 msgid "Confirm certificate delete"
 msgstr "Godkänn borttagning av certifikat"
 
-#: ../finch/gntcertmgr.c:293
-#: ../pidgin/gtkcertmgr.c:602
 msgid "Certificate Manager"
 msgstr "Certifikatshanterare"
 
 #. Creating the user splits
-#: ../finch/gntcertmgr.c:298
-#: ../libpurple/protocols/bonjour/bonjour.c:666
-#: ../libpurple/protocols/silc/silc.c:1138
-#: ../libpurple/protocols/silc10/silc.c:918
 msgid "Hostname"
 msgstr "Värdnamn"
 
-#: ../finch/gntcertmgr.c:315
-#: ../finch/gntnotify.c:388
-#: ../pidgin/gtkconv.c:1689
-#: ../pidgin/gtkdebug.c:835
 msgid "Info"
 msgstr "Information"
 
 #. Close button
-#: ../finch/gntcertmgr.c:324
-#: ../finch/gntft.c:237
-#: ../finch/gntnotify.c:182
-#: ../finch/gntplugin.c:211
-#: ../finch/gntplugin.c:403
-#: ../finch/gntpounce.c:738
-#: ../finch/gntstatus.c:216
-#: ../libpurple/protocols/msn/msn.c:407
-#: ../libpurple/protocols/silc/util.c:386
-#: ../libpurple/protocols/silc10/util.c:377
-#: ../pidgin/gtkaccount.c:2474
-#: ../pidgin/gtkrequest.c:273
 msgid "Close"
 msgstr "Stäng"
 
-#: ../finch/gntconn.c:125
 #, c-format
 msgid "%s (%s)"
 msgstr "%s (%s)"
 
-#: ../finch/gntconn.c:128
 #, c-format
 msgid "%s disconnected."
 msgstr "%s kopplades ifrån."
 
-#: ../finch/gntconn.c:129
 #, c-format
 msgid ""
 "%s\n"
 "\n"
-"Finch will not attempt to reconnect the account until you correct the error and re-enable the account."
+"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/gntconn.c:138
-#: ../pidgin/gtkblist.c:4372
+"Finch kommer inte försöka ansluta förrän du har rättat till felet och "
+"återaktiverat kontot."
+
 msgid "Re-enable Account"
 msgstr "Återaktivera konto"
 
-#: ../finch/gntconv.c:139
 msgid "No such command."
 msgstr "Finns inget sådant kommando."
 
-#: ../finch/gntconv.c:143
-#: ../pidgin/gtkconv.c:531
 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:148
-#: ../pidgin/gtkconv.c:537
 msgid "Your command failed for an unknown reason."
 msgstr "Ditt kommando misslyckades av okänd anledning."
 
-#: ../finch/gntconv.c:153
-#: ../pidgin/gtkconv.c:544
 msgid "That command only works in chats, not IMs."
 msgstr "Det kommandot fungerar bara i chattar, inte i snabbmeddelanden."
 
-#: ../finch/gntconv.c:156
-#: ../pidgin/gtkconv.c:547
 msgid "That command only works in IMs, not chats."
 msgstr "Det kommandot fungerar bara i snabbmeddelanden, inte chattar."
 
-#: ../finch/gntconv.c:160
-#: ../pidgin/gtkconv.c:552
 msgid "That command doesn't work on this protocol."
 msgstr "Det kommandot funkar inte under detta protokoll."
 
-#: ../finch/gntconv.c:168
 msgid "Message was not sent, because you are not signed on."
 msgstr "Meddelandet skickades inte eftersom du inte är inloggad."
 
-#: ../finch/gntconv.c:251
 #, c-format
 msgid "%s (%s -- %s)"
 msgstr "%s (%s -- %s)"
 
-#: ../finch/gntconv.c:274
 #, c-format
 msgid "%s [%s]"
 msgstr "%s [%s]"
 
-#: ../finch/gntconv.c:279
-#: ../finch/gntconv.c:801
 #, c-format
 msgid ""
 "\n"
@@ -1069,70 +525,54 @@
 "\n"
 "%s skriver..."
 
-#: ../finch/gntconv.c:298
 msgid "You have left this chat."
 msgstr "Du har lämnat denna chatt."
 
-#: ../finch/gntconv.c:414
-#: ../pidgin/gtkconv.c:1416
 msgid "Logging started. Future messages in this conversation will be logged."
-msgstr "Loggning startades. Framtida meddelanden i denna konversation kommer att loggas."
-
-#: ../finch/gntconv.c:420
-#: ../pidgin/gtkconv.c:1424
-msgid "Logging stopped. Future messages in this conversation will not be logged."
-msgstr "Loggning stoppades. Framtida meddelanden i denna konversation kommer inte att loggas."
-
-#: ../finch/gntconv.c:469
+msgstr ""
+"Loggning startades. Framtida meddelanden i denna konversation kommer att "
+"loggas."
+
+msgid ""
+"Logging stopped. Future messages in this conversation will not be logged."
+msgstr ""
+"Loggning stoppades. Framtida meddelanden i denna konversation kommer inte "
+"att loggas."
+
 msgid "Send To"
 msgstr "Skicka till"
 
-#: ../finch/gntconv.c:513
 msgid "Conversation"
 msgstr "Konversation"
 
-#: ../finch/gntconv.c:519
 msgid "Clear Scrollback"
 msgstr "Rensa tillbakablick"
 
-#: ../finch/gntconv.c:523
-#: ../finch/gntprefs.c:191
 msgid "Show Timestamps"
 msgstr "Visa tidsstämplar"
 
-#: ../finch/gntconv.c:539
 msgid "Add Buddy Pounce..."
 msgstr "Lägg till kompisattack..."
 
-#: ../finch/gntconv.c:554
 msgid "Enable Logging"
 msgstr "Aktivera loggning"
 
-#: ../finch/gntconv.c:560
 msgid "Enable Sounds"
 msgstr "Aktivera Ljud"
 
-#: ../finch/gntconv.c:766
 msgid "<AUTO-REPLY> "
 msgstr "<AUTO-SVAR>"
 
 #. Print the list of users in the room
-#: ../finch/gntconv.c:889
 msgid "List of users:\n"
 msgstr "Lista över användare:\n"
 
-#: ../finch/gntconv.c:1051
-#: ../pidgin/gtkconv.c:371
 msgid "Supported debug options are:  version"
 msgstr "De felsökningsalternativ som stöds är: version"
 
-#: ../finch/gntconv.c:1087
-#: ../pidgin/gtkconv.c:423
 msgid "No such command (in this context)."
 msgstr "Det finns inget sådant kommando (i denna kontext)."
 
-#: ../finch/gntconv.c:1090
-#: ../pidgin/gtkconv.c:426
 msgid ""
 "Use \"/help &lt;command&gt;\" for help on a specific command.\n"
 "The following commands are available in this context:\n"
@@ -1140,70 +580,54 @@
 "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:1148
-#: ../pidgin/gtkconv.c:7687
-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:1151
-#: ../pidgin/gtkconv.c:7690
+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."
+
 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:1154
-#: ../pidgin/gtkconv.c:7693
-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:1157
-#: ../pidgin/gtkconv.c:7696
+msgstr ""
+"me &lt;åtgärd&gt;:  Skickar en åtgärd i IRC-stil till en kompis eller chatt."
+
+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."
+
 msgid "clear: Clears the conversation scrollback."
 msgstr "clear: Rensar konversationens tillbakablick."
 
-#: ../finch/gntconv.c:1160
-#: ../pidgin/gtkconv.c:7702
 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:1163
 msgid "users:  Show the list of users in the chat."
 msgstr "users: Visa listan av användare i chatten."
 
-#: ../finch/gntconv.c:1168
 msgid "plugins: Show the plugins window."
 msgstr "plugins: Visa fönstret med insticksmoduler."
 
-#: ../finch/gntconv.c:1171
 msgid "buddylist: Show the buddylist."
 msgstr "buddylist: Visa kompislistan."
 
-#: ../finch/gntconv.c:1174
 msgid "accounts: Show the accounts window."
 msgstr "accounts: Visa kontohanteraren."
 
-#: ../finch/gntconv.c:1177
 msgid "debugwin: Show the debug window."
 msgstr "debugwin: Visa felsökningsfönstret."
 
-#: ../finch/gntconv.c:1180
 msgid "prefs: Show the preference window."
 msgstr "prefs: Visa inställningsfönstret."
 
-#: ../finch/gntconv.c:1183
 msgid "statuses: Show the savedstatuses window."
 msgstr "statuses: Visar statushanteraren."
 
-#: ../finch/gntdebug.c:231
-#: ../pidgin/gtkconv.c:989
-#: ../pidgin/gtkconv.c:2663
-#: ../pidgin/gtkdebug.c:219
-#: ../pidgin/gtkft.c:543
 msgid "Unable to open file."
 msgstr "Kan inte öppna filen."
 
-#: ../finch/gntdebug.c:271
-#: ../finch/gntui.c:86
-#: ../pidgin/gtkdebug.c:695
 msgid "Debug Window"
 msgstr "Felsökningsfönster"
 
@@ -1211,220 +635,123 @@
 #. * 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:292
-#: ../pidgin/gtkdebug.c:754
 msgid "Clear"
 msgstr "Rensa"
 
-#: ../finch/gntdebug.c:303
 msgid "Filter:"
 msgstr "Filter:"
 
-#: ../finch/gntdebug.c:309
-#: ../pidgin/gtkdebug.c:763
 msgid "Pause"
 msgstr "Pausa"
 
-#: ../finch/gntft.c:118
-#: ../pidgin/gtkft.c:229
 #, c-format
 msgid "File Transfers - %d%% of %d files"
 msgstr "Filöverföringar - %d%% av %d filer"
 
 #. Create the window.
-#: ../finch/gntft.c:123
-#: ../finch/gntft.c:196
-#: ../finch/gntui.c:87
-#: ../pidgin/gtkft.c:234
-#: ../pidgin/gtkft.c:762
 msgid "File Transfers"
 msgstr "Filöverföringar"
 
-#: ../finch/gntft.c:201
-#: ../pidgin/gtkft.c:645
 msgid "Progress"
 msgstr "Överfört"
 
-#: ../finch/gntft.c:201
-#: ../pidgin/gtkft.c:652
 msgid "Filename"
 msgstr "Filnamn"
 
-#: ../finch/gntft.c:201
-#: ../pidgin/gtkft.c:659
 msgid "Size"
 msgstr "Storlek"
 
-#: ../finch/gntft.c:201
 msgid "Speed"
 msgstr "Hastighet"
 
-#: ../finch/gntft.c:201
-#: ../pidgin/gtkft.c:666
 msgid "Remaining"
 msgstr "Återstår"
 
 #. XXX: Use of ggp_str_to_uin() is an ugly hack!
-#: ../finch/gntft.c:201
-#: ../finch/gntstatus.c:547
-#: ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:358
-#: ../libpurple/protocols/gg/gg.c:1039
-#: ../libpurple/protocols/gg/gg.c:1576
-#: ../libpurple/protocols/gg/gg.c:1584
-#: ../libpurple/protocols/jabber/buddy.c:778
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:941
-#: ../libpurple/protocols/jabber/jabber.c:1500
-#: ../libpurple/protocols/msn/msn.c:597
-#: ../libpurple/protocols/msn/msn.c:604
-#: ../libpurple/protocols/novell/novell.c:2840
-#: ../libpurple/protocols/oscar/oscar.c:821
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:2715
-#: ../libpurple/protocols/oscar/oscar.c:3795
-#: ../libpurple/protocols/sametime/sametime.c:3263
-#: ../libpurple/protocols/sametime/sametime.c:4150
-#: ../libpurple/protocols/yahoo/yahoo.c:3250
-#: ../pidgin/gtkblist.c:3305
-#: ../pidgin/gtkblist.c:3319
-#: ../pidgin/gtkblist.c:3321
-#: ../pidgin/gtksavedstatuses.c:999
-#: ../pidgin/gtksavedstatuses.c:1144
 msgid "Status"
 msgstr "Status"
 
-#: ../finch/gntft.c:211
 msgid "Close this window when all transfers finish"
 msgstr "Stäng detta fönster då alla överföringar är klara"
 
-#: ../finch/gntft.c:218
 msgid "Clear finished transfers"
 msgstr "Rensa bort färdiga överföringar"
 
-# Osäker
-# Denna har med överföringar att göra, så antagligen är det "stop" som i stoppa eller avbryt. Går på "Stoppa", men det är öppet för disskussion.
-#: ../finch/gntft.c:232
 msgid "Stop"
 msgstr "Stoppa"
 
-#: ../finch/gntft.c:305
-#: ../pidgin/gtkft.c:169
-#: ../pidgin/gtkft.c:973
 msgid "Waiting for transfer to begin"
 msgstr "Väntar på att överföringen ska inledas"
 
-#: ../finch/gntft.c:372
-#: ../pidgin/gtkft.c:166
-#: ../pidgin/gtkft.c:1054
 msgid "Canceled"
 msgstr "Avbruten"
 
-#: ../finch/gntft.c:374
-#: ../pidgin/gtkft.c:1056
 msgid "Failed"
 msgstr "Misslyckades"
 
-#: ../finch/gntft.c:420
-#: ../pidgin/gtkft.c:134
 #, c-format
 msgid "%.2f KiB/s"
 msgstr "%.2f KiB/s"
 
-#: ../finch/gntft.c:431
 #, c-format
 msgid "The file was saved as %s."
 msgstr "Filen sparades som %s."
 
-#: ../finch/gntft.c:432
-#: ../finch/gntft.c:433
-#: ../pidgin/gtkft.c:163
-#: ../pidgin/gtkft.c:1116
 msgid "Finished"
 msgstr "Färdig"
 
-#: ../finch/gntft.c:437
-#: ../libpurple/protocols/msn/session.c:388
 msgid "Transferring"
 msgstr "Överför"
 
-#: ../finch/gntnotify.c:165
 msgid "Emails"
 msgstr "Epost"
 
-#: ../finch/gntnotify.c:171
-#: ../finch/gntnotify.c:226
 msgid "You have mail!"
 msgstr "Du har ett e-post!"
 
-#: ../finch/gntnotify.c:174
-#: ../pidgin/gtknotify.c:518
 msgid "Sender"
 msgstr "Sändare"
 
-#: ../finch/gntnotify.c:174
-#: ../pidgin/gtknotify.c:525
 msgid "Subject"
 msgstr "Ämne"
 
-#: ../finch/gntnotify.c:202
 #, 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."
 
-#: ../finch/gntnotify.c:226
-#: ../pidgin/gtknotify.c:341
 msgid "New Mail"
 msgstr "Ny epost"
 
-#: ../finch/gntnotify.c:291
-#: ../pidgin/gtknotify.c:948
 #, c-format
 msgid "Info for %s"
 msgstr "Information om %s"
 
-#: ../finch/gntnotify.c:292
-#: ../libpurple/protocols/toc/toc.c:476
-#: ../pidgin/gtknotify.c:949
 msgid "Buddy Information"
 msgstr "Information om kompis"
 
-#: ../finch/gntnotify.c:382
-#: ../libpurple/protocols/qq/group_join.c:367
 msgid "Continue"
 msgstr "Fortsätt"
 
-#: ../finch/gntnotify.c:391
-#: ../pidgin/gtkconv.c:1650
 msgid "IM"
 msgstr "Meddelande"
 
-#: ../finch/gntnotify.c:397
-#: ../libpurple/protocols/sametime/sametime.c:3473
 msgid "Invite"
 msgstr "Bjud in"
 
-#: ../finch/gntnotify.c:400
 msgid "(none)"
 msgstr "(inget)"
 
-#: ../finch/gntplugin.c:76
-#: ../finch/gntplugin.c:85
 msgid "ERROR"
 msgstr "FEL"
 
-#: ../finch/gntplugin.c:76
 msgid "loading plugin failed"
 msgstr "inläsning av modul misslyckades."
 
-#: ../finch/gntplugin.c:85
 msgid "unloading plugin failed"
 msgstr "borttagning av modul misslyckades"
 
-#: ../finch/gntplugin.c:130
 #, c-format
 msgid ""
 "Name: %s\n"
@@ -1441,39 +768,33 @@
 "Hemsida: %s\n"
 "Filnamn: %s\n"
 
-#: ../finch/gntplugin.c:188
 msgid "Plugin need to be loaded before you can configure it."
 msgstr "Modulen behöver laddas före du kan konfigurera den."
 
-#: ../finch/gntplugin.c:236
 msgid "No configuration options for this plugin."
 msgstr "Ingen konfiguration tillgängliga för denna modul."
 
-#: ../finch/gntplugin.c:257
 msgid "Error loading plugin"
 msgstr "Fel vid inläsning av insticksmodul"
 
-#: ../finch/gntplugin.c:258
 msgid "The selected file is not a valid plugin."
 msgstr "Den valda filen är inte en giltig instickmodul."
 
-#: ../finch/gntplugin.c:259
-msgid "Please open the debug window and try again to see the exact error message."
-msgstr "Öppna felsökningsfönstret och försök igen för att få det exakta felmeddelandet."
-
-#: ../finch/gntplugin.c:322
+msgid ""
+"Please open the debug window and try again to see the exact error message."
+msgstr ""
+"Öppna felsökningsfönstret och försök igen för att få det exakta "
+"felmeddelandet."
+
 msgid "Select plugin to install"
 msgstr "Välj en instickmodul att installera"
 
-#: ../finch/gntplugin.c:348
 msgid "You can (un)load plugins from the following list."
 msgstr "Du kan (av)läsa moduler från följande lista."
 
-#: ../finch/gntplugin.c:399
 msgid "Install Plugin..."
 msgstr "Installera instickmodul..."
 
-#: ../finch/gntplugin.c:408
 msgid "Configure Plugin"
 msgstr "Konfigurera modul"
 
@@ -1482,416 +803,271 @@
 #. (that should have been "effect," right?)
 #. Back to instant-apply! I win!  BU-HAHAHA!
 #. Create the window
-#: ../finch/gntplugin.c:464
-#: ../finch/gntplugin.c:471
-#: ../finch/gntprefs.c:264
-#: ../finch/gntui.c:90
-#: ../pidgin/gtkdocklet.c:717
-#: ../pidgin/gtkprefs.c:2130
 msgid "Preferences"
 msgstr "Inställningar"
 
-#: ../finch/gntpounce.c:183
-#: ../pidgin/gtkpounce.c:256
 msgid "Please enter a buddy to pounce."
 msgstr "Ange en kompis som ska attackeras."
 
-#: ../finch/gntpounce.c:328
-#: ../pidgin/gtkpounce.c:524
 msgid "New Buddy Pounce"
 msgstr "Ny kompisattack"
 
-#: ../finch/gntpounce.c:328
-#: ../pidgin/gtkpounce.c:524
 msgid "Edit Buddy Pounce"
 msgstr "Ändra kompisattack"
 
-#: ../finch/gntpounce.c:333
 msgid "Pounce Who"
 msgstr "Attackera vem"
 
 #. Account:
-#: ../finch/gntpounce.c:336
-#: ../finch/gntstatus.c:456
 msgid "Account:"
 msgstr "Konto:"
 
-#: ../finch/gntpounce.c:358
 msgid "Buddy name:"
 msgstr "Kompisnamn:"
 
 #. Create the "Pounce When Buddy..." frame.
-#: ../finch/gntpounce.c:374
-#: ../pidgin/gtkpounce.c:592
 msgid "Pounce When Buddy..."
 msgstr "Attackera när kompisen..."
 
-#: ../finch/gntpounce.c:376
 msgid "Signs on"
 msgstr "Ansluter"
 
-#: ../finch/gntpounce.c:377
 msgid "Signs off"
 msgstr "Kopplar ifrån"
 
-#: ../finch/gntpounce.c:378
 msgid "Goes away"
 msgstr "Blir frånvarande"
 
-#: ../finch/gntpounce.c:379
 msgid "Returns from away"
 msgstr "Återvänder från frånvaro"
 
-#: ../finch/gntpounce.c:380
 msgid "Becomes idle"
 msgstr "Blir inaktiv"
 
-#: ../finch/gntpounce.c:381
 msgid "Is no longer idle"
 msgstr "Är inte längre inaktiv"
 
-#: ../finch/gntpounce.c:382
 msgid "Starts typing"
 msgstr "Börjar skriva"
 
-#: ../finch/gntpounce.c:383
 msgid "Pauses while typing"
 msgstr "Pausar skrivandet"
 
-#: ../finch/gntpounce.c:384
 msgid "Stops typing"
 msgstr "Slutar skriva"
 
-#: ../finch/gntpounce.c:385
 msgid "Sends a message"
 msgstr "Skickar ett meddelande"
 
 #. Create the "Action" frame.
-#: ../finch/gntpounce.c:414
-#: ../pidgin/gtkpounce.c:653
 msgid "Action"
 msgstr "Handling"
 
-#: ../finch/gntpounce.c:416
 msgid "Open an IM window"
 msgstr "Öppna ett snabbmeddelandefönster"
 
-#: ../finch/gntpounce.c:417
 msgid "Pop up a notification"
 msgstr "Visa en notifiering"
 
-#: ../finch/gntpounce.c:418
 msgid "Send a message"
 msgstr "Skicka ett meddelande"
 
-#: ../finch/gntpounce.c:419
 msgid "Execute a command"
 msgstr "Kör ett kommando"
 
-#: ../finch/gntpounce.c:420
 msgid "Play a sound"
 msgstr "Spela upp ett ljud"
 
-#: ../finch/gntpounce.c:448
 msgid "Pounce only when my status is not available"
 msgstr "Attackera enbart då min status är frånvarande"
 
-#: ../finch/gntpounce.c:450
-#: ../pidgin/gtkpounce.c:1293
 msgid "Recurring"
 msgstr "Återkommande"
 
-#: ../finch/gntpounce.c:618
 msgid "Cannot create pounce"
 msgstr "Kunde inte skapa kompisattack"
 
-#: ../finch/gntpounce.c:619
 msgid "You do not have any accounts."
 msgstr "Du har inga konton."
 
-#: ../finch/gntpounce.c:620
 msgid "You must create an account first before you can create a pounce."
 msgstr "Du måste skapa ett konto före du kan skapa en kompisattack."
 
-#: ../finch/gntpounce.c:662
-#: ../pidgin/gtkpounce.c:1108
 #, 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:696
-#: ../finch/gntui.c:84
-#: ../pidgin/gtkpounce.c:1337
 msgid "Buddy Pounces"
 msgstr "Kompisattacker"
 
-#: ../finch/gntpounce.c:810
-#: ../pidgin/gtkpounce.c:1464
 #, c-format
 msgid "%s has started typing to you (%s)"
 msgstr "%s har börjat skriva till dig (%s)"
 
-#: ../finch/gntpounce.c:812
-#: ../pidgin/gtkpounce.c:1466
 #, c-format
 msgid "%s has paused while typing to you (%s)"
 msgstr "%s har pausat i meddelandet till dig (%s)"
 
-#: ../finch/gntpounce.c:814
-#: ../pidgin/gtkpounce.c:1468
 #, c-format
 msgid "%s has signed on (%s)"
 msgstr "%s har loggat in (%s)"
 
-#: ../finch/gntpounce.c:816
-#: ../pidgin/gtkpounce.c:1470
 #, c-format
 msgid "%s has returned from being idle (%s)"
 msgstr "%s har blivit aktiv igen (%s)"
 
-#: ../finch/gntpounce.c:818
-#: ../pidgin/gtkpounce.c:1472
 #, c-format
 msgid "%s has returned from being away (%s)"
 msgstr "%s har kommit tillbaka (%s)"
 
-#: ../finch/gntpounce.c:820
-#: ../pidgin/gtkpounce.c:1474
 #, c-format
 msgid "%s has stopped typing to you (%s)"
 msgstr "%s har slutat skriva till dig (%s)"
 
-#: ../finch/gntpounce.c:822
-#: ../pidgin/gtkpounce.c:1476
 #, c-format
 msgid "%s has signed off (%s)"
 msgstr "%s har kopplat ifrån (%s)"
 
-#: ../finch/gntpounce.c:824
-#: ../pidgin/gtkpounce.c:1478
 #, c-format
 msgid "%s has become idle (%s)"
 msgstr "%s har blivit inaktiv (%s)"
 
-#: ../finch/gntpounce.c:826
-#: ../pidgin/gtkpounce.c:1480
 #, c-format
 msgid "%s has gone away. (%s)"
 msgstr "%s har gått iväg. (%s)"
 
-#: ../finch/gntpounce.c:828
-#: ../pidgin/gtkpounce.c:1482
 #, c-format
 msgid "%s has sent you a message. (%s)"
 msgstr "%s har sänt dig ett meddelande. (%s)"
 
-#: ../finch/gntpounce.c:829
-#: ../pidgin/gtkpounce.c:1483
 #, c-format
 msgid "Unknown pounce event. Please report this!"
 msgstr "Okänd atackhändelse. Var snäll och rapportera detta!"
 
-#: ../finch/gntprefs.c:92
 msgid "Based on keyboard use"
 msgstr "Baserat på tangetbordsanvändning"
 
-#: ../finch/gntprefs.c:94
-#: ../pidgin/gtkprefs.c:1992
 msgid "From last sent message"
 msgstr "Från senast sända meddelande"
 
-#: ../finch/gntprefs.c:96
-#: ../pidgin/gtkprefs.c:898
-#: ../pidgin/gtkprefs.c:907
-#: ../pidgin/gtkprefs.c:1991
-#: ../pidgin/gtkprefs.c:2005
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:333
 msgid "Never"
 msgstr "Aldrig"
 
-#: ../finch/gntprefs.c:184
 msgid "Show Idle Time"
 msgstr "Visa vilotid"
 
-#: ../finch/gntprefs.c:185
 msgid "Show Offline Buddies"
 msgstr "Visa frånkopplade kompisar"
 
-#: ../finch/gntprefs.c:192
 msgid "Notify buddies when you are typing"
 msgstr "Meddela kompisar att du skriver till dem"
 
-#: ../finch/gntprefs.c:198
 msgid "Log format"
 msgstr "Logg format"
 
-#: ../finch/gntprefs.c:199
 msgid "Log IMs"
 msgstr "Logga snabbmeddelanden"
 
-#: ../finch/gntprefs.c:200
 msgid "Log chats"
 msgstr "Logga alla chattar"
 
-#: ../finch/gntprefs.c:201
 msgid "Log status change events"
 msgstr "Logga alla statusförändringar"
 
-#: ../finch/gntprefs.c:207
 msgid "Report Idle time"
 msgstr "Rapportera inaktivitetstid"
 
-#: ../finch/gntprefs.c:208
 msgid "Change status when idle"
 msgstr "Ändra status vid inaktivitet"
 
-#: ../finch/gntprefs.c:209
 msgid "Minutes before changing status"
 msgstr "Minuter innan status ska ändras"
 
-#: ../finch/gntprefs.c:210
 msgid "Change status to"
 msgstr "Ändra status till"
 
 #. Conversations
-#: ../finch/gntprefs.c:259
-#: ../pidgin/gtkprefs.c:994
-#: ../pidgin/gtkprefs.c:2096
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:340
 msgid "Conversations"
 msgstr "Konversationer"
 
-#: ../finch/gntprefs.c:260
-#: ../pidgin/gtkprefs.c:1524
-#: ../pidgin/gtkprefs.c:2107
 msgid "Logging"
 msgstr "Loggning"
 
-#: ../finch/gntrequest.c:585
 msgid "Not implemented yet."
 msgstr "Funktionen är inte implementerad ännu."
 
-#: ../finch/gntrequest.c:661
-#: ../pidgin/gtkrequest.c:1555
-#: ../pidgin/gtkrequest.c:1601
 msgid "Save File..."
 msgstr "Spara fil..."
 
-#: ../finch/gntrequest.c:661
-#: ../pidgin/gtkrequest.c:1556
-#: ../pidgin/gtkrequest.c:1602
 msgid "Open File..."
 msgstr "Öppna fil..."
 
-#: ../finch/gntsound.c:97
-#: ../pidgin/gtksound.c:62
 msgid "Buddy logs in"
 msgstr "Kompis loggar in"
 
-#: ../finch/gntsound.c:98
-#: ../pidgin/gtksound.c:63
 msgid "Buddy logs out"
 msgstr "Kompis loggar ut"
 
-# Försöker hålla samma tempus som ovan.
-#: ../finch/gntsound.c:99
-#: ../pidgin/gtksound.c:64
 msgid "Message received"
 msgstr "Meddelande tas emot"
 
-#: ../finch/gntsound.c:100
-#: ../pidgin/gtksound.c:65
 msgid "Message received begins conversation"
 msgstr "Mottaget meddelande inleder konversation"
 
-#: ../finch/gntsound.c:101
-#: ../pidgin/gtksound.c:66
 msgid "Message sent"
 msgstr "Meddelande skickas"
 
-#: ../finch/gntsound.c:102
-#: ../pidgin/gtksound.c:67
 msgid "Person enters chat"
 msgstr "Person går in i chatt"
 
-#: ../finch/gntsound.c:103
-#: ../pidgin/gtksound.c:68
 msgid "Person leaves chat"
 msgstr "Person lämnar chatt"
 
-#: ../finch/gntsound.c:104
-#: ../pidgin/gtksound.c:69
 msgid "You talk in chat"
 msgstr "Du pratar i chatt"
 
-#: ../finch/gntsound.c:105
-#: ../pidgin/gtksound.c:70
 msgid "Others talk in chat"
 msgstr "Andra pratar i chatt"
 
-#: ../finch/gntsound.c:107
-#: ../pidgin/gtksound.c:73
 msgid "Someone says your screen name in chat"
 msgstr "Någon nämner ditt skärmnamn i en chatt"
 
-#: ../finch/gntsound.c:361
-#: ../pidgin/gtksound.c:306
 msgid "GStreamer Failure"
 msgstr "GStreamer fel"
 
-#: ../finch/gntsound.c:362
-#: ../pidgin/gtksound.c:307
 msgid "GStreamer failed to initialize."
 msgstr "GStreamer misslyckades med att initialisera."
 
-#: ../finch/gntsound.c:716
-#: ../finch/gntsound.c:802
-#: ../pidgin/gtkprefs.c:1648
-#: ../pidgin/gtkprefs.c:1737
-#: ../pidgin/gtkprefs.c:1933
 msgid "(default)"
 msgstr "(förval)"
 
-#: ../finch/gntsound.c:729
 msgid "Select Sound File ..."
 msgstr "Välj en ljudfil..."
 
-#: ../finch/gntsound.c:904
 msgid "Sound Preferences"
 msgstr "Ljudinställningar"
 
-#: ../finch/gntsound.c:915
 msgid "Profiles"
 msgstr "Profiler"
 
-#: ../finch/gntsound.c:954
-#: ../pidgin/gtkprefs.c:1778
 msgid "Automatic"
 msgstr "Automatiskt"
 
-#: ../finch/gntsound.c:957
 msgid "Console Beep"
 msgstr "Konsollpip"
 
-#: ../finch/gntsound.c:958
-#: ../pidgin/gtkprefs.c:1782
 msgid "Command"
 msgstr "Kommando"
 
-#: ../finch/gntsound.c:959
 msgid "No Sound"
 msgstr "Inga ljud"
 
-#: ../finch/gntsound.c:961
-#: ../pidgin/gtkprefs.c:1773
 msgid "Sound Method"
 msgstr "Ljudmetod"
 
-#: ../finch/gntsound.c:966
 msgid "Method: "
 msgstr "Metod: "
 
-#: ../finch/gntsound.c:973
 #, c-format
 msgid ""
 "Sound Command\n"
@@ -1901,98 +1077,59 @@
 "(%s för filnamn)"
 
 #. Sound options
-#: ../finch/gntsound.c:981
-#: ../pidgin/gtkprefs.c:1817
 msgid "Sound Options"
 msgstr "Ljudalternativ"
 
-#: ../finch/gntsound.c:982
 msgid "Sounds when conversation has focus"
 msgstr "Ljud när konversationsfönstret är fokuserat"
 
-#: ../finch/gntsound.c:990
-#: ../pidgin/gtkprefs.c:897
-#: ../pidgin/gtkprefs.c:909
-#: ../pidgin/gtkprefs.c:1824
-#: ../pidgin/plugins/timestamp_format.c:42
-#: ../pidgin/plugins/timestamp_format.c:51
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:334
 msgid "Always"
 msgstr "Alltid"
 
-#: ../finch/gntsound.c:991
-#: ../pidgin/gtkprefs.c:1822
 msgid "Only when available"
 msgstr "Endast vid tillgänglig"
 
-#: ../finch/gntsound.c:992
-#: ../pidgin/gtkprefs.c:1823
 msgid "Only when not available"
 msgstr "Edast vid Ej tillgänglig"
 
-#: ../finch/gntsound.c:999
 msgid "Volume(0-100):"
 msgstr "Volym(0-100):"
 
 #. Sound events
-#: ../finch/gntsound.c:1018
-#: ../pidgin/gtkprefs.c:1859
 msgid "Sound Events"
 msgstr "Ljudhändelser"
 
-#: ../finch/gntsound.c:1020
-#: ../pidgin/gtkprefs.c:1918
 msgid "Event"
 msgstr "Händelse"
 
-#: ../finch/gntsound.c:1020
 msgid "File"
 msgstr "Fil"
 
-#: ../finch/gntsound.c:1039
-#: ../pidgin/gtkprefs.c:1937
 msgid "Test"
 msgstr "Test"
 
-#: ../finch/gntsound.c:1042
-#: ../pidgin/gtkprefs.c:1941
 msgid "Reset"
 msgstr "Återställ"
 
-#: ../finch/gntsound.c:1045
-#: ../pidgin/gtkprefs.c:1945
 msgid "Choose..."
 msgstr "Välj..."
 
-#: ../finch/gntstatus.c:138
 #, c-format
 msgid "Are you sure you want to delete \"%s\""
 msgstr "Är du säker på att du vill ta bort \"%s\""
 
-#: ../finch/gntstatus.c:141
 msgid "Delete Status"
 msgstr "Borttagningsstatus"
 
-#: ../finch/gntstatus.c:176
-#: ../pidgin/gtksavedstatuses.c:597
 msgid "Saved Statuses"
 msgstr "Sparade statusar"
 
-#: ../finch/gntstatus.c:183
-#: ../finch/gntstatus.c:539
-#: ../libpurple/protocols/jabber/buddy.c:298
-#: ../libpurple/protocols/jabber/buddy.c:1359
-#: ../libpurple/protocols/novell/novell.c:1486
-#: ../pidgin/gtksavedstatuses.c:500
 msgid "Title"
 msgstr "Titel"
 
-#: ../finch/gntstatus.c:183
-#: ../pidgin/gtksavedstatuses.c:515
 msgid "Type"
 msgstr "Typ"
 
-# src/sidebar.c:103
 #. Statuses are almost all the same. Define a macro to reduce code repetition.
 #. PurpleStatusPrimitive
 #. id - use default
@@ -2001,384 +1138,239 @@
 #. user_settable
 #. not independent
 #. Attributes - each status can have a message.
-#: ../finch/gntstatus.c:183
-#: ../finch/gntstatus.c:564
-#: ../finch/gntstatus.c:576
-#: ../libpurple/protocols/bonjour/bonjour.c:270
-#: ../libpurple/protocols/bonjour/bonjour.c:277
-#: ../libpurple/protocols/bonjour/bonjour.c:360
-#: ../libpurple/protocols/gg/gg.c:1077
-#: ../libpurple/protocols/gg/gg.c:1579
-#: ../libpurple/protocols/gg/gg.c:1597
-#: ../libpurple/protocols/gg/gg.c:1607
-#: ../libpurple/protocols/gg/gg.c:1613
-#: ../libpurple/protocols/gg/gg.c:1622
-#: ../libpurple/protocols/gg/gg.c:1627
-#: ../libpurple/protocols/irc/irc.c:234
-#: ../libpurple/protocols/jabber/jabber.c:1532
-#: ../libpurple/protocols/jabber/jabber.c:1555
-#: ../libpurple/protocols/jabber/jabber.c:1578
-#: ../libpurple/protocols/jabber/jabber.c:1601
-#: ../libpurple/protocols/jabber/jabber.c:1624
-#: ../libpurple/protocols/jabber/jabber.c:1649
-#: ../libpurple/protocols/msn/msn.c:640
-#: ../libpurple/protocols/msn/msn.c:647
-#: ../libpurple/protocols/msn/msn.c:654
-#: ../libpurple/protocols/msn/msn.c:661
-#: ../libpurple/protocols/msn/msn.c:667
-#: ../libpurple/protocols/msn/msn.c:673
-#: ../libpurple/protocols/myspace/myspace.c:148
-#: ../libpurple/protocols/novell/novell.c:2843
-#: ../libpurple/protocols/novell/novell.c:2946
-#: ../libpurple/protocols/novell/novell.c:2952
-#: ../libpurple/protocols/novell/novell.c:2958
-#: ../libpurple/protocols/oscar/oscar.c:5609
-#: ../libpurple/protocols/oscar/oscar.c:5827
-#: ../libpurple/protocols/oscar/oscar.c:5841
-#: ../libpurple/protocols/oscar/oscar.c:5857
-#: ../libpurple/protocols/oscar/oscar.c:5864
-#: ../libpurple/protocols/oscar/oscar.c:5871
-#: ../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:1554
-#: ../libpurple/protocols/silc10/buddy.c:1554
-#: ../libpurple/protocols/simple/simple.c:247
-#: ../libpurple/protocols/yahoo/yahoo.c:3753
-#: ../libpurple/protocols/yahoo/yahoo.c:3759
-#: ../libpurple/protocols/zephyr/zephyr.c:2337
-#: ../pidgin/gtksavedstatuses.c:526
-#: ../pidgin/gtksavedstatuses.c:1010
 msgid "Message"
 msgstr "Meddelande"
 
 #. Use
-#: ../finch/gntstatus.c:194
-#: ../finch/gntstatus.c:593
 msgid "Use"
 msgstr "Använd"
 
-#: ../finch/gntstatus.c:301
 msgid "Invalid title"
 msgstr "Ogiltigt titel"
 
-#: ../finch/gntstatus.c:302
 msgid "Please enter a non-empty title for the status."
 msgstr "Var god ange inte en tom titel för statusen."
 
-#: ../finch/gntstatus.c:310
 msgid "Duplicate title"
 msgstr "Duplicerad titel"
 
-#: ../finch/gntstatus.c:311
 msgid "Please enter a different title for the status."
 msgstr "Använd en annan titel för statusen."
 
-#: ../finch/gntstatus.c:452
 msgid "Substatus"
 msgstr "Understatus"
 
-#: ../finch/gntstatus.c:464
-#: ../pidgin/gtkft.c:699
 msgid "Status:"
 msgstr "Status:"
 
-#: ../finch/gntstatus.c:479
 msgid "Message:"
 msgstr "Meddelande:"
 
-#: ../finch/gntstatus.c:528
 msgid "Edit Status"
 msgstr "Ändra status"
 
-#: ../finch/gntstatus.c:570
 msgid "Use different status for following accounts"
 msgstr "Använd en annan status för vissa konton"
 
 #. Save & Use
-#: ../finch/gntstatus.c:604
 msgid "Save & Use"
 msgstr "Spara & Använd"
 
-#: ../finch/gntui.c:85
 msgid "Certificates"
 msgstr "Certifikat"
 
-#: ../finch/gntui.c:89
-#: ../pidgin/gtkprefs.c:2098
 msgid "Sounds"
 msgstr "Ljud"
 
-#: ../finch/gntui.c:91
 msgid "Statuses"
 msgstr "Status"
 
-#: ../finch/plugins/gntclipboard.c:115
-#: ../finch/plugins/gntclipboard.c:121
-#: ../finch/plugins/gntclipboard.c:128
 msgid "Error loading the plugin."
 msgstr "Fel vid inläsning av insticksmodulen."
 
-#: ../finch/plugins/gntclipboard.c:116
 msgid "Couldn't find X display"
 msgstr "Kunde inte hitta X display"
 
-#: ../finch/plugins/gntclipboard.c:122
 msgid "Couldn't find window"
 msgstr "Kunde inte hitta fönster"
 
-#: ../finch/plugins/gntclipboard.c:129
 msgid "This plugin cannot be loaded because it was not built with X11 support."
-msgstr "Insticksmodulen kan inte laddas eftersom den inte är byggd med stöd för X11."
-
-#: ../finch/plugins/gntclipboard.c:158
+msgstr ""
+"Insticksmodulen kan inte laddas eftersom den inte är byggd med stöd för X11."
+
 msgid "GntClipboard"
 msgstr "GntKlippbok"
 
-#: ../finch/plugins/gntclipboard.c:160
 msgid "Clipboard plugin"
 msgstr "Klippbordsmodul"
 
-#: ../finch/plugins/gntclipboard.c:161
-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
+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."
+
 #, c-format
 msgid "%s just signed on"
 msgstr "%s har precis anslutit"
 
-#: ../finch/plugins/gntgf.c:238
 #, c-format
 msgid "%s just signed off"
 msgstr "%s har precis kopplat ifrån"
 
-#: ../finch/plugins/gntgf.c:246
 #, c-format
 msgid "%s sent you a message"
 msgstr "%s har sänt dig ett meddelande"
 
-#: ../finch/plugins/gntgf.c:265
 #, c-format
 msgid "%s said your nick in %s"
 msgstr "%s sa ditt alias i %s"
 
-#: ../finch/plugins/gntgf.c:267
 #, c-format
 msgid "%s sent a message in %s"
 msgstr "%s har sänt dig ett meddelande i (%s)"
 
-#: ../finch/plugins/gntgf.c:305
 msgid "Buddy signs on/off"
 msgstr "En kompis ansluter till/kopplar från"
 
-#: ../finch/plugins/gntgf.c:306
 msgid "You receive an IM"
 msgstr "Du fick ett IM"
 
-#: ../finch/plugins/gntgf.c:307
 msgid "Someone speaks in a chat"
 msgstr "Någon talar i en chatt"
 
-#: ../finch/plugins/gntgf.c:308
 msgid "Someone says your name in a chat"
 msgstr "Någon nämner ditt namn i en chatt"
 
-#: ../finch/plugins/gntgf.c:336
 msgid "Notify with a toaster when"
 msgstr "Notifiera med en toaster då"
 
-#: ../finch/plugins/gntgf.c:351
 msgid "Beep too!"
 msgstr "Pip också!"
 
-#: ../finch/plugins/gntgf.c:357
 msgid "Set URGENT for the terminal window."
 msgstr "Markera terminalfönstret som BRÅDSKANDE."
 
-#: ../finch/plugins/gntgf.c:377
 msgid "GntGf"
 msgstr "GntGf"
 
-#: ../finch/plugins/gntgf.c:379
-#: ../finch/plugins/gntgf.c:380
 msgid "Toaster plugin"
 msgstr "Toastermodul"
 
-#: ../finch/plugins/gnthistory.c:116
-#: ../pidgin/plugins/history.c:125
 #, c-format
 msgid "<b>Conversation with %s on %s:</b><br>"
 msgstr "<b>Konversation med %s på %s:</b><br>"
 
-#: ../finch/plugins/gnthistory.c:138
-#: ../pidgin/plugins/history.c:153
 msgid "History Plugin Requires Logging"
 msgstr "Historikinstiksmodulen kräver loggning"
 
-#: ../finch/plugins/gnthistory.c:139
-#: ../pidgin/plugins/history.c:154
 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."
-
-#: ../finch/plugins/gnthistory.c:179
+"Om loggning aktiveras för snabbmeddelanden och/eller chattar så aktiveras "
+"även historik för samma konversationstyper."
+
 msgid "GntHistory"
 msgstr "GntHistorik"
 
-# Kan tyckas vara en konstig mening, men läs nästa översättning så
-# förstår du.
-#: ../finch/plugins/gnthistory.c:181
-#: ../pidgin/plugins/history.c:197
 msgid "Shows recently logged conversations in new conversations."
 msgstr "Visar nyligen loggade konversationer i nya konversationsfönster."
 
-#: ../finch/plugins/gnthistory.c:182
-#: ../pidgin/plugins/history.c:198
-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 ""
+"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."
+
 msgid "Lastlog"
 msgstr "Lastlog"
 
 #. Translator Note: The "backlog" is the conversation buffer/history.
-#: ../finch/plugins/lastlog.c:100
 msgid "lastlog: Searches for a substring in the backlog."
 msgstr "lastlog: Söker efter en understräng i loggen."
 
-#: ../finch/plugins/lastlog.c:122
 msgid "GntLastlog"
 msgstr "GntLastlog"
 
-#: ../finch/plugins/lastlog.c:124
-#: ../finch/plugins/lastlog.c:125
 msgid "Lastlog plugin."
 msgstr "Lastlogmodul"
 
-#: ../libpurple/account.c:791
 msgid "accounts"
 msgstr "konton"
 
-#: ../libpurple/account.c:958
-#: ../libpurple/protocols/jabber/auth.c:195
 msgid "Password is required to sign on."
 msgstr "Lösenord krävs för att logga in."
 
-# Borde det inte vara bestämd form på "lösenord" i de tre
-# 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.
-#: ../libpurple/account.c:992
 #, c-format
 msgid "Enter password for %s (%s)"
 msgstr "Ange lösenordet för %s (%s)"
 
-#: ../libpurple/account.c:999
 msgid "Enter Password"
 msgstr "Ange lösenordet"
 
-#: ../libpurple/account.c:1004
 msgid "Save password"
 msgstr "Spara lösenordet"
 
-#: ../libpurple/account.c:1039
-#: ../libpurple/connection.c:105
-#: ../libpurple/connection.c:178
 #, c-format
 msgid "Missing protocol plugin for %s"
 msgstr "Saknar protokollmodul för %s"
 
-#: ../libpurple/account.c:1041
-#: ../libpurple/connection.c:108
-#: ../pidgin/gtkblist.c:4367
 msgid "Connection Error"
 msgstr "Anslutningsfel"
 
-#: ../libpurple/account.c:1199
-#: ../libpurple/protocols/gg/gg.c:707
-#: ../libpurple/protocols/jabber/jabber.c:1687
 msgid "New passwords do not match."
 msgstr "De nya lösenorden stämmer inte överens."
 
-#: ../libpurple/account.c:1208
 msgid "Fill out all fields completely."
 msgstr "Fyll i alla fält fullständigt."
 
-#: ../libpurple/account.c:1231
 msgid "Original password"
 msgstr "Ursprugligt lösenord"
 
-#: ../libpurple/account.c:1238
 msgid "New password"
 msgstr "Nytt lösenord"
 
-#: ../libpurple/account.c:1245
 msgid "New password (again)"
 msgstr "Nytt lösenord (igen)"
 
-#: ../libpurple/account.c:1251
 #, c-format
 msgid "Change password for %s"
 msgstr "Ändra lösenord för %s"
 
-#: ../libpurple/account.c:1259
 msgid "Please enter your current password and your new password."
 msgstr "Ange ditt nuvarande lösenord och ditt nya lösenord."
 
-#: ../libpurple/account.c:1290
 #, c-format
 msgid "Change user information for %s"
 msgstr "Ändra användarinformationen för %s"
 
-#: ../libpurple/account.c:1293
-#: ../libpurple/protocols/toc/toc.c:1670
 msgid "Set User Info"
 msgstr "Ange användarinformation"
 
-#: ../libpurple/account.c:1764
-#: ../libpurple/protocols/gg/gg.c:1017
-#: ../libpurple/protocols/jabber/buddy.c:782
-#: ../libpurple/protocols/jabber/buddy.c:2030
-#: ../libpurple/protocols/jabber/buddy.c:2047
-#: ../libpurple/protocols/novell/novell.c:2836
-#: ../libpurple/protocols/qq/qq.c:232
-#: ../pidgin/gtkft.c:160
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../libpurple/blist.c:521
-#: ../libpurple/blist.c:1321
-#: ../libpurple/blist.c:1531
-#: ../libpurple/protocols/jabber/roster.c:69
-#: ../libpurple/protocols/myspace/myspace.c:3250
-#: ../pidgin/gtkblist.c:5720
-#: ../pidgin/plugins/gevolution/gevo-util.c:67
-#: ../pidgin/plugins/gevolution/gevolution.c:96
 msgid "Buddies"
 msgstr "Kompisar"
 
-#: ../libpurple/blist.c:548
 msgid "buddy list"
 msgstr "kompislista"
 
-#: ../libpurple/certificate.c:558
 msgid "(DOES NOT MATCH)"
 msgstr "(MATCHAR INTE)"
 
 #. Make messages
-#: ../libpurple/certificate.c:562
 #, c-format
 msgid "%s has presented the following certificate for just-this-once use:"
 msgstr "%s har uppvisat följande certifikat för engångsanvändning:"
 
-#: ../libpurple/certificate.c:563
 #, c-format
 msgid ""
 "Common name: %s %s\n"
@@ -2388,49 +1380,37 @@
 "Fingeravtryck (SHA1): %s"
 
 # Är det verkligen ett engångscertifikat som avses?
+# Jag vet faktiskt inte. Kan inte tillräckligt om certifikat för att avgöra det.
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:568
 msgid "Single-use Certificate Verification"
 msgstr "Verifiering av engångscertifikat"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:885
 msgid "Certificate Authorities"
 msgstr "Certifikatsutfärdare"
 
 #. Scheme name
 #. Pool name
-#: ../libpurple/certificate.c:1053
 msgid "SSL Peers Cache"
 msgstr "SSL-motpartscache"
 
 #. Make messages
-#: ../libpurple/certificate.c:1184
 #, c-format
 msgid "Accept certificate for %s?"
 msgstr "Acceptera certifikat för %s?"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1190
 msgid "SSL Certificate Verification"
 msgstr "SSL Certifikatsverifikation"
 
 #. Number of actions
-#: ../libpurple/certificate.c:1199
 msgid "Accept"
 msgstr "Acceptera"
 
-#: ../libpurple/certificate.c:1200
-#: ../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:90
-#: ../libpurple/protocols/qq/sys_msg.c:246
 msgid "Reject"
 msgstr "Avslå"
 
-#: ../libpurple/certificate.c:1201
 msgid "_View Certificate..."
 msgstr "_Visa Certifikat..."
 
@@ -2438,19 +1418,24 @@
 #. TODO: Provide the user with more guidance about why he is
 #. being prompted
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1301
-#, c-format
-msgid "The certificate presented by \"%s\" claims to be from \"%s\" instead.  This could mean that you are not connecting to the service you believe you are."
-msgstr "Certifikatet uppvisat av \"%s\" påstår sig istället vara för \"%s\". Detta kan betyda att du inte ansluter till den tjänst du tror du ansluter till."
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" claims to be from \"%s\" instead.  This "
+"could mean that you are not connecting to the service you believe you are."
+msgstr ""
+"Certifikatet uppvisat av \"%s\" påstår sig istället vara för \"%s\". Detta "
+"kan betyda att du inte ansluter till den tjänst du tror du ansluter till."
 
 #. Prompt the user to authenticate the certificate
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1326
-#, c-format
-msgid "The certificate presented by \"%s\" is self-signed. It cannot be automatically checked."
-msgstr "Certifikatet uppvisat av \"%s\" är självsignerat. Det kan inte kontrolleras automatiskt."
-
-#: ../libpurple/certificate.c:1344
+#, c-format
+msgid ""
+"The certificate presented by \"%s\" is self-signed. It cannot be "
+"automatically checked."
+msgstr ""
+"Certifikatet uppvisat av \"%s\" är självsignerat. Det kan inte kontrolleras "
+"automatiskt."
+
 #, c-format
 msgid "The certificate chain presented for %s is not valid."
 msgstr "Certifikatskedjan uppvisad för %s är inte giltig."
@@ -2460,36 +1445,38 @@
 #. stifle it.
 #. TODO: Probably wrong.
 #. TODO: Probably wrong
-#: ../libpurple/certificate.c:1352
-#: ../libpurple/certificate.c:1421
 msgid "SSL Certificate Error"
 msgstr "SSL Certifikatsfel"
 
-#: ../libpurple/certificate.c:1353
 msgid "Invalid certificate chain"
 msgstr "Ogiltigt certifikatskedja"
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1373
-msgid "You have no database of root certificates, so this certificate cannot be validated."
-msgstr "Du har ingen databas över rootcertifikat, så detta certifikat kan inte bli verifierat."
+msgid ""
+"You have no database of root certificates, so this certificate cannot be "
+"validated."
+msgstr ""
+"Du har ingen databas över rootcertifikat, så detta certifikat kan inte bli "
+"verifierat."
 
 #. vrq will be completed by user_auth
-#: ../libpurple/certificate.c:1396
-msgid "The root certificate this one claims to be issued by is unknown to Pidgin."
+msgid ""
+"The root certificate this one claims to be issued by is unknown to Pidgin."
 msgstr "Rootcertifikatet som denna påstås använda är okänd för Pidgin."
 
-#: ../libpurple/certificate.c:1413
-#, c-format
-msgid "The certificate chain presented by %s does not have a valid digital signature from the Certificate Authority from which it claims to have a signature."
-msgstr "Certifikatet uppvisat för %s har inte en giltig digital signatur från den certifikatsutfärdare den påstås vara signerad av."
-
-#: ../libpurple/certificate.c:1422
+#, c-format
+msgid ""
+"The certificate chain presented by %s does not have a valid digital "
+"signature from the Certificate Authority from which it claims to have a "
+"signature."
+msgstr ""
+"Certifikatet uppvisat för %s har inte en giltig digital signatur från den "
+"certifikatsutfärdare den påstås vara signerad av."
+
 msgid "Invalid certificate authority signature"
 msgstr "Ogiltig certifigatsutfärdarsignatur"
 
 #. Make messages
-#: ../libpurple/certificate.c:1886
 #, c-format
 msgid ""
 "Common name: %s\n"
@@ -2507,128 +1494,95 @@
 "Utgångsdatum: %s\n"
 
 #. TODO: Find what the handle ought to be
-#: ../libpurple/certificate.c:1895
 msgid "Certificate Information"
 msgstr "Certifikatsinformation"
 
-#: ../libpurple/connection.c:107
 msgid "Registration Error"
 msgstr "Registreringsfel"
 
-#: ../libpurple/connection.c:180
 msgid "Unregistration Error"
 msgstr "Avregistreringsfel"
 
-#: ../libpurple/connection.c:350
 #, c-format
 msgid "+++ %s signed on"
 msgstr "+++ %s har loggat in"
 
-#: ../libpurple/connection.c:380
 #, c-format
 msgid "+++ %s signed off"
 msgstr "+++ %s har kopplat ifrån"
 
-#: ../libpurple/connection.c:497
-#: ../libpurple/plugin.c:282
-#: ../libpurple/protocols/jabber/buddy.c:2340
-#: ../libpurple/protocols/msn/servconn.c:141
-#: ../libpurple/protocols/msn/session.c:363
 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."
 
-#: ../libpurple/conversation.c:173
-#: ../libpurple/conversation.c:186
 #, c-format
 msgid "Unable to send message to %s."
 msgstr "Kan inte skicka meddelandet till %s."
 
-#: ../libpurple/conversation.c:174
 msgid "The message is too large."
 msgstr "Meddelandet är för stort."
 
-#: ../libpurple/conversation.c:183
-#: ../libpurple/protocols/bonjour/jabber.c:255
-#: ../libpurple/protocols/bonjour/jabber.c:298
 msgid "Unable to send message."
 msgstr "Kan inte skicka meddelandet."
 
-#: ../libpurple/conversation.c:1211
 msgid "Send Message"
 msgstr "Skicka meddelande"
 
-#: ../libpurple/conversation.c:1214
 msgid "_Send Message"
 msgstr "_Skicka meddelande"
 
-#: ../libpurple/conversation.c:1620
 #, c-format
 msgid "%s entered the room."
 msgstr "%s kom in i rummet."
 
-#: ../libpurple/conversation.c:1623
 #, c-format
 msgid "%s [<I>%s</I>] entered the room."
 msgstr "%s [<I>%s</I>] kom in i rummet."
 
-#: ../libpurple/conversation.c:1733
 #, c-format
 msgid "You are now known as %s"
 msgstr "Du är nu känd som %s"
 
-#: ../libpurple/conversation.c:1753
 #, c-format
 msgid "%s is now known as %s"
 msgstr "%s är nu känd som %s"
 
-#: ../libpurple/conversation.c:1828
 #, c-format
 msgid "%s left the room."
 msgstr "%s lämnade rummet."
 
-#: ../libpurple/conversation.c:1831
 #, c-format
 msgid "%s left the room (%s)."
 msgstr "%s lämnade rummet (%s)."
 
-#: ../libpurple/dbus-server.c:584
 #, c-format
 msgid "Failed to get connection: %s"
 msgstr "Kan inte skapa anslutning: %s"
 
-#: ../libpurple/dbus-server.c:596
 #, c-format
 msgid "Failed to get name: %s"
 msgstr "Kunde inte få namn: %s"
 
-#: ../libpurple/dbus-server.c:610
 #, c-format
 msgid "Failed to get serv name: %s"
 msgstr "Kunde inte få serv namn: %s"
 
-#: ../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:287
-#: ../libpurple/desktopitem.c:878
+msgstr ""
+"Purples D-BUS server körs inte på grund av någon av de nedan listade "
+"anledningarna"
+
 msgid "No name"
 msgstr "Inget namn"
 
-#: ../libpurple/dnsquery.c:511
 msgid "Unable to create new resolver process\n"
 msgstr "Kunde inte skapar ny uppslagningsprocess\n"
 
-#: ../libpurple/dnsquery.c:516
 msgid "Unable to send request to resolver process\n"
 msgstr "Kunde inte skicka förfrågan till uppslagningsprocessen\n"
 
-#: ../libpurple/dnsquery.c:549
-#: ../libpurple/dnsquery.c:698
 #, c-format
 msgid ""
 "Error resolving %s:\n"
@@ -2637,14 +1591,10 @@
 "Fel vid uppslagning %s:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:552
-#: ../libpurple/dnsquery.c:712
-#: ../libpurple/dnsquery.c:830
 #, c-format
 msgid "Error resolving %s: %d"
 msgstr "Fel vid uppslagning %s: %d"
 
-#: ../libpurple/dnsquery.c:574
 #, c-format
 msgid ""
 "Error reading from resolver process:\n"
@@ -2653,21 +1603,17 @@
 "Fel vid läsning av från uppslagningsprocess:\n"
 "%s"
 
-#: ../libpurple/dnsquery.c:578
 #, c-format
 msgid "EOF while reading from resolver process"
 msgstr "EOF under läsning från uppslagningsprocess"
 
-#: ../libpurple/dnsquery.c:762
 #, c-format
 msgid "Thread creation failure: %s"
 msgstr "Fel vid trådskapning: %s"
 
-#: ../libpurple/dnsquery.c:763
 msgid "Unknown reason"
 msgstr "Okänd anledning"
 
-#: ../libpurple/ft.c:209
 #, c-format
 msgid ""
 "Error reading %s: \n"
@@ -2676,7 +1622,6 @@
 "Fel vid läsning av %s:\n"
 "%s.\n"
 
-#: ../libpurple/ft.c:213
 #, c-format
 msgid ""
 "Error writing %s: \n"
@@ -2685,7 +1630,6 @@
 "Fel vid skrivning av %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:217
 #, c-format
 msgid ""
 "Error accessing %s: \n"
@@ -2694,39 +1638,31 @@
 "Fel vid försök att nå  %s: \n"
 "%s.\n"
 
-#: ../libpurple/ft.c:253
 msgid "Directory is not writable."
 msgstr "Katalogen är inte skrivbar."
 
-#: ../libpurple/ft.c:268
 msgid "Cannot send a file of 0 bytes."
 msgstr "Kan inte skicka en fil med 0 bytes storlek."
 
-#: ../libpurple/ft.c:278
 msgid "Cannot send a directory."
 msgstr "Kan inte skicka en katalog"
 
-#: ../libpurple/ft.c:287
 #, 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"
 
-#: ../libpurple/ft.c:347
 #, c-format
 msgid "%s wants to send you %s (%s)"
 msgstr "%s vill skicka %s (%s) till dig"
 
-#: ../libpurple/ft.c:354
 #, c-format
 msgid "%s wants to send you a file"
 msgstr "%s vill skicka en fil till dig"
 
-#: ../libpurple/ft.c:397
 #, c-format
 msgid "Accept file transfer request from %s?"
 msgstr "Acceptera filöverföringsförfrågan från %s?"
 
-#: ../libpurple/ft.c:401
 #, c-format
 msgid ""
 "A file is available for download from:\n"
@@ -2737,370 +1673,301 @@
 "Fjärrdator:%s\n"
 "Fjärrport:%d"
 
-#: ../libpurple/ft.c:436
 #, c-format
 msgid "%s is offering to send file %s"
 msgstr "%s erbjuder sig att skicka filen %s"
 
-#: ../libpurple/ft.c:488
 #, c-format
 msgid "%s is not a valid filename.\n"
 msgstr "%s är inte ett giltigt filnamn.\n"
 
-#: ../libpurple/ft.c:509
 #, c-format
 msgid "Offering to send %s to %s"
 msgstr "Erbjuder att skicka %s till %s"
 
-#: ../libpurple/ft.c:521
 #, c-format
 msgid "Starting transfer of %s from %s"
 msgstr "Inleder filöverföring av %s från %s"
 
-#: ../libpurple/ft.c:682
 #, c-format
 msgid "Transfer of file %s complete"
 msgstr "Överföringen av filen %s är färdig"
 
-#: ../libpurple/ft.c:685
 #, c-format
 msgid "File transfer complete"
 msgstr "Filöverföringen slutfördes"
 
-#: ../libpurple/ft.c:1103
 #, c-format
 msgid "You canceled the transfer of %s"
 msgstr "Du avbröt överföringen av %s"
 
-#: ../libpurple/ft.c:1108
 #, c-format
 msgid "File transfer cancelled"
 msgstr "Filöverföringen avbröts"
 
-#: ../libpurple/ft.c:1166
 #, c-format
 msgid "%s canceled the transfer of %s"
 msgstr "%s avbröt överföringen av %s"
 
-#: ../libpurple/ft.c:1171
 #, c-format
 msgid "%s canceled the file transfer"
 msgstr "%s avbröt filöverföringen"
 
-#: ../libpurple/ft.c:1228
 #, c-format
 msgid "File transfer to %s failed."
 msgstr "Filöverföringen till %s misslyckades."
 
-#: ../libpurple/ft.c:1230
 #, c-format
 msgid "File transfer from %s failed."
 msgstr "Filöverföringen från %s misslyckades."
 
-#: ../libpurple/gconf/purple.schemas.in.h:1
 msgid "Run the command in a terminal"
 msgstr "Kör kommandot i en terminal"
 
-#: ../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."
 
-#: ../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."
 
-#: ../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."
 
-#: ../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."
 
-#: ../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."
 
-#: ../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."
 
-#: ../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."
 
-#: ../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."
 
-#: ../libpurple/gconf/purple.schemas.in.h:10
 msgid "The handler for \"aim\" URLs"
 msgstr "Hanteraren för \"aim\" URLer"
 
-#: ../libpurple/gconf/purple.schemas.in.h:11
 msgid "The handler for \"gg\" URLs"
 msgstr "Hanteraren för \"gg\" URLer"
 
-#: ../libpurple/gconf/purple.schemas.in.h:12
 msgid "The handler for \"icq\" URLs"
 msgstr "Hanteraren för \"icq\" URLer"
 
-#: ../libpurple/gconf/purple.schemas.in.h:13
 msgid "The handler for \"irc\" URLs"
 msgstr "Hanteraren för \"irc\" URLer"
 
-#: ../libpurple/gconf/purple.schemas.in.h:14
 msgid "The handler for \"msnim\" URLs"
 msgstr "Hanteraren för \"msnim\" URLer"
 
-#: ../libpurple/gconf/purple.schemas.in.h:15
 msgid "The handler for \"sip\" URLs"
 msgstr "Hanteraren för \"sip\" URLer"
 
-#: ../libpurple/gconf/purple.schemas.in.h:16
 msgid "The handler for \"xmpp\" URLs"
 msgstr "Hanteraren för \"xmpp\" URLer"
 
-#: ../libpurple/gconf/purple.schemas.in.h:17
 msgid "The handler for \"ymsgr\" URLs"
 msgstr "Hanteraren för \"ymsgr\" URLer"
 
-#: ../libpurple/gconf/purple.schemas.in.h:18
-msgid "True if the command specified in the \"command\" key should handle \"aim\" URLs."
+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"
 
-#: ../libpurple/gconf/purple.schemas.in.h:19
-msgid "True if the command specified in the \"command\" key should handle \"gg\" URLs."
+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"
 
-#: ../libpurple/gconf/purple.schemas.in.h:20
-msgid "True if the command specified in the \"command\" key should handle \"icq\" URLs."
+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"
 
-#: ../libpurple/gconf/purple.schemas.in.h:21
-msgid "True if the command specified in the \"command\" key should handle \"irc\" URLs."
+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"
 
-#: ../libpurple/gconf/purple.schemas.in.h:22
-msgid "True if the command specified in the \"command\" key should handle \"msnim\" URLs."
+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"
 
-#: ../libpurple/gconf/purple.schemas.in.h:23
-msgid "True if the command specified in the \"command\" key should handle \"sip\" URLs."
+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"
 
-#: ../libpurple/gconf/purple.schemas.in.h:24
-msgid "True if the command specified in the \"command\" key should handle \"xmpp\" URLs."
+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"
 
-#: ../libpurple/gconf/purple.schemas.in.h:25
-msgid "True if the command specified in the \"command\" key should handle \"ymsgr\" URLs."
+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"
 
-#: ../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 ""
+"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."
+
 msgid "Whether the specified command should handle \"aim\" URLs"
 msgstr "Om det specifika kommandot ska hantera \"aim\" URLer"
 
-#: ../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"
 
-#: ../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"
 
-#: ../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"
 
-#: ../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"
 
-#: ../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"
 
-#: ../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"
 
-#: ../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"
 
-#: ../libpurple/log.c:183
 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>"
 
-#: ../libpurple/log.c:598
 msgid "HTML"
 msgstr "HTML"
 
-#: ../libpurple/log.c:612
 msgid "Plain text"
 msgstr "Vanlig text"
 
-#: ../libpurple/log.c:626
 msgid "Old flat format"
 msgstr "Gammalt platt format"
 
-#: ../libpurple/log.c:839
 msgid "Logging of this conversation failed."
 msgstr "Loggning av denna konversationen misslyckades."
 
-#: ../libpurple/log.c:1282
 msgid "XML"
 msgstr "XML"
 
-#: ../libpurple/log.c:1366
-#, 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:1368
-#, 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:1426
-#: ../libpurple/log.c:1559
+#, 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"
+
+#, 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"
+
 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>"
 
-#: ../libpurple/log.c:1438
-#: ../libpurple/log.c:1568
 #, 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>"
 
-#: ../libpurple/log.c:1500
 #, c-format
 msgid "(%s) %s <AUTO-REPLY>: %s\n"
 msgstr "(%s) %s <AUTO-SVAR>: %s\n"
 
-#: ../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."
 
-#: ../libpurple/plugin.c:380
 #, c-format
 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)"
 
-#: ../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)"
 
-#: ../libpurple/plugin.c:482
 msgid "Plugin does not implement all required functions"
 msgstr "Insticksmodulen tillhandahåller inte alla nödvändiga funktioner"
 
-#: ../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
+#, 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."
+
 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."
 
-#: ../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."
-
-#: ../libpurple/plugin.c:681
-msgid "There were errors unloading the plugin."
-msgstr "Det blev problem då insticksmodulen avladdades."
-
-#: ../libpurple/plugins/autoaccept.c:23
+#, c-format
+msgid "%s requires %s, but it failed to unload."
+msgstr "%s kräver %s, men misslyckades med att stoppa."
+
 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:1456
-#: ../libpurple/protocols/oscar/oscar.c:2248
-#: ../libpurple/protocols/oscar/oscar.c:2297
-#: ../libpurple/protocols/oscar/oscar.c:5941
-#: ../libpurple/protocols/oscar/oscar.c:5996
-#: ../libpurple/protocols/oscar/oscar.c:6222
-#: ../libpurple/protocols/oscar/oscar.c:6292
-#: ../libpurple/request.h:1388
-#: ../libpurple/request.h:1398
-#: ../pidgin/gtkblist.c:530
 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)"
@@ -3108,11 +1975,9 @@
 "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)"
@@ -3120,17 +1985,12 @@
 "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:1771
-#: ../libpurple/protocols/msn/msn.c:1801
 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..."
 
@@ -3142,23 +2002,18 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/buddynote.c:90
-#: ../pidgin/plugins/gtkbuddynote.c:74
 msgid "Buddy Notes"
 msgstr "Kompiskommentar"
 
 #. *< name
 #. *< version
-#: ../libpurple/plugins/buddynote.c:92
-#: ../pidgin/plugins/gtkbuddynote.c:76
 msgid "Store notes on particular buddies."
 msgstr "Spara noteringar för vissa kompisar."
 
 #. *< summary
-#: ../libpurple/plugins/buddynote.c:93
-#: ../pidgin/plugins/gtkbuddynote.c:77
 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."
+msgstr ""
+"Lägger till möjligheten att lagra noteringar för kompisar i din kompislista."
 
 #. *< type
 #. *< ui_requirement
@@ -3166,7 +2021,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ciphertest.c:264
 msgid "Cipher Test"
 msgstr "Chiffertest"
 
@@ -3174,8 +2028,6 @@
 #. *< 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."
 
@@ -3185,7 +2037,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/dbus-example.c:155
 msgid "DBus Example"
 msgstr "DBus-exempel"
 
@@ -3193,8 +2044,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/dbus-example.c:158
-#: ../libpurple/plugins/dbus-example.c:160
 msgid "DBus Plugin Example"
 msgstr "Exempel på DBus-plugin"
 
@@ -3204,7 +2053,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/filectl.c:248
 msgid "File Control"
 msgstr "Filkontroll"
 
@@ -3212,60 +2060,38 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../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.
-#: ../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"
 
-#: ../libpurple/plugins/idle.c:166
-#: ../libpurple/plugins/idle.c:258
 msgid "Set Account Idle Time"
 msgstr "Ange kontots inaktivitetstid"
 
-# src/menus.c:280
-#: ../libpurple/plugins/idle.c:169
-#: ../libpurple/plugins/idle.c:229
 msgid "_Set"
 msgstr "A_nge"
 
-#: ../libpurple/plugins/idle.c:184
 msgid "None of your accounts are idle."
 msgstr "Inga av dina konton är inaktiva."
 
-#: ../libpurple/plugins/idle.c:200
-#: ../libpurple/plugins/idle.c:262
 msgid "Unset Account Idle Time"
 msgstr "Ta bort kontots inaktivitetstid"
 
-#: ../libpurple/plugins/idle.c:203
 msgid "_Unset"
 msgstr "_Ta bort"
 
-#: ../libpurple/plugins/idle.c:226
-#: ../libpurple/plugins/idle.c:266
 msgid "Set Idle Time for All Accounts"
 msgstr "Ange Inaktivitetstiden för alla konton"
 
-#: ../libpurple/plugins/idle.c:271
 msgid "Unset Idle Time for All Idled Accounts"
 msgstr "Tar bort inaktivitetstiden för alla inaktiva konton"
 
-#: ../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"
 
@@ -3275,21 +2101,22 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ipc-test-client.c:87
 msgid "IPC Test Client"
 msgstr "IPC-testklient"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../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
-#: ../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."
+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
@@ -3297,31 +2124,27 @@
 #. *< 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
+msgstr ""
+"Testinsticksmodul för IPC-stöd, som en server. Denna registrerar IPC-"
+"kommandona."
+
 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)"
 
@@ -3331,137 +2154,113 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/joinpart.c:270
 msgid "Join/Part Hiding"
 msgstr " Dölj Går in/Lämnar"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/plugins/joinpart.c:273
 msgid "Hides extraneous join/part messages."
 msgstr "Gömmer extraaktiga kommer in/lämnar meddelanden."
 
 #. *  description
-#: ../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."
+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.
-#: ../libpurple/plugins/log_reader.c:499
 msgid "(UTC)"
 msgstr "(UTC)"
 
-#: ../libpurple/plugins/log_reader.c:1554
 msgid "User is offline."
 msgstr "Användaren är frånkopplad."
 
-#: ../libpurple/plugins/log_reader.c:1560
 msgid "Auto-response sent:"
 msgstr "Auto-svar skickat:"
 
-#: ../libpurple/plugins/log_reader.c:1570
-#: ../libpurple/plugins/log_reader.c:1573
-#: ../libpurple/plugins/statenotify.c:80
 #, c-format
 msgid "%s has signed off."
 msgstr "%s har kopplat ifrån."
 
-#: ../libpurple/plugins/log_reader.c:1587
 msgid "One or more messages may have been undeliverable."
 msgstr "Ett eller fler meddelande har kanske inte blivit levererad."
 
-#: ../libpurple/plugins/log_reader.c:1597
 msgid "You were disconnected from the server."
 msgstr "Du har blivit frånkopplad från servern."
 
-#: ../libpurple/plugins/log_reader.c:1605
-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:1620
+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."
+
 msgid "Message could not be sent because the maximum length was exceeded."
-msgstr "Meddelandet kunde inte skickas eftersom den maximala längden överträddes."
-
-#: ../libpurple/plugins/log_reader.c:1625
+msgstr ""
+"Meddelandet kunde inte skickas eftersom den maximala längden överträddes."
+
 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.
-#: ../libpurple/plugins/log_reader.c:2699
-#: ../libpurple/plugins/log_reader.c:2835
 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:2712
-#: ../libpurple/plugins/log_reader.c:2840
 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:2724
-#: ../libpurple/plugins/log_reader.c:2844
 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:2738
-#: ../libpurple/plugins/log_reader.c:2849
 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.
-#: ../libpurple/plugins/log_reader.c:2750
-#: ../libpurple/plugins/log_reader.c:2853
 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:2762
-#: ../libpurple/plugins/log_reader.c:2857
 msgid "Trillian"
 msgstr "Trillian"
 
 #. 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:2774
-#: ../libpurple/plugins/log_reader.c:2861
 msgid "aMSN"
 msgstr "aMSN"
 
 #. Add general preferences.
-#: ../libpurple/plugins/log_reader.c:2817
 msgid "General Log Reading Configuration"
 msgstr "Allmänn konfiguration för logg-läsning"
 
-#: ../libpurple/plugins/log_reader.c:2821
 msgid "Fast size calculations"
 msgstr "Snabb storleksberäkning"
 
-#: ../libpurple/plugins/log_reader.c:2825
 msgid "Use name heuristics"
 msgstr "Använd namn heuristiskt"
 
 #. Add Log Directory preferences.
-#: ../libpurple/plugins/log_reader.c:2831
 msgid "Log Directory"
 msgstr "Logg katalog"
 
@@ -3471,34 +2270,33 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/log_reader.c:2890
 msgid "Log Reader"
 msgstr "Loggvisare"
 
 #. *< name
 #. *< version
 #. * summary
-#: ../libpurple/plugins/log_reader.c:2894
 msgid "Includes other IM clients' logs in the log viewer."
 msgstr "Inkludera andra IM-klienters loggfiler i loggfilsvisaren."
 
 #. * description
-#: ../libpurple/plugins/log_reader.c:2898
-msgid ""
-"When viewing logs, this plugin will include logs from other IM clients. Currently, this includes Adium, MSN Messenger, and Trillian.\n"
+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!"
-
-#: ../libpurple/plugins/mono/loader/mono.c:217
+"VARNING: Denna modul är fortfarande alpha-kod och kan krasha ofta. Använd på "
+"egen risk!"
+
 msgid "Mono Plugin Loader"
 msgstr "Läsare för Monomoduler"
 
-#: ../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."
 
@@ -3511,80 +2309,58 @@
 #. *< 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 ""
+"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."
+
 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:156
-#, 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:160
+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."
+
+#, 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?"
+
 msgid "Offline Message"
 msgstr "Frånkopplade meddeladen"
 
-#: ../libpurple/plugins/offlinemsg.c:161
 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:165
-#: ../libpurple/protocols/msn/dialog.c:141
-#: ../libpurple/protocols/msn/msn.c:628
-#: ../libpurple/protocols/novell/novell.c:1919
-#: ../libpurple/protocols/silc/buddy.c:317
-#: ../libpurple/protocols/silc/pk.c:113
-#: ../libpurple/protocols/silc/wb.c:308
-#: ../libpurple/protocols/silc10/buddy.c:314
-#: ../libpurple/protocols/silc10/pk.c:119
-#: ../libpurple/protocols/silc10/wb.c:307
-#: ../pidgin/gtkrequest.c:268
 msgid "Yes"
 msgstr "Ja"
 
-#: ../libpurple/plugins/offlinemsg.c:166
-#: ../libpurple/protocols/msn/dialog.c:142
-#: ../libpurple/protocols/msn/msn.c:628
-#: ../libpurple/protocols/novell/novell.c:1920
-#: ../libpurple/protocols/silc/buddy.c:318
-#: ../libpurple/protocols/silc/pk.c:114
-#: ../libpurple/protocols/silc/wb.c:309
-#: ../libpurple/protocols/silc10/buddy.c:315
-#: ../libpurple/protocols/silc10/pk.c:120
-#: ../libpurple/protocols/silc10/wb.c:308
-#: ../pidgin/gtkrequest.c:269
 msgid "No"
 msgstr "Nej"
 
-#: ../libpurple/plugins/offlinemsg.c:193
 msgid "Save offline messages in pounce"
 msgstr "Spara frånkopplade meddelanden som attacker"
 
-#: ../libpurple/plugins/offlinemsg.c:197
 msgid "Do not ask. Always save in pounce."
 msgstr "Fråga inte. Spara alltid som attack."
 
@@ -3594,47 +2370,40 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/perl/perl.c:601
 msgid "Perl Plugin Loader"
 msgstr "Inläsare för Perl-moduler"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../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"
 
-#: ../libpurple/plugins/psychic.c:20
 msgid "Psychic Mode"
 msgstr "Psykiskt läge"
 
-#: ../libpurple/plugins/psychic.c:21
 msgid "Psychic mode for incoming conversation"
 msgstr "Siande läge för inkommande konversation"
 
-#: ../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 ""
+"Causes conversation windows to appear as other users begin to message you.  "
+"This works for AIM, ICQ, XMPP, Sametime, and Yahoo!"
+msgstr ""
+"Får konversationsfönster att dyka upp då andra användare börjar att skicka "
+"meddelande till dig. Detta fungerar för AIM, ICQ, XMPP, Sametime och Yahoo!"
+
 msgid "You feel a disturbance in the force..."
 msgstr "Du känner en störning i kraften..."
 
-#: ../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"
 
-#: ../libpurple/plugins/psychic.c:96
 msgid "Disable when away"
 msgstr "Stäng av vid frånvaro"
 
-#: ../libpurple/plugins/psychic.c:100
 msgid "Display notification message in conversations"
 msgstr "Visa notifieringsmeddelande i konversationer"
 
-#: ../libpurple/plugins/psychic.c:105
 msgid "Raise psychic conversations"
 msgstr "Höj siade konversationer"
 
@@ -3644,7 +2413,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/signals-test.c:711
 msgid "Signals Test"
 msgstr "Signaltest"
 
@@ -3652,8 +2420,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/signals-test.c:714
-#: ../libpurple/plugins/signals-test.c:716
 msgid "Test to see that all signals are working properly."
 msgstr "Test för att avgöra om alla signaler fungerar korrekt."
 
@@ -3663,7 +2429,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/simple.c:37
 msgid "Simple Plugin"
 msgstr "Enken insticksmodul"
 
@@ -3673,14 +2438,10 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../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."
 
 #. Scheme name
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:911
-#: ../libpurple/plugins/ssl/ssl-nss.c:731
 msgid "X.509 Certificates"
 msgstr "X.509-certifikat"
 
@@ -3690,7 +2451,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:995
 msgid "GNUTLS"
 msgstr "GNUTLS"
 
@@ -3698,8 +2458,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:998
-#: ../libpurple/plugins/ssl/ssl-gnutls.c:1000
 msgid "Provides SSL support through GNUTLS."
 msgstr "Ger SSL-stöd genom GNUTLS."
 
@@ -3709,7 +2467,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl-nss.c:816
 msgid "NSS"
 msgstr "NSS"
 
@@ -3717,8 +2474,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/plugins/ssl/ssl-nss.c:819
-#: ../libpurple/plugins/ssl/ssl-nss.c:821
 msgid "Provides SSL support through Mozilla NSS."
 msgstr "Ger SSL-stöd genom Mozilla NNS."
 
@@ -3728,7 +2483,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/ssl/ssl.c:94
 msgid "SSL"
 msgstr "SSL"
 
@@ -3736,49 +2490,38 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../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"
 
-#: ../libpurple/plugins/statenotify.c:50
 #, c-format
 msgid "%s is no longer away."
 msgstr "%s är inte längre frånvarande."
 
-#: ../libpurple/plugins/statenotify.c:52
 #, c-format
 msgid "%s has gone away."
 msgstr "%s har gått iväg."
 
-#: ../libpurple/plugins/statenotify.c:62
 #, c-format
 msgid "%s has become idle."
 msgstr "%s har blivit inaktiv."
 
-#: ../libpurple/plugins/statenotify.c:64
 #, c-format
 msgid "%s is no longer idle."
 msgstr "%s är inte längre inaktiv."
 
-#: ../libpurple/plugins/statenotify.c:73
 #, c-format
 msgid "%s has signed on."
 msgstr "%s har loggat in."
 
-#: ../libpurple/plugins/statenotify.c:91
 msgid "Notify When"
 msgstr "Rapportera när"
 
-#: ../libpurple/plugins/statenotify.c:94
 msgid "Buddy Goes _Away"
 msgstr "Kompisen _försvinner"
 
-#: ../libpurple/plugins/statenotify.c:97
 msgid "Buddy Goes _Idle"
 msgstr "Kompisen blir _inaktiv"
 
-#: ../libpurple/plugins/statenotify.c:100
 msgid "Buddy _Signs On/Off"
 msgstr "En kompi_s loggar in/kopplar ifrån"
 
@@ -3788,7 +2531,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../libpurple/plugins/statenotify.c:148
 msgid "Buddy State Notification"
 msgstr "Rapportering av kompisstatus"
 
@@ -3796,72 +2538,55 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../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:423
+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."
+
 msgid "Tcl Plugin Loader"
 msgstr "Tcl-insticksmodulladdare"
 
-#: ../libpurple/plugins/tcl/tcl.c:425
-#: ../libpurple/plugins/tcl/tcl.c:426
 msgid "Provides support for loading Tcl plugins"
 msgstr "Gör det möjligt att ladda Tcl-insticksmoduler"
 
-#: ../libpurple/plugins/tcl/tcl.c:509
-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/protocols/bonjour/bonjour.c:107
-msgid "The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging for more information."
-msgstr "Apples Bonjour För Windows hittades inte, läs FAQen: http://developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging för mer information"
-
-#. Send a message about the connection error
-#: ../libpurple/protocols/bonjour/bonjour.c:124
+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"
+
+msgid ""
+"The Apple Bonjour For Windows toolkit wasn't found, see the FAQ at: http://"
+"developer.pidgin.im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-"
+"LocalMessaging for more information."
+msgstr ""
+"Apples Bonjour För Windows hittades inte, läs FAQen: http://developer.pidgin."
+"im/wiki/Using%20Pidgin#CanIusePidginforBonjourLink-LocalMessaging för mer "
+"information"
+
 msgid "Unable to listen for incoming IM connections\n"
 msgstr "Kan inte lyssna efter inkommande IM anslutningar\n"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:149
-msgid "Unable to establish connection with the local mDNS server.  Is it running?"
+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?"
 
 #. Creating the options for the protocol
-#: ../libpurple/protocols/bonjour/bonjour.c:365
-#: ../libpurple/protocols/bonjour/bonjour.c:670
-#: ../libpurple/protocols/gg/gg.c:632
-#: ../libpurple/protocols/jabber/jabber.c:942
 msgid "First name"
 msgstr "Förnamn"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:367
-#: ../libpurple/protocols/bonjour/bonjour.c:673
-#: ../libpurple/protocols/gg/gg.c:627
-#: ../libpurple/protocols/jabber/jabber.c:947
 msgid "Last name"
 msgstr "Efternamn"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:371
-#: ../libpurple/protocols/jabber/buddy.c:295
-#: ../libpurple/protocols/jabber/buddy.c:1325
-#: ../libpurple/protocols/jabber/buddy.c:1335
-#: ../libpurple/protocols/jabber/buddy.c:2219
-#: ../libpurple/protocols/silc/ops.c:1041
-#: ../libpurple/protocols/silc/util.c:559
-#: ../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"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:374
-#: ../libpurple/protocols/bonjour/bonjour.c:679
 msgid "AIM Account"
 msgstr "AIM-konto"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:377
-#: ../libpurple/protocols/bonjour/bonjour.c:682
 msgid "XMPP Account"
 msgstr "XMPP-konto"
 
@@ -3875,454 +2600,269 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/bonjour/bonjour.c:481
-#: ../libpurple/protocols/bonjour/bonjour.c:483
 msgid "Bonjour Protocol Plugin"
 msgstr "Insticksmodul för Bonjour-protokollet"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:624
 msgid "Purple Person"
 msgstr "Purple person"
 
-#: ../libpurple/protocols/bonjour/bonjour.c:676
-#: ../libpurple/protocols/gg/gg.c:477
-#: ../libpurple/protocols/jabber/jabber.c:932
-#: ../libpurple/protocols/silc/silc.c:901
-#: ../libpurple/protocols/silc/silc.c:1142
-#: ../libpurple/protocols/silc10/silc.c:681
-#: ../libpurple/protocols/silc10/silc.c:922
 msgid "E-mail"
 msgstr "E-post"
 
-#: ../libpurple/protocols/bonjour/bonjour.h:33
 msgid "Bonjour"
 msgstr "Bonjour"
 
-#: ../libpurple/protocols/bonjour/jabber.c:381
 #, c-format
 msgid "%s has closed the conversation."
 msgstr "%s har stängt konversationen."
 
-#: ../libpurple/protocols/bonjour/jabber.c:439
-#: ../libpurple/protocols/bonjour/jabber.c:664
-#: ../libpurple/protocols/bonjour/jabber.c:682
 msgid "Unable to send the message, the conversation couldn't be started."
 msgstr "Kan inte skicka meddelandet, konversationen kunde inte startas."
 
-#: ../libpurple/protocols/bonjour/jabber.c:587
 msgid "Cannot open socket"
 msgstr "Kan inte öppna uttag"
 
-#: ../libpurple/protocols/bonjour/jabber.c:595
 msgid "Error setting socket options"
 msgstr "Fel vid angivning av socket-val"
 
-#: ../libpurple/protocols/bonjour/jabber.c:619
 msgid "Could not bind socket to port"
 msgstr "Kunde inte binda uttag till port"
 
-#: ../libpurple/protocols/bonjour/jabber.c:627
 msgid "Could not listen on socket"
 msgstr "Kunde inte lyssna på uttag"
 
-#: ../libpurple/protocols/gg/gg.c:76
-#: ../libpurple/proxy.c:1845
 msgid "Invalid proxy settings"
 msgstr "Felaktiga proxyinställningar"
 
-#: ../libpurple/protocols/gg/gg.c:77
-#: ../libpurple/proxy.c:1845
-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 ""
+"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."
+
 msgid "Token Error"
 msgstr "Markörsfel"
 
-#: ../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".
-#: ../libpurple/protocols/gg/gg.c:269
-#: ../libpurple/protocols/gg/gg.c:288
 msgid "Save Buddylist..."
 msgstr "Spara kompislista..."
 
-#: ../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."
 
-#: ../libpurple/protocols/gg/gg.c:276
-#: ../libpurple/protocols/gg/gg.c:278
-msgid "Couldn't open file"
-msgstr "Kan inte öppna fil"
-
-#: ../libpurple/protocols/gg/gg.c:289
 msgid "Buddylist saved successfully!"
 msgstr "Kompislistan sparad utan problem!"
 
-#: ../libpurple/protocols/gg/gg.c:307
-#: ../libpurple/protocols/gg/gg.c:308
+#, c-format
+msgid "Couldn't write buddy list for %s to %s"
+msgstr "Kunde inte skriva kompislista för %s till %s"
+
 msgid "Couldn't load buddylist"
 msgstr "Kunde inte läsa in kompislista"
 
-#: ../libpurple/protocols/gg/gg.c:324
 msgid "Load Buddylist..."
 msgstr "Läs in _kompislista..."
 
-#: ../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.
-#: ../libpurple/protocols/gg/gg.c:336
 msgid "Save buddylist..."
 msgstr "Spara kompislista..."
 
-#: ../libpurple/protocols/gg/gg.c:384
 msgid "Fill in the registration fields."
 msgstr "Fyll i registreringsfälten."
 
-#: ../libpurple/protocols/gg/gg.c:389
 msgid "Passwords do not match."
 msgstr "Lösenorden stämmer inte överens."
 
-#: ../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"
 
-#: ../libpurple/protocols/gg/gg.c:411
 msgid "New Gadu-Gadu Account Registered"
 msgstr "Nytt Gadu-gadu-konto registrerat"
 
-#: ../libpurple/protocols/gg/gg.c:412
 msgid "Registration completed successfully!"
 msgstr "Registreringen lyckades!"
 
-#: ../libpurple/protocols/gg/gg.c:482
-#: ../libpurple/protocols/gg/gg.c:775
-#: ../libpurple/protocols/jabber/jabber.c:913
-#: ../libpurple/protocols/jabber/jabber.c:916
-#: ../libpurple/protocols/jabber/jabber.c:1722
 msgid "Password"
 msgstr "Lösenord"
 
-#: ../libpurple/protocols/gg/gg.c:487
-#: ../libpurple/protocols/gg/gg.c:780
 msgid "Password (retype)"
 msgstr "Lösenord (upprepa)"
 
-#: ../libpurple/protocols/gg/gg.c:492
-#: ../libpurple/protocols/gg/gg.c:785
 msgid "Enter current token"
 msgstr "Ange nuvarande markör"
 
-#: ../libpurple/protocols/gg/gg.c:498
-#: ../libpurple/protocols/gg/gg.c:791
 msgid "Current token"
 msgstr "Nuvarande markör"
 
-#: ../libpurple/protocols/gg/gg.c:502
-#: ../libpurple/protocols/gg/gg.c:503
 msgid "Register New Gadu-Gadu Account"
 msgstr "Registrera nytt Gadu-Gadu-konto"
 
-#: ../libpurple/protocols/gg/gg.c:504
 msgid "Please, fill in the following fields"
 msgstr "Fyll i följande fält"
 
-#: ../libpurple/protocols/gg/gg.c:642
-#: ../libpurple/protocols/gg/gg.c:1054
-#: ../libpurple/protocols/gg/gg.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:957
-#: ../libpurple/protocols/oscar/oscar.c:3804
-#: ../libpurple/protocols/oscar/oscar.c:3817
-#: ../libpurple/protocols/qq/buddy_info.c:49
 msgid "City"
 msgstr "Stad"
 
-#: ../libpurple/protocols/gg/gg.c:647
 msgid "Year of birth"
 msgstr "Födelseår"
 
-#: ../libpurple/protocols/gg/gg.c:650
-#: ../libpurple/protocols/msn/msn.c:1700
-#: ../libpurple/protocols/myspace/user.c:119
-#: ../libpurple/protocols/oscar/oscar.c:3747
-#: ../libpurple/protocols/qq/buddy_info.c:46
-#: ../libpurple/protocols/qq/qq.c:226
-#: ../libpurple/protocols/qq/qq.c:229
-#: ../libpurple/protocols/qq/qq.c:232
-#: ../libpurple/protocols/qq/qq.c:236
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1091
 msgid "Gender"
 msgstr "Kön"
 
-#: ../libpurple/protocols/gg/gg.c:651
 msgid "Male or female"
 msgstr "Man eller kvinna"
 
-#: ../libpurple/protocols/gg/gg.c:652
-#: ../libpurple/protocols/oscar/oscar.c:3747
-#: ../libpurple/protocols/qq/buddy_info.c:83
-#: ../libpurple/protocols/qq/qq.c:226
 msgid "Male"
 msgstr "Man"
 
-#: ../libpurple/protocols/gg/gg.c:653
-#: ../libpurple/protocols/oscar/oscar.c:3747
-#: ../libpurple/protocols/qq/buddy_info.c:84
-#: ../libpurple/protocols/qq/qq.c:229
 msgid "Female"
 msgstr "Kvinna"
 
-#: ../libpurple/protocols/gg/gg.c:657
 msgid "Only online"
 msgstr "Enbart ansluten"
 
-#: ../libpurple/protocols/gg/gg.c:661
-#: ../libpurple/protocols/gg/gg.c:662
 msgid "Find buddies"
 msgstr "Sök efter kompisar"
 
-#: ../libpurple/protocols/gg/gg.c:663
 msgid "Please, enter your search criteria below"
 msgstr "Ange dina sökkriterier nedan"
 
-#: ../libpurple/protocols/gg/gg.c:701
 msgid "Fill in the fields."
 msgstr "Fyll i fälten."
 
-#: ../libpurple/protocols/gg/gg.c:713
 msgid "Your current password is different from the one that you specified."
 msgstr "Ditt nuvarande lösenord är ett annat än det du angav."
 
-#: ../libpurple/protocols/gg/gg.c:727
 msgid "Unable to change password. Error occurred.\n"
 msgstr "Kan inte ändra lösenordet. Ett fel uppstod.\n"
 
-#: ../libpurple/protocols/gg/gg.c:736
 msgid "Change password for the Gadu-Gadu account"
 msgstr "Ändra lösenordet för Gadu-Gadu-kontot"
 
-#: ../libpurple/protocols/gg/gg.c:737
 msgid "Password was changed successfully!"
 msgstr "Lösenordet ändrat utan problem!"
 
-#: ../libpurple/protocols/gg/gg.c:770
 msgid "Current password"
 msgstr "Nuvarande lösenord"
 
-#: ../libpurple/protocols/gg/gg.c:795
 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: "
 
-#: ../libpurple/protocols/gg/gg.c:799
-#: ../libpurple/protocols/gg/gg.c:800
 msgid "Change Gadu-Gadu Password"
 msgstr "Ändra Gadu-Gadu-lösenord"
 
-#: ../libpurple/protocols/gg/gg.c:876
 #, c-format
 msgid "Select a chat for buddy: %s"
 msgstr "Välj en chatt för kompisen: %s"
 
-#: ../libpurple/protocols/gg/gg.c:879
-#: ../libpurple/protocols/gg/gg.c:880
 msgid "Add to chat..."
 msgstr "Lägg till i chatt..."
 
-#: ../libpurple/protocols/gg/gg.c:1008
-#: ../libpurple/protocols/jabber/buddy.c:2034
-#: ../libpurple/protocols/novell/novell.c:2833
-#: ../libpurple/protocols/oscar/oscar.c:828
-#: ../libpurple/protocols/oscar/oscar.c:5659
-#: ../libpurple/protocols/qq/qq.c:170
-#: ../libpurple/protocols/qq/qq.c:177
-#: ../libpurple/protocols/qq/qq.c:292
-#: ../libpurple/protocols/yahoo/yahoo.c:3101
-#: ../libpurple/status.c:154
-#: ../pidgin/gtkblist.c:3305
-#: ../pidgin/gtkblist.c:3643
-#: ../pidgin/gtkdocklet.c:561
-#: ../pidgin/gtkstatusbox.c:1061
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: ../libpurple/protocols/gg/gg.c:1011
-#: ../libpurple/protocols/jabber/buddy.c:2036
-#: ../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:2821
-#: ../libpurple/protocols/qq/qq.c:280
-#: ../libpurple/protocols/yahoo/yahoo.c:3103
-#: ../libpurple/status.c:155
-#: ../pidgin/gtkdocklet.c:545
-#: ../pidgin/gtkstatusbox.c:1057
 msgid "Available"
 msgstr "Tillgänglig"
 
 #. 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/gg/gg.c:1014
-#: ../libpurple/protocols/irc/irc.c:528
-#: ../libpurple/protocols/irc/msgs.c:310
-#: ../libpurple/protocols/jabber/buddy.c:2040
-#: ../libpurple/protocols/novell/novell.c:2824
-#: ../libpurple/protocols/oscar/oscar.c:733
-#: ../libpurple/protocols/oscar/oscar.c:4562
-#: ../libpurple/protocols/oscar/oscar.c:5687
-#: ../libpurple/protocols/qq/qq.c:180
-#: ../libpurple/protocols/qq/qq.c:284
-#: ../libpurple/protocols/silc/buddy.c:1479
-#: ../libpurple/protocols/silc10/buddy.c:1479
-#: ../libpurple/protocols/yahoo/yahoo.c:3655
-#: ../libpurple/protocols/yahoo/yahoo.c:3729
-#: ../libpurple/status.c:158
-#: ../pidgin/gtkdocklet.c:549
-#: ../pidgin/gtkprefs.c:2001
-#: ../pidgin/gtkstatusbox.c:1058
 #, c-format
 msgid "Away"
 msgstr "Frånvarande"
 
-#: ../libpurple/protocols/gg/gg.c:1043
-#: ../libpurple/protocols/gg/gg.c:1117
-#: ../libpurple/protocols/oscar/oscar.c:2714
-#: ../libpurple/protocols/oscar/oscar.c:3714
 msgid "UIN"
 msgstr "UIN"
 
-#: ../libpurple/protocols/gg/gg.c:1046
-#: ../libpurple/protocols/gg/gg.c:1120
-#: ../libpurple/protocols/jabber/buddy.c:2213
-#: ../libpurple/protocols/jabber/buddy.c:2389
-#: ../libpurple/protocols/oscar/oscar.c:3725
-#: ../libpurple/protocols/silc/ops.c:990
-#: ../libpurple/protocols/silc10/ops.c:1024
 msgid "First Name"
 msgstr "Förnamn"
 
-#: ../libpurple/protocols/gg/gg.c:1059
-#: ../libpurple/protocols/gg/gg.c:1129
 msgid "Birth Year"
 msgstr "Födelseår"
 
-#: ../libpurple/protocols/gg/gg.c:1111
-#: ../libpurple/protocols/gg/gg.c:1180
-#: ../libpurple/protocols/oscar/oscar.c:3926
 msgid "Unable to display the search results."
 msgstr "Kan inte visa sökningsresultatet."
 
-#: ../libpurple/protocols/gg/gg.c:1171
 msgid "Gadu-Gadu Public Directory"
 msgstr "Gadu-Gadu Publik katalog"
 
-#: ../libpurple/protocols/gg/gg.c:1172
 msgid "Search results"
 msgstr "Sökresultat"
 
-#: ../libpurple/protocols/gg/gg.c:1215
 msgid "No matching users found"
 msgstr "Inga matchande användare funna"
 
-#: ../libpurple/protocols/gg/gg.c:1216
 msgid "There are no users matching your search criteria."
 msgstr "Det finns inga användare som matchar dina sökkriterier."
 
-#: ../libpurple/protocols/gg/gg.c:1310
-#: ../libpurple/protocols/gg/gg.c:1463
 msgid "Unable to read socket"
 msgstr "Kan inte läsa från uttag"
 
-#: ../libpurple/protocols/gg/gg.c:1395
 msgid "Buddy list downloaded"
 msgstr "Kompislistan är nerladdad"
 
-#: ../libpurple/protocols/gg/gg.c:1396
 msgid "Your buddy list was downloaded from the server."
 msgstr "Din kompislista blev nerladdad från servern."
 
-#: ../libpurple/protocols/gg/gg.c:1403
 msgid "Buddy list uploaded"
 msgstr "Kompislistan är uppladdad"
 
-#: ../libpurple/protocols/gg/gg.c:1404
 msgid "Your buddy list was stored on the server."
 msgstr "Din kompislista blev lagrad på servern."
 
-#: ../libpurple/protocols/gg/gg.c:1509
-#: ../libpurple/protocols/gg/gg.c:1715
 msgid "Connection failed."
 msgstr "Anslutning misslyckad"
 
-#: ../libpurple/protocols/gg/gg.c:1621
-#: ../libpurple/protocols/msn/msn.c:627
 msgid "Blocked"
 msgstr "Blockerad"
 
-#: ../libpurple/protocols/gg/gg.c:1644
 msgid "Add to chat"
 msgstr "Lägg till i chatt"
 
-#: ../libpurple/protocols/gg/gg.c:1653
 msgid "Unblock"
 msgstr "Ta bort blockering"
 
-#: ../libpurple/protocols/gg/gg.c:1657
 msgid "Block"
 msgstr "Blockera"
 
-#: ../libpurple/protocols/gg/gg.c:1674
 msgid "Chat _name:"
 msgstr "Chatt_namn:"
 
-#: ../libpurple/protocols/gg/gg.c:1914
 msgid "Chat error"
 msgstr "Chattfel"
 
-#: ../libpurple/protocols/gg/gg.c:1915
 msgid "This chat name is already in use"
 msgstr "Det chattnamnet används redan"
 
-#: ../libpurple/protocols/gg/gg.c:1998
 msgid "Not connected to the server."
 msgstr "Inte ansluten till servern."
 
-#: ../libpurple/protocols/gg/gg.c:2021
 msgid "Find buddies..."
 msgstr "Hitta kompisar..."
 
-#: ../libpurple/protocols/gg/gg.c:2027
 msgid "Change password..."
 msgstr "Byt lösenord..."
 
-#: ../libpurple/protocols/gg/gg.c:2033
 msgid "Upload buddylist to Server"
 msgstr "Skicka kompislista till servern"
 
-#: ../libpurple/protocols/gg/gg.c:2037
 msgid "Download buddylist from Server"
 msgstr "Hämta kompislista från server"
 
-#: ../libpurple/protocols/gg/gg.c:2041
 msgid "Delete buddylist from Server"
 msgstr "Ta bort kompislista från server"
 
-#: ../libpurple/protocols/gg/gg.c:2045
 msgid "Save buddylist to file..."
 msgstr "Spara kompislista till fil..."
 
-#: ../libpurple/protocols/gg/gg.c:2049
 msgid "Load buddylist from file..."
 msgstr "Läs in kompislista från fil..."
 
@@ -4337,157 +2877,81 @@
 #. id
 #. name
 #. version
-#: ../libpurple/protocols/gg/gg.c:2153
 msgid "Gadu-Gadu Protocol Plugin"
 msgstr "Insticksmodul för Gadu-Gadu-protokoll"
 
 #. summary
-#: ../libpurple/protocols/gg/gg.c:2154
 msgid "Polish popular IM"
 msgstr "Populär polsk IM"
 
-#: ../libpurple/protocols/gg/gg.c:2208
 msgid "Gadu-Gadu User"
 msgstr "Gadu-Gadu-användare"
 
-#: ../libpurple/protocols/irc/cmds.c:43
-#: ../libpurple/protocols/silc/silc.c:1768
-#: ../libpurple/protocols/silc10/silc.c:1566
 #, c-format
 msgid "Unknown command: %s"
 msgstr "Okänt kommando: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:503
-#: ../libpurple/protocols/jabber/chat.c:591
-#: ../libpurple/protocols/silc/silc.c:1476
-#: ../libpurple/protocols/silc10/silc.c:1274
 #, c-format
 msgid "current topic is: %s"
 msgstr "det aktuella ämnet är: %s"
 
-#: ../libpurple/protocols/irc/cmds.c:507
-#: ../libpurple/protocols/jabber/chat.c:595
-#: ../libpurple/protocols/silc/silc.c:1480
-#: ../libpurple/protocols/silc10/silc.c:1278
 msgid "No topic is set"
 msgstr "Inget ämne är inställt"
 
-#: ../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:287
 msgid "File Transfer Failed"
 msgstr "Filöverföringen misslyckades"
 
-#: ../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"
 
-#: ../libpurple/protocols/irc/irc.c:79
 msgid "No MOTD available"
 msgstr "Ingen MOTD tillgänglig"
 
-#: ../libpurple/protocols/irc/irc.c:80
 msgid "There is no MOTD associated with this connection."
 msgstr "Det finns ingen MOTD associerad med denna anslutning."
 
-#: ../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:612
-#: ../libpurple/protocols/irc/irc.c:637
-#: ../libpurple/protocols/myspace/myspace.c:2361
 msgid "Server has disconnected"
 msgstr "Servern har kopplat ifrån"
 
-#: ../libpurple/protocols/irc/irc.c:249
 msgid "View MOTD"
 msgstr "Visa MOTD"
 
-#: ../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:527
 msgid "_Password:"
 msgstr "_Lösenord:"
 
-#: ../libpurple/protocols/irc/irc.c:298
 msgid "IRC nicks may not contain whitespace"
 msgstr "IRC-nickar får inte innehålla blanksteg"
 
 #. 1. connect to server
 #. connect to the server
-#: ../libpurple/protocols/irc/irc.c:319
-#: ../libpurple/protocols/jabber/jabber.c:1280
-#: ../libpurple/protocols/msn/session.c:386
-#: ../libpurple/protocols/myspace/myspace.c:302
-#: ../libpurple/protocols/novell/novell.c:2187
-#: ../libpurple/protocols/oscar/oscar.c:1290
-#: ../libpurple/protocols/qq/qq.c:136
-#: ../libpurple/protocols/sametime/sametime.c:3723
-#: ../libpurple/protocols/simple/simple.c:1731
-#: ../libpurple/protocols/yahoo/yahoo.c:2941
-#: ../libpurple/protocols/zephyr/zephyr.c:1621
-#: ../pidgin/gtkstatusbox.c:662
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: ../libpurple/protocols/irc/irc.c:327
-#: ../libpurple/protocols/jabber/jabber.c:610
-#: ../libpurple/protocols/jabber/jabber.c:1095
 msgid "SSL support unavailable"
 msgstr "SSL-stöd ej tillgängligt"
 
-#. TODO: try other ports if in auto mode, then save
-#. * working port and try that first next time.
-#: ../libpurple/protocols/irc/irc.c:338
-#: ../libpurple/protocols/myspace/myspace.c:318
-#: ../libpurple/protocols/simple/simple.c:465
-#: ../libpurple/protocols/simple/simple.c:1646
 msgid "Couldn't create socket"
 msgstr "Kunde inte skapa socket"
 
-#: ../libpurple/protocols/irc/irc.c:421
-#: ../libpurple/protocols/myspace/myspace.c:2474
-#: ../libpurple/protocols/oscar/oscar.c:1286
 msgid "Couldn't connect to host"
 msgstr "Kunde inte ansluta till värden"
 
-#: ../libpurple/protocols/irc/irc.c:609
-#: ../libpurple/protocols/irc/irc.c:634
-#: ../libpurple/protocols/myspace/myspace.c:2357
 msgid "Read error"
 msgstr "Läsfel"
 
-#: ../libpurple/protocols/irc/irc.c:773
-#: ../libpurple/protocols/silc/chat.c:1398
-#: ../libpurple/protocols/silc10/chat.c:1426
-#: ../libpurple/protocols/yahoo/yahoochat.c:1497
 msgid "Users"
 msgstr "Användare"
 
-#: ../libpurple/protocols/irc/irc.c:776
-#: ../libpurple/protocols/sametime/sametime.c:3374
-#: ../libpurple/protocols/silc/chat.c:1401
-#: ../libpurple/protocols/silc/ops.c:1393
-#: ../libpurple/protocols/silc10/chat.c:1429
-#: ../libpurple/protocols/silc10/ops.c:1382
-#: ../libpurple/protocols/yahoo/yahoochat.c:1506
 msgid "Topic"
 msgstr "Ämne"
 
@@ -4499,70 +2963,27 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/irc/irc.c:914
 msgid "IRC Protocol Plugin"
 msgstr "Insticksmodul för IRC-protokoll"
 
 #. *  summary
-#: ../libpurple/protocols/irc/irc.c:915
 msgid "The IRC Protocol Plugin that Sucks Less"
 msgstr "Insticksmodulen för IRC-protokollet som inte suger lika mycket"
 
 #. host to connect to
-#: ../libpurple/protocols/irc/irc.c:940
-#: ../libpurple/protocols/irc/msgs.c:323
-#: ../libpurple/protocols/msn/msn.c:2298
-#: ../libpurple/protocols/oscar/oscar.c:6726
-#: ../libpurple/protocols/qq/qq.c:755
-#: ../libpurple/protocols/sametime/sametime.c:5727
-#: ../libpurple/protocols/silc/ops.c:1249
-#: ../libpurple/protocols/silc/ops.c:1343
-#: ../libpurple/protocols/silc10/ops.c:1244
-#: ../libpurple/protocols/silc10/ops.c:1347
-#: ../libpurple/protocols/simple/simple.c:1918
-#: ../libpurple/protocols/toc/toc.c:2327
 msgid "Server"
 msgstr "Server"
 
 #. port to connect to
-#: ../libpurple/protocols/irc/irc.c:943
-#: ../libpurple/protocols/msn/msn.c:2303
-#: ../libpurple/protocols/oscar/oscar.c:6729
-#: ../libpurple/protocols/qq/qq.c:758
-#: ../libpurple/protocols/sametime/sametime.c:5732
-#: ../libpurple/protocols/silc/silc.c:2049
-#: ../libpurple/protocols/silc10/silc.c:1861
-#: ../libpurple/protocols/toc/toc.c:2331
 msgid "Port"
 msgstr "Port"
 
-#: ../libpurple/protocols/irc/irc.c:946
 msgid "Encodings"
 msgstr "Kodning"
 
-#: ../libpurple/protocols/irc/irc.c:949
-#: ../libpurple/protocols/irc/msgs.c:316
-#: ../libpurple/protocols/jabber/jabber.c:904
-#: ../libpurple/protocols/jabber/jabber.c:907
-#: ../libpurple/protocols/silc/buddy.c:1542
-#: ../libpurple/protocols/silc/ops.c:1197
-#: ../libpurple/protocols/silc/ops.c:1200
-#: ../libpurple/protocols/silc/ops.c:1336
-#: ../libpurple/protocols/silc/ops.c:1339
-#: ../libpurple/protocols/silc/silc.c:1136
-#: ../libpurple/protocols/silc10/buddy.c:1542
-#: ../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"
 
-#: ../libpurple/protocols/irc/irc.c:952
-#: ../libpurple/protocols/irc/msgs.c:317
-#: ../libpurple/protocols/silc/silc.c:1140
-#: ../libpurple/protocols/silc10/silc.c:920
 msgid "Real name"
 msgstr "Fullständigt namn"
 
@@ -4570,823 +2991,632 @@
 #. 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:960
 msgid "Use SSL"
 msgstr "Använd SSL"
 
-#: ../libpurple/protocols/irc/msgs.c:187
 msgid "Bad mode"
 msgstr "Felaktigt läge"
 
-#: ../libpurple/protocols/irc/msgs.c:198
 #, c-format
 msgid "You are banned from %s."
 msgstr "Du är bannlyst i %s."
 
-#: ../libpurple/protocols/irc/msgs.c:199
 msgid "Banned"
 msgstr "Bannlyst"
 
-#: ../libpurple/protocols/irc/msgs.c:216
 #, c-format
 msgid "Cannot ban %s: banlist is full"
 msgstr "Kan inte bannlysa %s: bannlysningslistan är full"
 
-#: ../libpurple/protocols/irc/msgs.c:301
 msgid " <i>(ircop)</i>"
 msgstr " <i>(ircop)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:302
 msgid " <i>(identified)</i>"
 msgstr " <i>(identifierad)</i>"
 
-#: ../libpurple/protocols/irc/msgs.c:303
-#: ../libpurple/protocols/oscar/oscar.c:3715
-#: ../libpurple/protocols/silc/ops.c:1422
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Nick"
 msgstr "Smeknamn"
 
-#: ../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å"
 
-#: ../libpurple/protocols/irc/msgs.c:334
 msgid "Idle for"
 msgstr "Inaktiv i"
 
-#: ../libpurple/protocols/irc/msgs.c:337
 msgid "Online since"
 msgstr "Ansluten sedan"
 
-#: ../libpurple/protocols/irc/msgs.c:341
 msgid "<b>Defining adjective:</b>"
 msgstr "<b>Definiera adjektiv:</b>"
 
-#: ../libpurple/protocols/irc/msgs.c:341
 msgid "Glorious"
 msgstr "Strålande"
 
-#: ../libpurple/protocols/irc/msgs.c:420
 #, c-format
 msgid "%s has changed the topic to: %s"
 msgstr "%s har bytt ämne till: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:422
 #, c-format
 msgid "%s has cleared the topic."
 msgstr "%s har rensat ämnet."
 
-#: ../libpurple/protocols/irc/msgs.c:430
 #, c-format
 msgid "The topic for %s is: %s"
 msgstr "Ämnet för %s är: %s"
 
-#: ../libpurple/protocols/irc/msgs.c:448
 #, c-format
 msgid "Unknown message '%s'"
 msgstr "Okänt meddelande '%s'"
 
-#: ../libpurple/protocols/irc/msgs.c:449
 msgid "Unknown message"
 msgstr "Okänt meddelande"
 
-#: ../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"
 
-#: ../libpurple/protocols/irc/msgs.c:575
 msgid "Time Response"
 msgstr "Tidssvar"
 
-#: ../libpurple/protocols/irc/msgs.c:576
 msgid "The IRC server's local time is:"
 msgstr "IRC-serverns lokala tid är:"
 
-#: ../libpurple/protocols/irc/msgs.c:587
 msgid "No such channel"
 msgstr "Finns ingen sådan kanal"
 
 #. does this happen?
-#: ../libpurple/protocols/irc/msgs.c:598
 msgid "no such channel"
 msgstr "ingen sådan kanal"
 
-#: ../libpurple/protocols/irc/msgs.c:601
 msgid "User is not logged in"
 msgstr "Användaren är inte inloggad"
 
-#: ../libpurple/protocols/irc/msgs.c:606
 msgid "No such nick or channel"
 msgstr "Inget sådant nick eller kanal"
 
-#: ../libpurple/protocols/irc/msgs.c:626
 msgid "Could not send"
 msgstr "Kunde inte skicka"
 
-#: ../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."
 
-#: ../libpurple/protocols/irc/msgs.c:683
 msgid "Invitation only"
 msgstr "Endast inbjudna"
 
-#: ../libpurple/protocols/irc/msgs.c:798
 #, c-format
 msgid "You have been kicked by %s: (%s)"
 msgstr "Du har sparkats ut av %s: (%s)"
 
 #. Remove user from channel
-#: ../libpurple/protocols/irc/msgs.c:803
-#: ../libpurple/protocols/silc/ops.c:699
-#: ../libpurple/protocols/silc10/ops.c:720
 #, c-format
 msgid "Kicked by %s (%s)"
 msgstr "Utsparkad av %s (%s)"
 
-#: ../libpurple/protocols/irc/msgs.c:826
 #, c-format
 msgid "mode (%s %s) by %s"
 msgstr "läge (%s %s) av %s"
 
-#: ../libpurple/protocols/irc/msgs.c:911
-#: ../libpurple/protocols/irc/msgs.c:912
 msgid "Invalid nickname"
 msgstr "Ogiltigt smeknamn"
 
-#: ../libpurple/protocols/irc/msgs.c:913
-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:918
-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:957
+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."
+
+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."
+
 msgid "Cannot change nick"
 msgstr "Kan inte ändra nick"
 
-#: ../libpurple/protocols/irc/msgs.c:957
 msgid "Could not change nick"
 msgstr "Kunde inte byta smeknamn"
 
-#: ../libpurple/protocols/irc/msgs.c:978
 #, c-format
 msgid "You have parted the channel%s%s"
 msgstr "Du har lämnat kanalen%s%s"
 
-#: ../libpurple/protocols/irc/msgs.c:1020
 msgid "Error: invalid PONG from server"
 msgstr "Fel: Ogiltig PONG från server"
 
-#: ../libpurple/protocols/irc/msgs.c:1022
 #, c-format
 msgid "PING reply -- Lag: %lu seconds"
 msgstr "PING-svar -- Fördröjning: %lu sekunder"
 
-#: ../libpurple/protocols/irc/msgs.c:1113
 #, c-format
 msgid "Cannot join %s: Registration is required."
 msgstr "Kan inte ansluta till %s: Registrering krävs"
 
-#: ../libpurple/protocols/irc/msgs.c:1114
-#: ../libpurple/protocols/silc/ops.c:1093
-#: ../libpurple/protocols/silc10/ops.c:1128
 msgid "Cannot join channel"
 msgstr "Kan inte ansluta till kanalen"
 
-#: ../libpurple/protocols/irc/msgs.c:1148
 msgid "Nick or channel is temporarily unavailable."
 msgstr "Nick eller kanal är temporärt otillgänglig."
 
-#: ../libpurple/protocols/irc/msgs.c:1160
 #, c-format
 msgid "Wallops from %s"
 msgstr "Smocka från %s"
 
-#: ../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."
 
-#: ../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 ""
+"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."
+
 msgid "chanserv: Send a command to chanserv"
 msgstr "chanserv: Skicka ett kommando till chanserv"
 
-#: ../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 ""
+"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."
+
+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."
+
+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."
+
+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."
+
+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."
+
+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."
+
+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>"
+
 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."
 
-#: ../libpurple/protocols/irc/parse.c:133
 msgid "memoserv: Send a command to memoserv"
 msgstr "memoserv: Skicka ett kommando till memoserv"
 
-#: ../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 ""
+"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."
+
+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)."
+
 msgid "names [channel]:  List the users currently in a channel."
 msgstr "names [kanal]:  Lista användarna som är i kanalen just nu."
 
-#: ../libpurple/protocols/irc/parse.c:137
-#: ../libpurple/protocols/jabber/jabber.c:2304
 msgid "nick &lt;new nickname&gt;:  Change your nickname."
 msgstr "nick &lt;nytt smeknamn&gt;:  Ändra ditt smeknamn."
 
-#: ../libpurple/protocols/irc/parse.c:138
 msgid "nickserv: Send a command to nickserv"
 msgstr "nickserv: Skicka ett kommando till nickserv"
 
-#: ../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 ""
+"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."
+
+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."
+
 msgid "operserv: Send a command to operserv"
 msgstr "operserv: Skicka ett kommando till operserv"
 
-#: ../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 ""
+"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."
+
+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."
+
+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."
+
 msgid "quit [message]:  Disconnect from the server, with an optional message."
-msgstr "quit [meddelande]:  Koppla ifrån servern med ett frivilligt meddelande."
-
-#: ../libpurple/protocols/irc/parse.c:146
+msgstr ""
+"quit [meddelande]:  Koppla ifrån servern med ett frivilligt meddelande."
+
 msgid "quote [...]:  Send a raw command to the server."
 msgstr "quote [...]:  Skicka ett rått kommando till servern."
 
-#: ../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 ""
+"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."
+
 msgid "time: Displays the current local time at the IRC server."
 msgstr "time: Visar IRC-serverns lokala tid."
 
-#: ../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."
 
-#: ../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."
 
-#: ../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"
-
-#: ../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
+msgstr ""
+"version [smeknamn]: skickar en CTCP VERSION förfrågan till en användare"
+
+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."
+
+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."
+
 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."
-
-#: ../libpurple/protocols/irc/parse.c:155
+msgstr ""
+"whois [server] &lt;smeknamn&gt;:  Hämta informationen för en användare."
+
 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:520
+msgstr ""
+"whowas &lt;smeknamn&gt;: Hämta informationen för en användare som har "
+"kopplat ifrån."
+
 #, c-format
 msgid "Reply time from %s: %lu seconds"
 msgstr "Svarstid från %s: %lu sekunder"
 
-#: ../libpurple/protocols/irc/parse.c:521
 msgid "PONG"
 msgstr "PONG"
 
-#: ../libpurple/protocols/irc/parse.c:521
 msgid "CTCP PING reply"
 msgstr "CTCP PING-svar"
 
-#: ../libpurple/protocols/irc/parse.c:632
-#: ../libpurple/protocols/irc/parse.c:636
-#: ../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."
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:137
-#: ../libpurple/protocols/jabber/jabber.c:671
-#: ../libpurple/protocols/jabber/jabber.c:701
-#: ../libpurple/protocols/jabber/jabber.c:1887
 msgid "Unknown Error"
 msgstr "Okänt fel"
 
-#: ../libpurple/protocols/jabber/adhoccommands.c:139
-#: ../libpurple/protocols/jabber/adhoccommands.c:140
 msgid "Ad-Hoc Command Failed"
 msgstr "'Ad-Hoc'-kommandot misslyckades"
 
 # Bra till vad?
-#: ../libpurple/protocols/jabber/adhoccommands.c:176
+# Vet faktiskt inte om detta är ett kommando eller om det är en beskrivning.
 msgid "execute"
 msgstr "utför"
 
-#: ../libpurple/protocols/jabber/auth.c:53
 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."
 
-#: ../libpurple/protocols/jabber/auth.c:116
 msgid "Server requires plaintext authentication over an unencrypted stream"
 msgstr "Servern kräver klartextautentisering över en okrypterad ström"
 
-#: ../libpurple/protocols/jabber/auth.c:319
-#: ../libpurple/protocols/jabber/auth.c:508
-#, 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:321
-#: ../libpurple/protocols/jabber/auth.c:322
-#: ../libpurple/protocols/jabber/auth.c:510
-#: ../libpurple/protocols/jabber/auth.c:511
-#: ../libpurple/protocols/jabber/auth.c:598
-#: ../libpurple/protocols/jabber/auth.c:599
+#, 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?"
+
 msgid "Plaintext Authentication"
 msgstr "Klartextautentisering"
 
-#: ../libpurple/protocols/jabber/auth.c:334
-#: ../libpurple/protocols/jabber/auth.c:523
-#: ../libpurple/protocols/jabber/auth.c:610
 msgid "Server does not use any supported authentication method"
 msgstr "Servern använder inga autentiseringsmetoder som stöds"
 
-#. This should never happen!
-#: ../libpurple/protocols/jabber/auth.c:462
-#: ../libpurple/protocols/jabber/auth.c:561
-#: ../libpurple/protocols/jabber/auth.c:776
-#: ../libpurple/protocols/jabber/auth.c:917
-#: ../libpurple/protocols/jabber/auth.c:942
-#: ../libpurple/protocols/jabber/auth.c:961
-#: ../libpurple/protocols/jabber/jabber.c:123
 msgid "Invalid response from server."
 msgstr "Ogiltigt svar från servern."
 
-#: ../libpurple/protocols/jabber/auth.c:600
-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:797
-#: ../libpurple/protocols/jabber/auth.c:820
+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?"
+
 msgid "Invalid challenge from server"
 msgstr "Ogiltigt utmaning från servern"
 
-#: ../libpurple/protocols/jabber/auth.c:892
 msgid "SASL error"
 msgstr "SASL fel"
 
-#: ../libpurple/protocols/jabber/buddy.c:283
-#: ../libpurple/protocols/jabber/buddy.c:1219
-#: ../libpurple/protocols/sametime/sametime.c:4128
-#: ../libpurple/protocols/silc/ops.c:986
-#: ../libpurple/protocols/silc10/ops.c:1020
 msgid "Full Name"
 msgstr "Fullständigt namn"
 
-#: ../libpurple/protocols/jabber/buddy.c:284
-#: ../libpurple/protocols/jabber/buddy.c:1231
-#: ../libpurple/protocols/silc/ops.c:998
-#: ../libpurple/protocols/silc10/ops.c:1032
 msgid "Family Name"
 msgstr "Efternamn"
 
-#: ../libpurple/protocols/jabber/buddy.c:285
-#: ../libpurple/protocols/jabber/buddy.c:1234
 msgid "Given Name"
 msgstr "Förnamn"
 
-#: ../libpurple/protocols/jabber/buddy.c:287
-#: ../libpurple/protocols/jabber/jabber.c:977
 msgid "URL"
 msgstr "URL"
 
-#: ../libpurple/protocols/jabber/buddy.c:288
-#: ../libpurple/protocols/jabber/buddy.c:1282
 msgid "Street Address"
 msgstr "Gatuadress"
 
-#: ../libpurple/protocols/jabber/buddy.c:289
-#: ../libpurple/protocols/jabber/buddy.c:1279
 msgid "Extended Address"
 msgstr "Utökad adress"
 
-#: ../libpurple/protocols/jabber/buddy.c:290
-#: ../libpurple/protocols/jabber/buddy.c:1285
 msgid "Locality"
 msgstr "Lokalitet"
 
-#: ../libpurple/protocols/jabber/buddy.c:291
-#: ../libpurple/protocols/jabber/buddy.c:1288
 msgid "Region"
 msgstr "Region"
 
-#: ../libpurple/protocols/jabber/buddy.c:292
-#: ../libpurple/protocols/jabber/buddy.c:1291
 msgid "Postal Code"
 msgstr "Postnummer"
 
-#: ../libpurple/protocols/jabber/buddy.c:293
-#: ../libpurple/protocols/jabber/buddy.c:1295
-#: ../libpurple/protocols/silc/silc.c:1146
-#: ../libpurple/protocols/silc10/silc.c:926
 msgid "Country"
 msgstr "Land"
 
-#: ../libpurple/protocols/jabber/buddy.c:294
-#: ../libpurple/protocols/jabber/buddy.c:1306
-#: ../libpurple/protocols/jabber/buddy.c:1313
 msgid "Telephone"
 msgstr "Telefon"
 
-#: ../libpurple/protocols/jabber/buddy.c:296
-#: ../libpurple/protocols/jabber/buddy.c:1350
 msgid "Organization Name"
 msgstr "Organisationens namn"
 
-#: ../libpurple/protocols/jabber/buddy.c:297
-#: ../libpurple/protocols/jabber/buddy.c:1353
 msgid "Organization Unit"
 msgstr "Organisationsenhet"
 
-#: ../libpurple/protocols/jabber/buddy.c:299
-#: ../libpurple/protocols/jabber/buddy.c:1362
 msgid "Role"
 msgstr "Roll"
 
-#: ../libpurple/protocols/jabber/buddy.c:300
-#: ../libpurple/protocols/jabber/buddy.c:1250
-#: ../libpurple/protocols/msn/msn.c:1769
-#: ../libpurple/protocols/oscar/oscar.c:3764
 msgid "Birthday"
 msgstr "Födelsedag"
 
-#: ../libpurple/protocols/jabber/buddy.c:301
-#: ../libpurple/protocols/jabber/buddy.c:1365
-#: ../libpurple/protocols/jabber/chat.c:775
-#: ../libpurple/protocols/jabber/usermood.c:193
-#: ../pidgin/gtkblist.c:3317
-#: ../pidgin/gtkprefs.c:739
 msgid "Description"
 msgstr "Beskrivning"
 
 # "vCard" fattar ingen som inte insatt i Jabber vad det betyder.
 # Visitkort känner däremot de flesta till.
-#: ../libpurple/protocols/jabber/buddy.c:722
-#: ../libpurple/protocols/jabber/buddy.c:723
+# "vCard" har med mer än Jabber att göra om jag inte minns fel, men ibland får man offra saker för användarvänlighet.;)
 msgid "Edit XMPP vCard"
-msgstr "Redigera XMPP vCard"
-
-#: ../libpurple/protocols/jabber/buddy.c:724
-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:795
-#: ../libpurple/protocols/jabber/buddy.c:960
+msgstr "Redigera XMPP visitkort"
+
+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."
+
 msgid "Client"
 msgstr "Klient"
 
-#: ../libpurple/protocols/jabber/buddy.c:799
-#: ../libpurple/protocols/jabber/buddy.c:964
 msgid "Operating System"
 msgstr "Operativsystem"
 
-#: ../libpurple/protocols/jabber/buddy.c:815
-#: ../libpurple/protocols/jabber/buddy.c:975
 msgid "Last Activity"
 msgstr "Senaste aktivitet"
 
-#: ../libpurple/protocols/jabber/buddy.c:817
-#: ../libpurple/protocols/jabber/buddy.c:977
 msgid "Service Discovery Info"
 msgstr "Tjänsteupptäckningsinfo"
 
-#: ../libpurple/protocols/jabber/buddy.c:819
-#: ../libpurple/protocols/jabber/buddy.c:979
 msgid "Service Discovery Items"
 msgstr "Tjänstupptäckningsföremål"
 
-#: ../libpurple/protocols/jabber/buddy.c:821
-#: ../libpurple/protocols/jabber/buddy.c:981
 msgid "Extended Stanza Addressing"
 msgstr "Utökad Strofadressering"
 
-#: ../libpurple/protocols/jabber/buddy.c:823
-#: ../libpurple/protocols/jabber/buddy.c:983
 msgid "Multi-User Chat"
 msgstr "Månganvändarchatt"
 
-# Låter helt fel.
-#: ../libpurple/protocols/jabber/buddy.c:825
-#: ../libpurple/protocols/jabber/buddy.c:985
 #, fuzzy
 msgid "Multi-User Chat Extended Presence Information"
-msgstr "Månganvändarchatt Utökad närvaroinformation"
-
-#: ../libpurple/protocols/jabber/buddy.c:827
-#: ../libpurple/protocols/jabber/buddy.c:987
+msgstr "Användaren har ingen kataloginformation."
+
 msgid "In-Band Bytestreams"
 msgstr "In-Band Byteströmmar"
 
-#: ../libpurple/protocols/jabber/buddy.c:829
-#: ../libpurple/protocols/jabber/buddy.c:989
 msgid "Ad-Hoc Commands"
 msgstr "'Ad-Hoc' Kommandon"
 
-# Var är denna?
-#: ../libpurple/protocols/jabber/buddy.c:831
-#: ../libpurple/protocols/jabber/buddy.c:991
+# Vad är PubSub? Hittar bara antydningar till en sökmotor med speciella möjligheter för uppföljning. Är det den som avses?
 msgid "PubSub Service"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:833
-#: ../libpurple/protocols/jabber/buddy.c:993
+msgstr "PubSub Service"
+
 msgid "SOCKS5 Bytestreams"
 msgstr "SOCKS5 Byteströmmar"
 
 # Vad för?
-#: ../libpurple/protocols/jabber/buddy.c:835
-#: ../libpurple/protocols/jabber/buddy.c:995
 msgid "Out of Band Data"
 msgstr ""
 
-#: ../libpurple/protocols/jabber/buddy.c:837
-#: ../libpurple/protocols/jabber/buddy.c:997
 msgid "XHTML-IM"
 msgstr "XHTML-IM"
 
-# Vad menas med In-Band, när används och vad blir då lämplig översättning?
-#: ../libpurple/protocols/jabber/buddy.c:839
-#: ../libpurple/protocols/jabber/buddy.c:999
+# Vad menas med In-Band, när används och vad blir då lämplig översättning? Denna har antagligen något med "Out-of-Band att göra men hur hänger de ihop?
 msgid "In-Band Registration"
 msgstr "In-Bandsregistrering"
 
-#: ../libpurple/protocols/jabber/buddy.c:841
-#: ../libpurple/protocols/jabber/buddy.c:1001
 msgid "User Location"
 msgstr "Placering"
 
-#: ../libpurple/protocols/jabber/buddy.c:843
-#: ../libpurple/protocols/jabber/buddy.c:1003
 msgid "User Avatar"
 msgstr "Användar-avatar"
 
-#: ../libpurple/protocols/jabber/buddy.c:845
-#: ../libpurple/protocols/jabber/buddy.c:1005
 msgid "Chat State Notifications"
 msgstr "Chatt-status notifieringar"
 
-#: ../libpurple/protocols/jabber/buddy.c:847
-#: ../libpurple/protocols/jabber/buddy.c:1007
 msgid "Software Version"
 msgstr "Mjukvaruversion"
 
-#: ../libpurple/protocols/jabber/buddy.c:849
-#: ../libpurple/protocols/jabber/buddy.c:1009
 msgid "Stream Initiation"
 msgstr "Ströminitiering"
 
-#: ../libpurple/protocols/jabber/buddy.c:851
-#: ../libpurple/protocols/jabber/buddy.c:1011
-#: ../libpurple/protocols/sametime/sametime.c:3235
 msgid "File Transfer"
 msgstr "Filöverföringar"
 
-#: ../libpurple/protocols/jabber/buddy.c:853
-#: ../libpurple/protocols/jabber/buddy.c:1013
 msgid "User Mood"
 msgstr "Användarhumör"
 
-#: ../libpurple/protocols/jabber/buddy.c:855
-#: ../libpurple/protocols/jabber/buddy.c:1015
 msgid "User Activity"
 msgstr "Användaraktivitet"
 
-#: ../libpurple/protocols/jabber/buddy.c:857
-#: ../libpurple/protocols/jabber/buddy.c:1017
+# Låter mysko, vet inte i vilket sammanhang.
 msgid "Entity Capabilities"
-msgstr ""
-
-#: ../libpurple/protocols/jabber/buddy.c:859
-#: ../libpurple/protocols/jabber/buddy.c:1019
+msgstr "Existensmöjligheter"
+
 msgid "Encrypted Session Negotiations"
 msgstr "Förhandlingar om krypterade sessioner"
 
-#: ../libpurple/protocols/jabber/buddy.c:861
-#: ../libpurple/protocols/jabber/buddy.c:1021
 msgid "User Tune"
 msgstr "Användarlåt"
 
-#: ../libpurple/protocols/jabber/buddy.c:863
-#: ../libpurple/protocols/jabber/buddy.c:1023
-#, fuzzy
 msgid "Roster Item Exchange"
-msgstr "IM med nyckelutbyte"
+msgstr "Listinnehållsutbyte"
 
 # Vet inte om detta är bästa, men...
-#: ../libpurple/protocols/jabber/buddy.c:865
-#: ../libpurple/protocols/jabber/buddy.c:1025
 msgid "Reachability Address"
 msgstr "Nåbar adress"
 
-#: ../libpurple/protocols/jabber/buddy.c:867
-#: ../libpurple/protocols/jabber/buddy.c:1027
 msgid "User Profile"
 msgstr "Användarprofil"
 
-#: ../libpurple/protocols/jabber/buddy.c:869
-#: ../libpurple/protocols/jabber/buddy.c:1029
 msgid "Jingle"
 msgstr "Ramsa"
 
 # Vad är dessa?
-#: ../libpurple/protocols/jabber/buddy.c:871
-#: ../libpurple/protocols/jabber/buddy.c:1031
 msgid "Jingle Audio"
 msgstr "Sångsnutt"
 
-#: ../libpurple/protocols/jabber/buddy.c:873
-#: ../libpurple/protocols/jabber/buddy.c:1033
 msgid "User Nickname"
 msgstr "Användarsmeknamn"
 
 # Vad är dessa?
-#: ../libpurple/protocols/jabber/buddy.c:875
-#: ../libpurple/protocols/jabber/buddy.c:1035
 msgid "Jingle ICE UDP"
 msgstr "Ramsa ICE UDP"
 
 # Vad är dessa?
-#: ../libpurple/protocols/jabber/buddy.c:877
-#: ../libpurple/protocols/jabber/buddy.c:1037
 msgid "Jingle ICE TCP"
 msgstr "Ramsa ICE TCP"
 
 # Vad är dessa?
-#: ../libpurple/protocols/jabber/buddy.c:879
-#: ../libpurple/protocols/jabber/buddy.c:1039
 msgid "Jingle Raw UDP"
 msgstr "Ramsa Rå UDP"
 
-#: ../libpurple/protocols/jabber/buddy.c:881
-#: ../libpurple/protocols/jabber/buddy.c:1041
 msgid "Jingle Video"
 msgstr "Ramsa Video"
 
 # Vad är dessa?
-#: ../libpurple/protocols/jabber/buddy.c:883
-#: ../libpurple/protocols/jabber/buddy.c:1043
 msgid "Jingle DTMF"
 msgstr "Ramsa DTMF"
 
-#: ../libpurple/protocols/jabber/buddy.c:885
-#: ../libpurple/protocols/jabber/buddy.c:1045
 msgid "Message Receipts"
 msgstr "Meddelandekvitton"
 
-#: ../libpurple/protocols/jabber/buddy.c:887
-#: ../libpurple/protocols/jabber/buddy.c:1047
 msgid "Public Key Publishing"
 msgstr "Publik nyckelpublisering"
 
-#: ../libpurple/protocols/jabber/buddy.c:889
-#: ../libpurple/protocols/jabber/buddy.c:1049
 msgid "User Chatting"
 msgstr "Användarchattning"
 
-#: ../libpurple/protocols/jabber/buddy.c:891
-#: ../libpurple/protocols/jabber/buddy.c:1051
 msgid "User Browsing"
 msgstr "Användarbläddring"
 
-#: ../libpurple/protocols/jabber/buddy.c:893
-#: ../libpurple/protocols/jabber/buddy.c:1053
 msgid "User Gaming"
 msgstr "Användarspelning"
 
-#: ../libpurple/protocols/jabber/buddy.c:895
-#: ../libpurple/protocols/jabber/buddy.c:1055
 msgid "User Viewing"
 msgstr "Användarvisning"
 
-#: ../libpurple/protocols/jabber/buddy.c:897
-#: ../libpurple/protocols/jabber/buddy.c:1057
-#: ../libpurple/protocols/silc/ops.c:1600
-#: ../libpurple/protocols/silc/ops.c:1605
-#: ../libpurple/protocols/silc10/ops.c:1612
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping"
 msgstr "Ping"
 
-#: ../libpurple/protocols/jabber/buddy.c:899
-#: ../libpurple/protocols/jabber/buddy.c:1059
 msgid "Stanza Encryption"
 msgstr "Strofkryptering"
 
-#: ../libpurple/protocols/jabber/buddy.c:901
-#: ../libpurple/protocols/jabber/buddy.c:1061
 msgid "Entity Time"
 msgstr "Enhet Tid"
 
-#: ../libpurple/protocols/jabber/buddy.c:903
-#: ../libpurple/protocols/jabber/buddy.c:1063
 msgid "Delayed Delivery"
 msgstr "Försenad försändelse"
 
-#: ../libpurple/protocols/jabber/buddy.c:905
-#: ../libpurple/protocols/jabber/buddy.c:1065
 msgid "Collaborative Data Objects"
 msgstr "Kollebrationsdata objekt"
 
-#: ../libpurple/protocols/jabber/buddy.c:907
-#: ../libpurple/protocols/jabber/buddy.c:1067
 msgid "File Repository and Sharing"
 msgstr "Filförvaringsplats och Delning"
 
-#: ../libpurple/protocols/jabber/buddy.c:909
-#: ../libpurple/protocols/jabber/buddy.c:1069
 msgid "STUN Service Discovery for Jingle"
 msgstr "STUN Serviceupptäckning för Ramsor"
 
-#: ../libpurple/protocols/jabber/buddy.c:911
-#: ../libpurple/protocols/jabber/buddy.c:1071
 msgid "Simplified Encrypted Session Negotiation"
 msgstr "Simpel crypterad session förhandling"
 
-#: ../libpurple/protocols/jabber/buddy.c:913
-#: ../libpurple/protocols/jabber/buddy.c:1073
 msgid "Hop Check"
 msgstr "Hoppkontroll"
 
-#: ../libpurple/protocols/jabber/buddy.c:921
-#: ../libpurple/protocols/jabber/buddy.c:1081
-#: ../libpurple/protocols/oscar/oscar.c:2921
 msgid "Capabilities"
 msgstr "Stödjer"
 
@@ -5395,294 +3625,189 @@
 # 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.
-#: ../libpurple/protocols/jabber/buddy.c:933
-#: ../libpurple/protocols/jabber/libxmpp.c:206
-#: ../libpurple/protocols/jabber/si.c:859
 msgid "Resource"
 msgstr "Resurs"
 
-#: ../libpurple/protocols/jabber/buddy.c:935
-#: ../libpurple/protocols/jabber/jabber.c:1531
-#: ../libpurple/protocols/jabber/jabber.c:1554
-#: ../libpurple/protocols/jabber/jabber.c:1577
-#: ../libpurple/protocols/jabber/jabber.c:1600
-#: ../libpurple/protocols/jabber/jabber.c:1623
 msgid "Priority"
 msgstr "Prioritet"
 
-#: ../libpurple/protocols/jabber/buddy.c:1237
-#: ../libpurple/protocols/silc/ops.c:994
-#: ../libpurple/protocols/silc10/ops.c:1028
 msgid "Middle Name"
 msgstr "Andranamn"
 
-#: ../libpurple/protocols/jabber/buddy.c:1270
-#: ../libpurple/protocols/jabber/jabber.c:952
-#: ../libpurple/protocols/oscar/oscar.c:3803
-#: ../libpurple/protocols/oscar/oscar.c:3816
-#: ../libpurple/protocols/qq/buddy_info.c:56
-#: ../libpurple/protocols/silc/ops.c:1030
-#: ../libpurple/protocols/silc10/ops.c:1064
 msgid "Address"
 msgstr "Adress"
 
-#: ../libpurple/protocols/jabber/buddy.c:1276
 msgid "P.O. Box"
 msgstr "Postbox"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Photo"
 msgstr "Foto"
 
-#: ../libpurple/protocols/jabber/buddy.c:1386
 msgid "Logo"
 msgstr "Logotyp"
 
-#: ../libpurple/protocols/jabber/buddy.c:1945
 msgid "Un-hide From"
 msgstr "Göm inte \"Från\""
 
-#: ../libpurple/protocols/jabber/buddy.c:1949
 msgid "Temporarily Hide From"
 msgstr "Göm temporärt \"Från\""
 
 #. && NOT ME
-#: ../libpurple/protocols/jabber/buddy.c:1957
 msgid "Cancel Presence Notification"
 msgstr "Avbryt närvarorapportering"
 
-#: ../libpurple/protocols/jabber/buddy.c:1964
 msgid "(Re-)Request authorization"
 msgstr "Begär autentiserings (igen)"
 
 #. if(NOT ME)
 #. shouldn't this just happen automatically when the buddy is
 #. removed?
-#: ../libpurple/protocols/jabber/buddy.c:1973
 msgid "Unsubscribe"
 msgstr "Sluta prenumerera"
 
-#: ../libpurple/protocols/jabber/buddy.c:1988
 msgid "Log In"
 msgstr "Anslut"
 
-#: ../libpurple/protocols/jabber/buddy.c:1992
 msgid "Log Out"
 msgstr "Koppla ifrån"
 
-#: ../libpurple/protocols/jabber/buddy.c:2038
-#: ../libpurple/protocols/jabber/jabber.c:1553
 msgid "Chatty"
 msgstr "Pratig"
 
-#: ../libpurple/protocols/jabber/buddy.c:2042
 msgid "Extended Away"
 msgstr "Utökad frånvaro"
 
-#: ../libpurple/protocols/jabber/buddy.c:2044
-#: ../libpurple/protocols/jabber/jabber.c:1622
-#: ../libpurple/protocols/oscar/oscar.c:727
-#: ../libpurple/protocols/oscar/oscar.c:5863
-#: ../libpurple/protocols/sametime/sametime.c:3297
 #, c-format
 msgid "Do Not Disturb"
 msgstr "Stör inte"
 
-#: ../libpurple/protocols/jabber/buddy.c:2211
 msgid "JID"
 msgstr "JID"
 
-#: ../libpurple/protocols/jabber/buddy.c:2215
-#: ../libpurple/protocols/jabber/buddy.c:2394
-#: ../libpurple/protocols/oscar/oscar.c:3726
 msgid "Last Name"
 msgstr "Efternamn"
 
-#: ../libpurple/protocols/jabber/buddy.c:2247
 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
-#: ../libpurple/protocols/jabber/buddy.c:2322
-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:2342
+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 (%)"
+
 msgid "Directory Query Failed"
 msgstr "Katalogförfrågning misslyckades"
 
-#: ../libpurple/protocols/jabber/buddy.c:2343
 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[])
-#: ../libpurple/protocols/jabber/buddy.c:2377
 #, c-format
 msgid "Server Instructions: %s"
 msgstr "Serverinstruktioner: %s"
 
-#: ../libpurple/protocols/jabber/buddy.c:2384
 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:2404
-#: ../libpurple/protocols/novell/novell.c:1490
-#: ../libpurple/protocols/oscar/oscar.c:3729
-#: ../libpurple/protocols/oscar/oscar.c:3738
+msgstr ""
+"Fyll i ett eller flera fält för att söka efter matchande XMPPanvändare."
+
 msgid "E-Mail Address"
 msgstr "E-postadress"
 
-#: ../libpurple/protocols/jabber/buddy.c:2413
-#: ../libpurple/protocols/jabber/buddy.c:2414
 msgid "Search for XMPP users"
 msgstr "Sök efter XMPP användare"
 
 #. "Search"
-#: ../libpurple/protocols/jabber/buddy.c:2415
-#: ../libpurple/protocols/qq/group.c:123
-#: ../libpurple/protocols/qq/group_im.c:147
-#: ../libpurple/protocols/qq/sys_msg.c:174
-#: ../libpurple/protocols/qq/sys_msg.c:250
-#: ../libpurple/protocols/qq/sys_msg.c:268
-#: ../libpurple/protocols/sametime/sametime.c:5611
-#: ../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:2430
 msgid "Invalid Directory"
 msgstr "Ogiltigt register"
 
-#: ../libpurple/protocols/jabber/buddy.c:2447
 msgid "Enter a User Directory"
 msgstr "Ange ett användarregister"
 
-#: ../libpurple/protocols/jabber/buddy.c:2448
 msgid "Select a user directory to search"
 msgstr "Välj ett användarregister som du vill söka i"
 
-#: ../libpurple/protocols/jabber/buddy.c:2451
 msgid "Search Directory"
 msgstr "Sökregister"
 
-#: ../libpurple/protocols/jabber/chat.c:41
-#: ../libpurple/protocols/oscar/oscar.c:5347
-#: ../libpurple/protocols/yahoo/yahoochat.c:1048
 msgid "_Room:"
 msgstr "_Rum:"
 
-#: ../libpurple/protocols/jabber/chat.c:47
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../libpurple/protocols/jabber/chat.c:53
 msgid "_Handle:"
 msgstr "_Alias:"
 
-#: ../libpurple/protocols/jabber/chat.c:223
 #, c-format
 msgid "%s is not a valid room name"
 msgstr "%s är inte ett giltigt rumsnamn"
 
-#: ../libpurple/protocols/jabber/chat.c:224
 msgid "Invalid Room Name"
 msgstr "Ogiltigt rumsnamn"
 
-#: ../libpurple/protocols/jabber/chat.c:229
 #, c-format
 msgid "%s is not a valid server name"
 msgstr "%s är inte ett giltigt servernamn"
 
-#: ../libpurple/protocols/jabber/chat.c:230
-#: ../libpurple/protocols/jabber/chat.c:231
 msgid "Invalid Server Name"
 msgstr "Ogiltigt servernamn"
 
-#: ../libpurple/protocols/jabber/chat.c:235
 #, c-format
 msgid "%s is not a valid room handle"
 msgstr "%s är inte en giltig rumstitel"
 
-#: ../libpurple/protocols/jabber/chat.c:236
-#: ../libpurple/protocols/jabber/chat.c:237
 msgid "Invalid Room Handle"
 msgstr "Ogiltig rumstitel"
 
-#: ../libpurple/protocols/jabber/chat.c:396
 msgid "Configuration error"
 msgstr "Anslutningsfel"
 
-#: ../libpurple/protocols/jabber/chat.c:405
-#: ../libpurple/protocols/jabber/chat.c:548
 msgid "Unable to configure"
 msgstr "Kan inte konfigurera"
 
-#: ../libpurple/protocols/jabber/chat.c:420
 msgid "Room Configuration Error"
 msgstr "Rumkonfigurationsfel"
 
-#: ../libpurple/protocols/jabber/chat.c:421
 msgid "This room is not capable of being configured"
 msgstr "Det här rummet kan inte konfigureras"
 
-#: ../libpurple/protocols/jabber/chat.c:470
-#: ../libpurple/protocols/jabber/chat.c:539
 msgid "Registration error"
 msgstr "Registreringsfel"
 
-#: ../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?
-#: ../libpurple/protocols/jabber/chat.c:678
-#: ../libpurple/protocols/jabber/chat.c:689
-#: ../libpurple/protocols/silc/ops.c:1460
-#: ../libpurple/protocols/silc10/ops.c:1451
 msgid "Error retrieving room list"
-msgstr "Fel vid hämtning av rumlistan"
-
-#: ../libpurple/protocols/jabber/chat.c:737
+msgstr "Fel vid hämtning av rumslistan"
+
 msgid "Invalid Server"
 msgstr "Ogiltig server"
 
-#: ../libpurple/protocols/jabber/chat.c:781
 msgid "Enter a Conference Server"
 msgstr "Ange en konferensserver"
 
-#: ../libpurple/protocols/jabber/chat.c:782
 msgid "Select a conference server to query"
 msgstr "Välj en konferensserver att fråga"
 
-#: ../libpurple/protocols/jabber/chat.c:785
 msgid "Find Rooms"
 msgstr "Sök rum"
 
-#: ../libpurple/protocols/jabber/jabber.c:92
-msgid "Error initializing session"
-msgstr "Fel vid initiering av session"
-
-#: ../libpurple/protocols/jabber/jabber.c:145
 msgid "You require encryption, but it is not available on this server."
 msgstr "Du kräver cryptering, men server stödjer det inte."
 
-#: ../libpurple/protocols/jabber/jabber.c:259
-#: ../libpurple/protocols/jabber/jabber.c:312
-#: ../libpurple/protocols/jabber/jabber.c:340
 msgid "Write error"
 msgstr "Skrivfel"
 
-#: ../libpurple/protocols/jabber/jabber.c:408
-#: ../libpurple/protocols/jabber/jabber.c:445
 msgid "Read Error"
 msgstr "Läsfel"
 
-#: ../libpurple/protocols/jabber/jabber.c:482
-#: ../libpurple/protocols/oscar/flap_connection.c:396
-#: ../libpurple/protocols/yahoo/yahoo.c:2560
-#: ../libpurple/protocols/yahoo/yahoo.c:2592
 #, c-format
 msgid ""
 "Could not establish a connection with the server:\n"
@@ -5691,656 +3816,440 @@
 "Kunde inte skapa en anslutning med servern:\n"
 "%s"
 
-#: ../libpurple/protocols/jabber/jabber.c:529
 msgid "Unable to create socket"
 msgstr "Kan inte skapa socket"
 
-#: ../libpurple/protocols/jabber/jabber.c:575
-#: ../libpurple/protocols/jabber/jabber.c:1063
 msgid "Invalid XMPP ID"
 msgstr "Ogiltigt XMPP ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:580
 msgid "Invalid XMPP ID. Domain must be set."
 msgstr "Ogiltigt XMPP IP. Domän måste anges."
 
-#: ../libpurple/protocols/jabber/jabber.c:656
 #, c-format
 msgid "Registration of %s@%s successful"
 msgstr "Registrering av %s@%s lyckades"
 
-#: ../libpurple/protocols/jabber/jabber.c:662
 #, c-format
 msgid "Registration to %s successful"
 msgstr "Registrering till %s lyckades"
 
-#: ../libpurple/protocols/jabber/jabber.c:664
-#: ../libpurple/protocols/jabber/jabber.c:665
 msgid "Registration Successful"
 msgstr "Registreringen lyckades"
 
-#: ../libpurple/protocols/jabber/jabber.c:673
-#: ../libpurple/protocols/jabber/jabber.c:674
 msgid "Registration Failed"
 msgstr "Registreringen misslyckades"
 
-#: ../libpurple/protocols/jabber/jabber.c:692
 #, c-format
 msgid "Registration from %s successfully removed"
 msgstr "Registrering från %s togs bort"
 
-#: ../libpurple/protocols/jabber/jabber.c:694
-#: ../libpurple/protocols/jabber/jabber.c:695
 msgid "Unregistration Successful"
 msgstr "Avregistreringen lyckades"
 
-#: ../libpurple/protocols/jabber/jabber.c:703
-#: ../libpurple/protocols/jabber/jabber.c:704
 msgid "Unregistration Failed"
 msgstr "Avregistreringen misslyckades"
 
-#: ../libpurple/protocols/jabber/jabber.c:864
-#: ../libpurple/protocols/jabber/jabber.c:865
 msgid "Already Registered"
 msgstr "Redan registrerad"
 
-#: ../libpurple/protocols/jabber/jabber.c:962
-#: ../libpurple/protocols/oscar/oscar.c:3805
-#: ../libpurple/protocols/oscar/oscar.c:3818
 msgid "State"
 msgstr "Delstat"
 
-#: ../libpurple/protocols/jabber/jabber.c:967
 msgid "Postal code"
 msgstr "Postnummer"
 
-#: ../libpurple/protocols/jabber/jabber.c:972
-#: ../libpurple/protocols/silc/ops.c:1035
-#: ../libpurple/protocols/silc/silc.c:903
-#: ../libpurple/protocols/silc/util.c:561
-#: ../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:982
 msgid "Date"
 msgstr "Datum"
 
-#: ../libpurple/protocols/jabber/jabber.c:987
 msgid "Unregister"
 msgstr "Avregistrera"
 
-#: ../libpurple/protocols/jabber/jabber.c:994
-msgid "Please fill out the information below to change your account registration."
+msgid ""
+"Please fill out the information below to change your account registration."
 msgstr "Fyll i informationen nedan för att ändra din kontoregistrering."
 
-#: ../libpurple/protocols/jabber/jabber.c:997
 msgid "Please fill out the information below to register your new account."
 msgstr "Fyll i informationen nedan för att registrera ditt nya konto."
 
-#: ../libpurple/protocols/jabber/jabber.c:1005
-#: ../libpurple/protocols/jabber/jabber.c:1006
 msgid "Register New XMPP Account"
 msgstr "Registrera nytt XMPP-konto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1007
-#: ../libpurple/protocols/jabber/jabber.c:1016
 msgid "Register"
 msgstr "Registrera"
 
-#: ../libpurple/protocols/jabber/jabber.c:1012
 #, c-format
 msgid "Change Account Registration at %s"
 msgstr "Ändra kontoregistrering vid %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1013
 #, c-format
 msgid "Register New Account at %s"
 msgstr "Registrera nytt konto vid %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:1016
 msgid "Change Registration"
 msgstr "Ändra registrering"
 
-#: ../libpurple/protocols/jabber/jabber.c:1120
-#: ../libpurple/protocols/jabber/jabber.c:1121
 msgid "Error unregistering account"
 msgstr "Fel vid avregistrering av konto"
 
-#: ../libpurple/protocols/jabber/jabber.c:1126
-#: ../libpurple/protocols/jabber/jabber.c:1127
 msgid "Account successfully unregistered"
 msgstr "Kontot är problemfritt avregistrerat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1284
 msgid "Initializing Stream"
 msgstr "Initierar flöde"
 
-#: ../libpurple/protocols/jabber/jabber.c:1289
 msgid "Initializing SSL/TLS"
 msgstr "Initierar SSL/TLS"
 
-#: ../libpurple/protocols/jabber/jabber.c:1293
-#: ../libpurple/protocols/msn/session.c:392
 msgid "Authenticating"
 msgstr "Autentiserar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1302
 msgid "Re-initializing Stream"
 msgstr "Återinitierar flöde"
 
-#: ../libpurple/protocols/jabber/jabber.c:1396
-#: ../libpurple/protocols/jabber/jabber.c:1865
-#: ../libpurple/protocols/jabber/jabber.c:1909
-#: ../libpurple/protocols/jabber/jabber.c:1945
-#: ../libpurple/protocols/oscar/oscar.c:826
-#: ../libpurple/protocols/oscar/oscar.c:5657
 msgid "Not Authorized"
 msgstr "Inte auktoriserad"
 
-#: ../libpurple/protocols/jabber/jabber.c:1442
 msgid "Both"
 msgstr "Båda"
 
-#: ../libpurple/protocols/jabber/jabber.c:1444
 msgid "From (To pending)"
 msgstr "Från (till väntande)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1446
 msgid "From"
 msgstr "Från"
 
-#: ../libpurple/protocols/jabber/jabber.c:1449
 msgid "To"
 msgstr "Till"
 
-#: ../libpurple/protocols/jabber/jabber.c:1451
 msgid "None (To pending)"
 msgstr "Ingen (till väntande)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1453
-#: ../pidgin/plugins/gevolution/eds-utils.c:73
-#: ../pidgin/plugins/gevolution/eds-utils.c:86
 msgid "None"
 msgstr "Ingen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1456
 msgid "Subscription"
 msgstr "Prenumeration"
 
-#: ../libpurple/protocols/jabber/jabber.c:1466
-#: ../libpurple/protocols/jabber/jabber.c:1469
-#: ../libpurple/protocols/jabber/jabber.c:1533
-#: ../libpurple/protocols/jabber/jabber.c:1556
-#: ../libpurple/protocols/jabber/jabber.c:1579
-#: ../libpurple/protocols/jabber/jabber.c:1602
-#: ../libpurple/protocols/jabber/jabber.c:1625
-#: ../libpurple/protocols/jabber/usermood.c:184
-#: ../libpurple/protocols/silc/buddy.c:1560
-#: ../libpurple/protocols/silc/ops.c:1212
-#: ../libpurple/protocols/silc10/buddy.c:1560
-#: ../libpurple/protocols/silc10/ops.c:1207
 msgid "Mood"
 msgstr "Humör"
 
-#: ../libpurple/protocols/jabber/jabber.c:1534
-#: ../libpurple/protocols/jabber/jabber.c:1557
-#: ../libpurple/protocols/jabber/jabber.c:1580
-#: ../libpurple/protocols/jabber/jabber.c:1603
-#: ../libpurple/protocols/jabber/jabber.c:1626
+msgid "Current media"
+msgstr "Nuvarande media"
+
 msgid "Mood Text"
 msgstr "Humörstext"
 
-#: ../libpurple/protocols/jabber/jabber.c:1535
-#: ../libpurple/protocols/jabber/jabber.c:1558
-#: ../libpurple/protocols/jabber/jabber.c:1581
-#: ../libpurple/protocols/jabber/jabber.c:1604
-#: ../libpurple/protocols/jabber/jabber.c:1627
+msgid "Allow Buzz"
+msgstr "Tillåt Surr"
+
 msgid "Tune Artist"
 msgstr "Låtartist"
 
-#: ../libpurple/protocols/jabber/jabber.c:1536
-#: ../libpurple/protocols/jabber/jabber.c:1559
-#: ../libpurple/protocols/jabber/jabber.c:1582
-#: ../libpurple/protocols/jabber/jabber.c:1605
-#: ../libpurple/protocols/jabber/jabber.c:1628
 msgid "Tune Title"
 msgstr "Låttitel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1537
-#: ../libpurple/protocols/jabber/jabber.c:1560
-#: ../libpurple/protocols/jabber/jabber.c:1583
-#: ../libpurple/protocols/jabber/jabber.c:1606
-#: ../libpurple/protocols/jabber/jabber.c:1629
 msgid "Tune Album"
 msgstr "Låtalbum"
 
-#: ../libpurple/protocols/jabber/jabber.c:1538
-#: ../libpurple/protocols/jabber/jabber.c:1561
-#: ../libpurple/protocols/jabber/jabber.c:1584
-#: ../libpurple/protocols/jabber/jabber.c:1607
-#: ../libpurple/protocols/jabber/jabber.c:1630
 msgid "Tune Genre"
 msgstr "Låtgenre"
 
-#: ../libpurple/protocols/jabber/jabber.c:1539
-#: ../libpurple/protocols/jabber/jabber.c:1562
-#: ../libpurple/protocols/jabber/jabber.c:1585
-#: ../libpurple/protocols/jabber/jabber.c:1608
-#: ../libpurple/protocols/jabber/jabber.c:1631
 msgid "Tune Comment"
 msgstr "Låtkommentar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1540
-#: ../libpurple/protocols/jabber/jabber.c:1563
-#: ../libpurple/protocols/jabber/jabber.c:1586
-#: ../libpurple/protocols/jabber/jabber.c:1609
-#: ../libpurple/protocols/jabber/jabber.c:1632
 msgid "Tune Track"
 msgstr "Låtspår"
 
-#: ../libpurple/protocols/jabber/jabber.c:1541
-#: ../libpurple/protocols/jabber/jabber.c:1564
-#: ../libpurple/protocols/jabber/jabber.c:1587
-#: ../libpurple/protocols/jabber/jabber.c:1610
-#: ../libpurple/protocols/jabber/jabber.c:1633
 msgid "Tune Time"
 msgstr "Låttid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1542
-#: ../libpurple/protocols/jabber/jabber.c:1565
-#: ../libpurple/protocols/jabber/jabber.c:1588
-#: ../libpurple/protocols/jabber/jabber.c:1611
-#: ../libpurple/protocols/jabber/jabber.c:1634
 msgid "Tune Year"
 msgstr "Låtår"
 
-#: ../libpurple/protocols/jabber/jabber.c:1543
-#: ../libpurple/protocols/jabber/jabber.c:1566
-#: ../libpurple/protocols/jabber/jabber.c:1589
-#: ../libpurple/protocols/jabber/jabber.c:1612
-#: ../libpurple/protocols/jabber/jabber.c:1635
 msgid "Tune URL"
 msgstr "LåtURL"
 
-#: ../libpurple/protocols/jabber/jabber.c:1545
-#: ../libpurple/protocols/jabber/jabber.c:1568
-#: ../libpurple/protocols/jabber/jabber.c:1591
-#: ../libpurple/protocols/jabber/jabber.c:1614
-#: ../libpurple/protocols/jabber/jabber.c:1637
-msgid "Allow Buzz"
-msgstr "Tillåt Surr"
-
-#: ../libpurple/protocols/jabber/jabber.c:1665
 msgid "Password Changed"
 msgstr "Lösenordet är ändrat"
 
-#: ../libpurple/protocols/jabber/jabber.c:1666
 msgid "Your password has been changed."
 msgstr "Ditt lösenord har ändrats."
 
-#: ../libpurple/protocols/jabber/jabber.c:1670
-#: ../libpurple/protocols/jabber/jabber.c:1671
 msgid "Error changing password"
 msgstr "Fel vid byte av lösenord"
 
-#: ../libpurple/protocols/jabber/jabber.c:1728
 msgid "Password (again)"
 msgstr "Lösenord (igen)"
 
-#: ../libpurple/protocols/jabber/jabber.c:1734
-#: ../libpurple/protocols/jabber/jabber.c:1735
 msgid "Change XMPP Password"
 msgstr "Byt XMPP lösenord"
 
-#: ../libpurple/protocols/jabber/jabber.c:1735
 msgid "Please enter your new password"
 msgstr "Ange ditt nya lösenord"
 
-#: ../libpurple/protocols/jabber/jabber.c:1749
-#: ../libpurple/protocols/oscar/oscar.c:6443
-#: ../libpurple/protocols/silc/silc.c:1224
-#: ../libpurple/protocols/silc10/silc.c:1004
 msgid "Set User Info..."
 msgstr "Ändra användarinfo..."
 
 #. if (js->protocol_options & CHANGE_PASSWORD) {
-#: ../libpurple/protocols/jabber/jabber.c:1754
-#: ../libpurple/protocols/oscar/oscar.c:6454
-#: ../libpurple/protocols/silc/silc.c:1220
-#: ../libpurple/protocols/silc10/silc.c:1000
 msgid "Change Password..."
 msgstr "Byt lösenor..."
 
 #. }
-#: ../libpurple/protocols/jabber/jabber.c:1759
 msgid "Search for Users..."
 msgstr "Sök efter användare..."
 
-#: ../libpurple/protocols/jabber/jabber.c:1845
 msgid "Bad Request"
 msgstr "Felaktig förfrågan"
 
-#: ../libpurple/protocols/jabber/jabber.c:1847
 msgid "Conflict"
 msgstr "Konflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1849
 msgid "Feature Not Implemented"
 msgstr "Funktionen är inte implementerad"
 
-#: ../libpurple/protocols/jabber/jabber.c:1851
 msgid "Forbidden"
 msgstr "Förbjuden"
 
-#: ../libpurple/protocols/jabber/jabber.c:1853
 msgid "Gone"
 msgstr "Borta"
 
-#: ../libpurple/protocols/jabber/jabber.c:1855
-#: ../libpurple/protocols/jabber/jabber.c:1935
 msgid "Internal Server Error"
 msgstr "Internt serverfel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1857
 msgid "Item Not Found"
 msgstr "Föremålet hittades inte"
 
-#: ../libpurple/protocols/jabber/jabber.c:1859
 msgid "Malformed XMPP ID"
 msgstr "Felformaterat XMPP-ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1861
 msgid "Not Acceptable"
 msgstr "Ej Acceptabel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1863
 msgid "Not Allowed"
 msgstr "Ej tillåten"
 
-#: ../libpurple/protocols/jabber/jabber.c:1867
 msgid "Payment Required"
 msgstr "Betalning krävs"
 
-#: ../libpurple/protocols/jabber/jabber.c:1869
 msgid "Recipient Unavailable"
 msgstr "Mottagaren ej tillgänglig"
 
-#: ../libpurple/protocols/jabber/jabber.c:1873
 msgid "Registration Required"
 msgstr "Registrering krävs"
 
-#: ../libpurple/protocols/jabber/jabber.c:1875
 msgid "Remote Server Not Found"
 msgstr "Fjärrserver hittades inte"
 
-#: ../libpurple/protocols/jabber/jabber.c:1877
 msgid "Remote Server Timeout"
 msgstr "Väntetiden för fjärrservern är slut"
 
-#: ../libpurple/protocols/jabber/jabber.c:1879
 msgid "Server Overloaded"
 msgstr "Servern är överlastad"
 
-#: ../libpurple/protocols/jabber/jabber.c:1881
 msgid "Service Unavailable"
 msgstr "Tjänsten är ej tillgänglig"
 
-#: ../libpurple/protocols/jabber/jabber.c:1883
 msgid "Subscription Required"
 msgstr "Prenumeration krävs"
 
-#: ../libpurple/protocols/jabber/jabber.c:1885
 msgid "Unexpected Request"
 msgstr "Oväntad begäran"
 
-#: ../libpurple/protocols/jabber/jabber.c:1892
 msgid "Authorization Aborted"
 msgstr "Auktorisering avbruten"
 
-#: ../libpurple/protocols/jabber/jabber.c:1894
 msgid "Incorrect encoding in authorization"
 msgstr "Inkorrekt kodning i auktoriseringen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1897
 msgid "Invalid authzid"
 msgstr "Ogiltigt authzid"
 
-#: ../libpurple/protocols/jabber/jabber.c:1900
 msgid "Invalid Authorization Mechanism"
 msgstr "Ogiltigt auktoriseringsmekanism"
 
-#: ../libpurple/protocols/jabber/jabber.c:1903
 msgid "Authorization mechanism too weak"
 msgstr "Auktoriseringsmekanism för svag"
 
-#: ../libpurple/protocols/jabber/jabber.c:1911
 msgid "Temporary Authentication Failure"
 msgstr "Tillfälligt Autentiseringsfel"
 
-#: ../libpurple/protocols/jabber/jabber.c:1914
 msgid "Authentication Failure"
 msgstr "Autentiseringen misslyckades"
 
-#: ../libpurple/protocols/jabber/jabber.c:1920
 msgid "Bad Format"
 msgstr "Felaktigt format"
 
-#: ../libpurple/protocols/jabber/jabber.c:1922
 msgid "Bad Namespace Prefix"
 msgstr "Felaktigt namnrymdsprefix"
 
-#: ../libpurple/protocols/jabber/jabber.c:1925
 msgid "Resource Conflict"
 msgstr "Resurskonflikt"
 
-#: ../libpurple/protocols/jabber/jabber.c:1927
-#: ../libpurple/protocols/silc/silc.c:344
-#: ../libpurple/protocols/silc10/ops.c:1720
 msgid "Connection Timeout"
 msgstr "Anslutningen överskred en tidsgräns och tappades"
 
-#: ../libpurple/protocols/jabber/jabber.c:1929
 msgid "Host Gone"
 msgstr "Värden försvann"
 
-#: ../libpurple/protocols/jabber/jabber.c:1931
 msgid "Host Unknown"
 msgstr "Okänd värd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1933
 msgid "Improper Addressing"
 msgstr "Olämplig adressering"
 
-#: ../libpurple/protocols/jabber/jabber.c:1937
 msgid "Invalid ID"
 msgstr "Ogiltigt ID"
 
-#: ../libpurple/protocols/jabber/jabber.c:1939
 msgid "Invalid Namespace"
 msgstr "Ogiltig namnrymd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1941
 msgid "Invalid XML"
 msgstr "Ogiltig XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1943
 msgid "Non-matching Hosts"
 msgstr "Ej överensstämmande värdar"
 
-#: ../libpurple/protocols/jabber/jabber.c:1947
 msgid "Policy Violation"
 msgstr "Policyöverträdelse"
 
-#: ../libpurple/protocols/jabber/jabber.c:1949
 msgid "Remote Connection Failed"
 msgstr "Fjärranslutning misslyckades"
 
-#: ../libpurple/protocols/jabber/jabber.c:1951
 msgid "Resource Constraint"
 msgstr "Resursbegränsning"
 
-#: ../libpurple/protocols/jabber/jabber.c:1953
 msgid "Restricted XML"
 msgstr "Begränsad XML"
 
-#: ../libpurple/protocols/jabber/jabber.c:1955
 msgid "See Other Host"
 msgstr "Se anna värd"
 
-#: ../libpurple/protocols/jabber/jabber.c:1957
 msgid "System Shutdown"
 msgstr "Systemet stängs ner"
 
-#: ../libpurple/protocols/jabber/jabber.c:1959
 msgid "Undefined Condition"
 msgstr "Odefinierade villkor"
 
-#: ../libpurple/protocols/jabber/jabber.c:1961
 msgid "Unsupported Encoding"
 msgstr "Stödjer ej kodningen"
 
-#: ../libpurple/protocols/jabber/jabber.c:1963
 msgid "Unsupported Stanza Type"
 msgstr "Ej stöd stroftyp"
 
-#: ../libpurple/protocols/jabber/jabber.c:1965
 msgid "Unsupported Version"
 msgstr "Ej stöd version"
 
-#: ../libpurple/protocols/jabber/jabber.c:1967
 msgid "XML Not Well Formed"
 msgstr "XML:en är inte väl utformad"
 
-#: ../libpurple/protocols/jabber/jabber.c:1969
 msgid "Stream Error"
 msgstr "Fel i ström"
 
-#: ../libpurple/protocols/jabber/jabber.c:2052
 #, c-format
 msgid "Unable to ban user %s"
 msgstr "Kan inte banna användaren %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2072
 #, c-format
 msgid "Unknown affiliation: \"%s\""
 msgstr "Okänd koppling: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2077
 #, c-format
 msgid "Unable to affiliate user %s as \"%s\""
 msgstr "Kan inte koppla användaren %s till \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2096
 #, c-format
 msgid "Unknown role: \"%s\""
 msgstr "Okänd roll: \"%s\""
 
-#: ../libpurple/protocols/jabber/jabber.c:2101
 #, c-format
 msgid "Unable to set role \"%s\" for user: %s"
 msgstr "Kan inte ange roll \"%s\" för användare: %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2154
 #, c-format
 msgid "Unable to kick user %s"
 msgstr "Kan inte sparka ut användaren %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2185
 #, c-format
 msgid "Unable to ping user %s"
 msgstr "Kan inte pinga användaren %s"
 
-#: ../libpurple/protocols/jabber/jabber.c:2203
-#: ../libpurple/protocols/jabber/jabber.c:2214
 #, c-format
 msgid "Unable to buzz, because there is nothing known about user %s."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2209
+msgstr "Kunde inte surra eftersom det inte finns något känt om användaren %s."
+
 #, c-format
 msgid "Unable to buzz, because user %s might be offline."
-msgstr ""
-
-#: ../libpurple/protocols/jabber/jabber.c:2240
+msgstr "Kunde inte surra eftersom användaren %s kanske är frånkopplad."
+
 #, c-format
 msgid "Unable to buzz, because the user %s does not support it."
 msgstr "Kan inte surra, användaren %s stödjer inte det."
 
-#: ../libpurple/protocols/jabber/jabber.c:2262
-#: ../libpurple/protocols/yahoo/yahoo.c:4121
 msgid "Buzz"
 msgstr "Surr"
 
-#: ../libpurple/protocols/jabber/jabber.c:2263
-#: ../libpurple/protocols/jabber/message.c:307
-#: ../libpurple/protocols/yahoo/yahoo.c:4122
 #, c-format
 msgid "%s has buzzed you!"
 msgstr "%s har surrat dig!"
 
-#: ../libpurple/protocols/jabber/jabber.c:2264
-#: ../libpurple/protocols/yahoo/yahoo.c:4123
 #, c-format
 msgid "Buzzing %s..."
 msgstr "Surrar %s..."
 
-#: ../libpurple/protocols/jabber/jabber.c:2296
 msgid "config:  Configure a chat room."
 msgstr "config: Konfigurera ett chattrum."
 
-#: ../libpurple/protocols/jabber/jabber.c:2300
 msgid "configure:  Configure a chat room."
 msgstr "configure: Konfigurera ett chattrum."
 
-#: ../libpurple/protocols/jabber/jabber.c:2309
 msgid "part [room]:  Leave the room."
 msgstr "part [rum]: lämna rummet."
 
-#: ../libpurple/protocols/jabber/jabber.c:2314
 msgid "register:  Register with a chat room."
 msgstr "register: Registrera i ett chattrum."
 
-#: ../libpurple/protocols/jabber/jabber.c:2320
 msgid "topic [new topic]:  View or change the topic."
 msgstr "topic [nytt ämne]:  Visa eller ändra ämne."
 
-#: ../libpurple/protocols/jabber/jabber.c:2326
 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."
 
-#: ../libpurple/protocols/jabber/jabber.c:2332
-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:2338
-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:2344
+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."
+
+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."
+
 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."
-
-#: ../libpurple/protocols/jabber/jabber.c:2350
+msgstr ""
+"invite &lt;användare&gt; [meddelande]:  Bjud in användaren till rummet."
+
 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."
 
-#: ../libpurple/protocols/jabber/jabber.c:2356
 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."
 
-#: ../libpurple/protocols/jabber/jabber.c:2361
-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:2367
+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."
+
 msgid "ping &lt;jid&gt;:\tPing a user/component/server."
 msgstr "ping &lt;jid&gt;:\tPinga en användare/komponent/server."
 
-#: ../libpurple/protocols/jabber/jabber.c:2372
-#: ../libpurple/protocols/yahoo/yahoo.c:4147
 msgid "buzz: Buzz a user to get their attention"
 msgstr "buzz: Stör en användare för att få dennes uppmärksamhet"
 
@@ -6354,890 +4263,656 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/jabber/libxmpp.c:170
-#: ../libpurple/protocols/jabber/libxmpp.c:172
 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:202
-#: ../pidgin/gtkaccount.c:509
 msgid "Domain"
 msgstr "Domän"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:210
 msgid "Require SSL/TLS"
 msgstr "Kräver SSL/TLS"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:214
 msgid "Force old (port 5223) SSL"
 msgstr "Tvinga fram användning av gammal (port 5223) SSL"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:219
 msgid "Allow plaintext auth over unencrypted streams"
 msgstr "Tillåt klartextautentisering över okrypterad ström"
 
-#: ../libpurple/protocols/jabber/libxmpp.c:224
-#: ../libpurple/protocols/myspace/myspace.c:3283
-#: ../libpurple/protocols/simple/simple.c:1924
 msgid "Connect port"
 msgstr "Anslutningsport"
 
 #. TODO: default to automatically try different ports. Make the user be
 #. * able to set the first port to try (like LastConnectedPort in Windows client).
 #. Account options
-#: ../libpurple/protocols/jabber/libxmpp.c:228
-#: ../libpurple/protocols/myspace/myspace.c:3280
-#: ../libpurple/protocols/silc/silc.c:2045
-#: ../libpurple/protocols/silc10/silc.c:1857
-#: ../pidgin/gtkaccount.c:840
 msgid "Connect server"
 msgstr "Anslutningsserver"
 
-#: ../libpurple/protocols/jabber/message.c:106
 #, c-format
 msgid "%s has left the conversation."
 msgstr "%s har lämnat konversationen."
 
-#: ../libpurple/protocols/jabber/message.c:161
 #, c-format
 msgid "Message from %s"
 msgstr "Meddelande från %s"
 
-#: ../libpurple/protocols/jabber/message.c:225
 #, c-format
 msgid "%s has set the topic to: %s"
 msgstr "%s har satt ämnet till: %s"
 
-#: ../libpurple/protocols/jabber/message.c:227
 #, c-format
 msgid "The topic is: %s"
 msgstr "Ämnet är: %s"
 
-#: ../libpurple/protocols/jabber/message.c:275
 #, c-format
 msgid "Message delivery to %s failed: %s"
 msgstr "Leverans av meddelande till %s misslyckades: %s"
 
-#: ../libpurple/protocols/jabber/message.c:278
 msgid "XMPP Message Error"
 msgstr "XMPP meddelandefel"
 
-#: ../libpurple/protocols/jabber/message.c:407
 #, c-format
 msgid " (Code %s)"
 msgstr " (Kod %s)"
 
-#: ../libpurple/protocols/jabber/parser.c:196
 msgid "XML Parse error"
 msgstr "XML-tolkningsfel"
 
-#: ../libpurple/protocols/jabber/presence.c:423
 msgid "Unknown Error in presence"
 msgstr "Okänt fel i närvaro"
 
-#: ../libpurple/protocols/jabber/presence.c:504
-#: ../libpurple/protocols/jabber/presence.c:505
 msgid "Create New Room"
 msgstr "Skapa nytt rum"
 
-#: ../libpurple/protocols/jabber/presence.c:506
-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:512
+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?"
+
 msgid "_Configure Room"
 msgstr "_Konfigurera rum"
 
-#: ../libpurple/protocols/jabber/presence.c:513
 msgid "_Accept Defaults"
 msgstr "_Acceptera förval"
 
-#: ../libpurple/protocols/jabber/presence.c:555
 #, c-format
 msgid "Error in chat %s"
 msgstr "Fel i chatt %s"
 
-#: ../libpurple/protocols/jabber/presence.c:559
 #, c-format
 msgid "Error joining chat %s"
 msgstr "Fel vid anslutning till chatt %s"
 
-#: ../libpurple/protocols/jabber/si.c:775
 #, 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"
 
-#: ../libpurple/protocols/jabber/si.c:776
-#: ../libpurple/protocols/jabber/si.c:777
-#: ../libpurple/protocols/jabber/si.c:845
 msgid "File Send Failed"
 msgstr "Filsändning misslyckades"
 
-#: ../libpurple/protocols/jabber/si.c:838
 #, 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:840
 #, 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:842
 #, 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:857
+msgstr ""
+"Kan inte skicka filen till %s, prenumrerar inte på användartillgänglighet"
+
 #, 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:873
 msgid "Select a Resource"
 msgstr "Välj en tillflykt"
 
-#: ../libpurple/protocols/jabber/usermood.c:197
-#: ../libpurple/protocols/jabber/usermood.c:198
 msgid "Edit User Mood"
 msgstr "Redigera användarhumör"
 
-#: ../libpurple/protocols/jabber/usermood.c:199
 msgid "Please select your mood from the list."
 msgstr "Ange ditt humör från listan."
 
-#: ../libpurple/protocols/jabber/usermood.c:201
-#: ../libpurple/protocols/jabber/usernick.c:78
 msgid "Set"
 msgstr "Ange"
 
-#: ../libpurple/protocols/jabber/usermood.c:209
 msgid "Set Mood..."
 msgstr "Ange humör..."
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Set User Nickname"
 msgstr "Sätt användarsmeknamn"
 
-#: ../libpurple/protocols/jabber/usernick.c:76
 msgid "Please specify a new nickname for you."
 msgstr "Ange det nya smeknamnet för dig."
 
-#: ../libpurple/protocols/jabber/usernick.c:77
-msgid "This information is visible to all contacts on your contact list, so choose something appropriate."
-msgstr "Denna information är synbar för alla på din kontaktlista, så välj något passande."
-
-#: ../libpurple/protocols/jabber/usernick.c:100
+msgid ""
+"This information is visible to all contacts on your contact list, so choose "
+"something appropriate."
+msgstr ""
+"Denna information är synbar för alla på din kontaktlista, så välj något "
+"passande."
+
 msgid "Set Nickname..."
 msgstr "Ange Smeknamn..."
 
-#: ../libpurple/protocols/jabber/xdata.c:378
 msgid "Actions"
 msgstr "Handlingar"
 
-#: ../libpurple/protocols/jabber/xdata.c:380
 msgid "Select an action"
 msgstr "Välj en handling"
 
-#: ../libpurple/protocols/msn/contact.c:163
-msgid "Unable to connect to contact server"
-msgstr "Kan inte ansluta till kontaktservern"
-
-#: ../libpurple/protocols/msn/contact.c:923
 msgid "Unable to retrieve MSN Address Book"
 msgstr "Kunde inte hämta MSN-adressbok"
 
-#: ../libpurple/protocols/msn/dialog.c:118
 #, c-format
 msgid "Buddy list synchronization issue in %s (%s)"
 msgstr "Problem med synkroniseringen av kompislistan i %s (%s)"
 
-#: ../libpurple/protocols/msn/dialog.c:124
-#, 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:132
-#, 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
+#, 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?"
+
+#, 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?"
+
 #, c-format
 msgid "Unable to parse message"
 msgstr "Kan inte avkoda meddelandet"
 
-#: ../libpurple/protocols/msn/error.c:41
 #, c-format
 msgid "Syntax Error (probably a client bug)"
 msgstr "Syntaxfel (antagligen ett klient bug)"
 
-#: ../libpurple/protocols/msn/error.c:46
 #, c-format
 msgid "Invalid e-mail address"
 msgstr "Ogiltig e-postadress"
 
-#: ../libpurple/protocols/msn/error.c:49
 #, c-format
 msgid "User does not exist"
 msgstr "Användaren finns inte"
 
-#: ../libpurple/protocols/msn/error.c:53
 #, c-format
 msgid "Fully qualified domain name missing"
 msgstr "Fullständigt kvalificerat domännamn saknas"
 
-#: ../libpurple/protocols/msn/error.c:56
 #, c-format
 msgid "Already logged in"
 msgstr "Redan inloggad"
 
-#: ../libpurple/protocols/msn/error.c:59
 #, c-format
 msgid "Invalid screen name"
 msgstr "Ogiltigt skärmnamn"
 
-#: ../libpurple/protocols/msn/error.c:62
 #, c-format
 msgid "Invalid friendly name"
 msgstr "Ogiltigt smeknamn"
 
 # Osäker (lista fullständig?)
-#: ../libpurple/protocols/msn/error.c:65
+# Eller handlar det om att ett protokoll inte klarar hantera större lista (och därmed är full)?
 #, c-format
 msgid "List full"
 msgstr "Listan är full"
 
-#: ../libpurple/protocols/msn/error.c:68
 #, c-format
 msgid "Already there"
 msgstr "Finns redan"
 
-#: ../libpurple/protocols/msn/error.c:72
 #, c-format
 msgid "Not on list"
 msgstr "Finns inte i listan"
 
-#: ../libpurple/protocols/msn/error.c:75
-#: ../libpurple/protocols/zephyr/zephyr.c:756
 #, c-format
 msgid "User is offline"
 msgstr "Användaren är frånkopplad"
 
-#: ../libpurple/protocols/msn/error.c:78
 #, c-format
 msgid "Already in the mode"
 msgstr "Redan i det läget"
 
-#: ../libpurple/protocols/msn/error.c:82
 #, c-format
 msgid "Already in opposite list"
 msgstr "Finns redan i motpartens lista"
 
-#: ../libpurple/protocols/msn/error.c:86
 #, c-format
 msgid "Too many groups"
 msgstr "För många grupper"
 
-#: ../libpurple/protocols/msn/error.c:89
 #, c-format
 msgid "Invalid group"
 msgstr "Ogiltig grupp"
 
-#: ../libpurple/protocols/msn/error.c:92
 #, c-format
 msgid "User not in group"
 msgstr "Användaren finns inte i gruppen"
 
-#: ../libpurple/protocols/msn/error.c:95
 #, c-format
 msgid "Group name too long"
 msgstr "Gruppnamnet är för långt"
 
-#: ../libpurple/protocols/msn/error.c:98
 #, c-format
 msgid "Cannot remove group zero"
 msgstr "Kunde inte ta bort grupp noll"
 
-#: ../libpurple/protocols/msn/error.c:103
 #, c-format
 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"
 
-#: ../libpurple/protocols/msn/error.c:107
 #, c-format
 msgid "Switchboard failed"
 msgstr "Växeln misslyckades"
 
-#: ../libpurple/protocols/msn/error.c:111
 #, c-format
 msgid "Notify transfer failed"
 msgstr "Rapportera misslyckade överföringar"
 
-#: ../libpurple/protocols/msn/error.c:116
 #, c-format
 msgid "Required fields missing"
 msgstr "Nödvändiga fält saknas"
 
-#: ../libpurple/protocols/msn/error.c:120
 #, c-format
 msgid "Too many hits to a FND"
 msgstr "För många träffar på ett FND"
 
-#: ../libpurple/protocols/msn/error.c:124
-#: ../libpurple/protocols/oscar/oscar.c:120
 #, c-format
 msgid "Not logged in"
 msgstr "Inte inloggad"
 
-#: ../libpurple/protocols/msn/error.c:128
 #, c-format
 msgid "Service temporarily unavailable"
 msgstr "Tjänst är för tillfället otillgänglig"
 
-#: ../libpurple/protocols/msn/error.c:131
 #, c-format
 msgid "Database server error"
 msgstr "Databasserverfel"
 
-#: ../libpurple/protocols/msn/error.c:135
 #, c-format
 msgid "Command disabled"
 msgstr "Kommandot avstängt"
 
-#: ../libpurple/protocols/msn/error.c:139
 #, c-format
 msgid "File operation error"
 msgstr "Filoperationsfel"
 
-#: ../libpurple/protocols/msn/error.c:143
 #, c-format
 msgid "Memory allocation error"
 msgstr "Minnesallokeringsfel"
 
-#: ../libpurple/protocols/msn/error.c:147
 #, c-format
 msgid "Wrong CHL value sent to server"
 msgstr "Fel CHL-värde skickat till servern"
 
-#: ../libpurple/protocols/msn/error.c:152
 #, c-format
 msgid "Server busy"
 msgstr "Servern upptagen"
 
-#: ../libpurple/protocols/msn/error.c:155
-#: ../libpurple/protocols/msn/error.c:170
-#: ../libpurple/protocols/msn/error.c:230
 #, c-format
 msgid "Server unavailable"
 msgstr "Servern är ej tillgänglig"
 
 # Osäker
-#: ../libpurple/protocols/msn/error.c:158
 #, c-format
 msgid "Peer notification server down"
 msgstr "Motpartsnotifieringsservern är nere"
 
-#: ../libpurple/protocols/msn/error.c:162
 #, c-format
 msgid "Database connect error"
 msgstr "Databasanslutningsfel"
 
-#: ../libpurple/protocols/msn/error.c:167
 #, c-format
 msgid "Server is going down (abandon ship)"
 msgstr "Servern är påväg ner (överge skeppet)"
 
-#: ../libpurple/protocols/msn/error.c:174
 #, c-format
 msgid "Error creating connection"
 msgstr "Fel vid skapandet av anslutning"
 
-#: ../libpurple/protocols/msn/error.c:179
 #, c-format
 msgid "CVR parameters are either unknown or not allowed"
 msgstr "CVR-parametrar är antingen okända eller inte tillåtna"
 
-#: ../libpurple/protocols/msn/error.c:183
 #, c-format
 msgid "Unable to write"
 msgstr "Kan inte skriva"
 
-#: ../libpurple/protocols/msn/error.c:186
 #, c-format
 msgid "Session overload"
 msgstr "Sessionsöverlast"
 
-#: ../libpurple/protocols/msn/error.c:190
 #, c-format
 msgid "User is too active"
 msgstr "Användaren är för aktiv"
 
-#: ../libpurple/protocols/msn/error.c:193
 #, c-format
 msgid "Too many sessions"
 msgstr "För många sessioner"
 
-#: ../libpurple/protocols/msn/error.c:196
 #, c-format
 msgid "Passport not verified"
 msgstr "Passkonto inte verifierat"
 
-#: ../libpurple/protocols/msn/error.c:199
 #, c-format
 msgid "Bad friend file"
 msgstr "Fel på friend-fil"
 
-#: ../libpurple/protocols/msn/error.c:203
 #, c-format
 msgid "Not expected"
 msgstr "Ej väntat"
 
-#: ../libpurple/protocols/msn/error.c:209
 #, c-format
 msgid "Friendly name changes too rapidly"
 msgstr "Smeknamn ändras för ofta"
 
-#: ../libpurple/protocols/msn/error.c:218
 #, c-format
 msgid "Server too busy"
 msgstr "Servern är för upptagen"
 
-#: ../libpurple/protocols/msn/error.c:222
-#: ../libpurple/protocols/oscar/oscar.c:1383
-#: ../libpurple/protocols/silc/silc.c:333
-#: ../libpurple/protocols/silc10/ops.c:1709
-#: ../libpurple/protocols/toc/toc.c:728
-#: ../libpurple/proxy.c:1393
 #, c-format
 msgid "Authentication failed"
 msgstr "Autentisering misslyckades"
 
-#: ../libpurple/protocols/msn/error.c:225
 #, c-format
 msgid "Not allowed when offline"
 msgstr "Inte tillåtet vid ej ansluten"
 
-#: ../libpurple/protocols/msn/error.c:233
 #, c-format
 msgid "Not accepting new users"
 msgstr "Accepterar inte nya användare"
 
-#: ../libpurple/protocols/msn/error.c:237
 #, c-format
 msgid "Kids Passport without parental consent"
 msgstr "Barn-passport utan förälders medgivande"
 
-#: ../libpurple/protocols/msn/error.c:241
 #, c-format
 msgid "Passport account not yet verified"
 msgstr "Passkonto ännu inte verifierat"
 
-#: ../libpurple/protocols/msn/error.c:244
 #, c-format
 msgid "Bad ticket"
 msgstr "Ogiltig biljett"
 
-#: ../libpurple/protocols/msn/error.c:249
 #, c-format
 msgid "Unknown Error Code %d"
 msgstr "Okänd felkod %d"
 
-#: ../libpurple/protocols/msn/error.c:263
 #, c-format
 msgid "MSN Error: %s\n"
 msgstr "MSN-fel: %s\n"
 
-#: ../libpurple/protocols/msn/msn.c:130
 msgid "Nudge"
 msgstr "Vibba"
 
-#: ../libpurple/protocols/msn/msn.c:131
 #, c-format
 msgid "%s has nudged you!"
 msgstr "%s har vibbat dig!"
 
-#: ../libpurple/protocols/msn/msn.c:132
 #, c-format
 msgid "Nudging %s..."
 msgstr "Vibbar %s..."
 
-#: ../libpurple/protocols/msn/msn.c:174
 msgid "Your new MSN friendly name is too long."
 msgstr "Ditt nya smeknamn för MSN är för långt."
 
-#: ../libpurple/protocols/msn/msn.c:286
 msgid "Set your friendly name."
 msgstr "Ange smeknamn."
 
-#: ../libpurple/protocols/msn/msn.c:287
 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."
 
-#: ../libpurple/protocols/msn/msn.c:305
 msgid "Set your home phone number."
 msgstr "Ange ditt hemtelefonnummer."
 
-#: ../libpurple/protocols/msn/msn.c:322
 msgid "Set your work phone number."
 msgstr "Ange ditt jobbtelefonnummer."
 
-#: ../libpurple/protocols/msn/msn.c:339
 msgid "Set your mobile phone number."
 msgstr "Ange ditt mobiltelefonnummer."
 
-#: ../libpurple/protocols/msn/msn.c:354
 msgid "Allow MSN Mobile pages?"
 msgstr "Tillåt MSN-mobilsökning?"
 
-#: ../libpurple/protocols/msn/msn.c:355
-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:361
+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?"
+
 msgid "Allow"
 msgstr "Tillåt"
 
-#: ../libpurple/protocols/msn/msn.c:362
 msgid "Disallow"
 msgstr "Tillåt ej"
 
-#: ../libpurple/protocols/msn/msn.c:378
 msgid "This Hotmail account may not be active."
 msgstr "Detta Hotmail-konto är kanske inte aktivt."
 
-#: ../libpurple/protocols/msn/msn.c:404
 msgid "Send a mobile message."
 msgstr "Skicka ett mobilmeddelande."
 
-#: ../libpurple/protocols/msn/msn.c:406
 msgid "Page"
 msgstr "Sök"
 
-#: ../libpurple/protocols/msn/msn.c:611
-#: ../libpurple/protocols/msn/msn.c:641
-#: ../libpurple/protocols/msn/msn.c:648
-#: ../libpurple/protocols/msn/msn.c:655
-#: ../libpurple/protocols/msn/msn.c:662
-#: ../libpurple/protocols/msn/msn.c:668
-#: ../libpurple/protocols/msn/msn.c:674
-msgid "Current media"
-msgstr "Nuvarande media"
-
-#: ../libpurple/protocols/msn/msn.c:653
-#: ../libpurple/protocols/msn/state.c:33
-#: ../libpurple/protocols/yahoo/yahoo.c:3079
-#: ../libpurple/protocols/yahoo/yahoo.c:3763
 msgid "Be Right Back"
 msgstr "Strax tillbaka"
 
-#: ../libpurple/protocols/msn/msn.c:660
-#: ../libpurple/protocols/msn/state.c:31
-#: ../libpurple/protocols/novell/novell.c:2827
-#: ../libpurple/protocols/novell/novell.c:2957
-#: ../libpurple/protocols/silc/buddy.c:1483
-#: ../libpurple/protocols/silc/silc.c:56
-#: ../libpurple/protocols/silc10/buddy.c:1483
-#: ../libpurple/protocols/silc10/silc.c:47
-#: ../libpurple/protocols/yahoo/yahoo.c:3081
-#: ../libpurple/protocols/yahoo/yahoo.c:3766
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../libpurple/protocols/msn/msn.c:666
-#: ../libpurple/protocols/yahoo/yahoo.c:3089
-#: ../libpurple/protocols/yahoo/yahoo.c:3778
 msgid "On the Phone"
 msgstr "Pratar i telefon"
 
-#: ../libpurple/protocols/msn/msn.c:672
-#: ../libpurple/protocols/yahoo/yahoo.c:3093
-#: ../libpurple/protocols/yahoo/yahoo.c:3784
 msgid "Out to Lunch"
 msgstr "På lunch"
 
-#: ../libpurple/protocols/msn/msn.c:703
+msgid "Artist"
+msgstr "Artist"
+
+msgid "Album"
+msgstr "Album"
+
 msgid "Set Friendly Name..."
 msgstr "Ange smeknamn..."
 
-#: ../libpurple/protocols/msn/msn.c:708
 msgid "Set Home Phone Number..."
 msgstr "Ange hemtelefonnummer..."
 
-#: ../libpurple/protocols/msn/msn.c:712
 msgid "Set Work Phone Number..."
 msgstr "Ange jobbtelefonnummer..."
 
-#: ../libpurple/protocols/msn/msn.c:716
 msgid "Set Mobile Phone Number..."
 msgstr "Ange mobilnummer..."
 
-#: ../libpurple/protocols/msn/msn.c:722
 msgid "Enable/Disable Mobile Devices..."
 msgstr "Aktivera/Avaktivera mobila enheter..."
 
-#: ../libpurple/protocols/msn/msn.c:727
 msgid "Allow/Disallow Mobile Pages..."
 msgstr "Tillåt/Hindra mobilsökningar..."
 
-#: ../libpurple/protocols/msn/msn.c:738
 msgid "Open Hotmail Inbox"
 msgstr "Öppna Hotmail Inkorg"
 
-#: ../libpurple/protocols/msn/msn.c:762
 msgid "Send to Mobile"
 msgstr "Skicka till mobil"
 
-#: ../libpurple/protocols/msn/msn.c:772
-#: ../libpurple/protocols/novell/novell.c:3413
 msgid "Initiate _Chat"
 msgstr "Starta _chatt"
 
-#: ../libpurple/protocols/msn/msn.c:810
 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:838
+msgstr ""
+"SSL-stöd krävs för att använda MSN. Installera ett SSL-bibliotek som stöds."
+
 msgid "Failed to connect to server."
 msgstr "Kunde inte ansluta till servern."
 
-#: ../libpurple/protocols/msn/msn.c:1626
-#: ../libpurple/protocols/msn/msn.c:1969
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:808
 msgid "Error retrieving profile"
 msgstr "Fel vid hämtninga av profil"
 
-#: ../libpurple/protocols/msn/msn.c:1692
-#: ../pidgin/plugins/convcolors.c:309
-#: ../pidgin/plugins/pidginrc.c:360
 msgid "General"
 msgstr "Allmänt"
 
-#: ../libpurple/protocols/msn/msn.c:1699
-#: ../libpurple/protocols/myspace/user.c:115
-#: ../libpurple/protocols/oscar/oscar.c:3770
-#: ../libpurple/protocols/qq/buddy_info.c:45
-#: ../libpurple/protocols/qq/qq.c:221
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1081
 msgid "Age"
 msgstr "Ålder"
 
-#: ../libpurple/protocols/msn/msn.c:1701
-#: ../libpurple/protocols/qq/buddy_info.c:51
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1096
 msgid "Occupation"
 msgstr "Sysselsättning"
 
-#: ../libpurple/protocols/msn/msn.c:1702
-#: ../libpurple/protocols/myspace/user.c:123
-#: ../libpurple/protocols/novell/novell.c:1480
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1076
-#: ../libpurple/protocols/zephyr/zephyr.c:798
-#: ../libpurple/protocols/zephyr/zephyr.c:1215
 msgid "Location"
 msgstr "Plats"
 
-#: ../libpurple/protocols/msn/msn.c:1707
-#: ../libpurple/protocols/msn/msn.c:1899
-#: ../libpurple/protocols/msn/msn.c:1905
-#: ../libpurple/protocols/msn/msn.c:1912
 msgid "Hobbies and Interests"
 msgstr "Hobbies och intressen"
 
-#: ../libpurple/protocols/msn/msn.c:1713
-#: ../libpurple/protocols/msn/msn.c:1833
-#: ../libpurple/protocols/msn/msn.c:1839
-#: ../libpurple/protocols/msn/msn.c:1846
-#: ../libpurple/protocols/msn/msn.c:1854
-#: ../libpurple/protocols/msn/msn.c:1861
 msgid "A Little About Me"
 msgstr "Lite om mig"
 
-#: ../libpurple/protocols/msn/msn.c:1730
 msgid "Social"
 msgstr "Social"
 
-#: ../libpurple/protocols/msn/msn.c:1732
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1086
 msgid "Marital Status"
 msgstr "Civilstånd"
 
-#: ../libpurple/protocols/msn/msn.c:1733
 msgid "Interests"
 msgstr "Intressen"
 
-#: ../libpurple/protocols/msn/msn.c:1734
 msgid "Pets"
 msgstr "Husdjur"
 
-#: ../libpurple/protocols/msn/msn.c:1735
 msgid "Hometown"
 msgstr "Hemstad"
 
-#: ../libpurple/protocols/msn/msn.c:1736
 msgid "Places Lived"
 msgstr "Tidigare boplatser"
 
-#: ../libpurple/protocols/msn/msn.c:1737
 msgid "Fashion"
 msgstr "Mode"
 
-#: ../libpurple/protocols/msn/msn.c:1738
 msgid "Humor"
 msgstr "Humor"
 
-#: ../libpurple/protocols/msn/msn.c:1739
 msgid "Music"
 msgstr "Musik"
 
-#: ../libpurple/protocols/msn/msn.c:1740
-#: ../libpurple/protocols/msn/msn.c:1921
-#: ../libpurple/protocols/msn/msn.c:1927
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1138
 msgid "Favorite Quote"
 msgstr "Favoritcitat"
 
-#: ../libpurple/protocols/msn/msn.c:1757
 msgid "Contact Info"
 msgstr "Kontaktinformation"
 
 # Osäker
-#: ../libpurple/protocols/msn/msn.c:1758
 msgid "Personal"
 msgstr "Personligt"
 
-#: ../libpurple/protocols/msn/msn.c:1761
 msgid "Significant Other"
 msgstr "Make/Maka"
 
-#: ../libpurple/protocols/msn/msn.c:1762
 msgid "Home Phone"
 msgstr "Hemtelefon"
 
-#: ../libpurple/protocols/msn/msn.c:1763
 msgid "Home Phone 2"
 msgstr "Hemtelefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1764
-#: ../libpurple/protocols/oscar/oscar.c:3808
 msgid "Home Address"
 msgstr "Hemadress"
 
-#: ../libpurple/protocols/msn/msn.c:1765
 msgid "Personal Mobile"
 msgstr "Personlig mobil"
 
-#: ../libpurple/protocols/msn/msn.c:1766
 msgid "Home Fax"
 msgstr "Hemfax"
 
-#: ../libpurple/protocols/msn/msn.c:1767
 msgid "Personal E-Mail"
 msgstr "Personlig E-Post"
 
-#: ../libpurple/protocols/msn/msn.c:1768
 msgid "Personal IM"
 msgstr "Personlig IM"
 
-#: ../libpurple/protocols/msn/msn.c:1770
 msgid "Anniversary"
 msgstr "Högtid"
 
 #. Business
-#: ../libpurple/protocols/msn/msn.c:1786
 msgid "Work"
 msgstr "Arbete"
 
-#: ../libpurple/protocols/msn/msn.c:1788
-#: ../libpurple/protocols/silc/ops.c:1010
-#: ../libpurple/protocols/silc10/ops.c:1044
 msgid "Job Title"
 msgstr "Jobbtitel"
 
-#: ../libpurple/protocols/msn/msn.c:1789
-#: ../libpurple/protocols/oscar/oscar.c:3829
 msgid "Company"
 msgstr "Företag"
 
-#: ../libpurple/protocols/msn/msn.c:1790
-#: ../libpurple/protocols/novell/novell.c:1482
 msgid "Department"
 msgstr "Avdelning"
 
-#: ../libpurple/protocols/msn/msn.c:1791
 msgid "Profession"
 msgstr "Yrke"
 
-#: ../libpurple/protocols/msn/msn.c:1792
 msgid "Work Phone"
 msgstr "Arbetselefon"
 
-#: ../libpurple/protocols/msn/msn.c:1793
 msgid "Work Phone 2"
 msgstr "Arbetselefon 2"
 
-#: ../libpurple/protocols/msn/msn.c:1794
-#: ../libpurple/protocols/oscar/oscar.c:3821
 msgid "Work Address"
 msgstr "Jobbadress"
 
-#: ../libpurple/protocols/msn/msn.c:1795
 msgid "Work Mobile"
 msgstr "Arbetsmobil"
 
-#: ../libpurple/protocols/msn/msn.c:1796
 msgid "Work Pager"
 msgstr "Arbetssökare"
 
-#: ../libpurple/protocols/msn/msn.c:1797
 msgid "Work Fax"
 msgstr "Arbete Fax"
 
-#: ../libpurple/protocols/msn/msn.c:1798
 msgid "Work E-Mail"
 msgstr "Arbete E-post"
 
-#: ../libpurple/protocols/msn/msn.c:1799
 msgid "Work IM"
 msgstr "Arbete IM"
 
-#: ../libpurple/protocols/msn/msn.c:1800
 msgid "Start Date"
 msgstr "Start datum"
 
-#: ../libpurple/protocols/msn/msn.c:1870
-#: ../libpurple/protocols/msn/msn.c:1876
-#: ../libpurple/protocols/msn/msn.c:1883
-#: ../libpurple/protocols/msn/msn.c:1890
 msgid "Favorite Things"
 msgstr "Favoritsaker"
 
-#: ../libpurple/protocols/msn/msn.c:1935
 msgid "Last Updated"
 msgstr "Senast uppdaterad"
 
-#: ../libpurple/protocols/msn/msn.c:1946
-#: ../libpurple/protocols/qq/buddy_info.c:60
-#: ../libpurple/protocols/silc/ops.c:1026
-#: ../libpurple/protocols/silc10/ops.c:1060
 msgid "Homepage"
 msgstr "Hemsida"
 
-#: ../libpurple/protocols/msn/msn.c:1970
 msgid "The user has not created a public profile."
 msgstr "Användaren har inte skapat en publik profil."
 
-#: ../libpurple/protocols/msn/msn.c:1971
-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:1975
-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:1983
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1240
+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."
+
+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."
+
 msgid "Profile URL"
 msgstr "Profil-URL"
 
@@ -7251,154 +4926,123 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/msn/msn.c:2270
-#: ../libpurple/protocols/msn/msn.c:2272
 msgid "Windows Live Messenger Protocol Plugin"
 msgstr "Windows Live Messenger Protokoll-insticksmodul"
 
-#: ../libpurple/protocols/msn/msn.c:2307
 msgid "Use HTTP Method"
 msgstr "Använd HTTP-metod"
 
-#: ../libpurple/protocols/msn/msn.c:2312
 msgid "HTTP Method Server"
 msgstr "HTTP-metod server"
 
-#: ../libpurple/protocols/msn/msn.c:2317
 msgid "Show custom smileys"
 msgstr "Visa egna smileys"
 
-#: ../libpurple/protocols/msn/msn.c:2325
 msgid "nudge: nudge a user to get their attention"
 msgstr "nudge: Knuffa till en kontakt för att få dennes uppmärksamhet"
 
-#: ../libpurple/protocols/msn/nexus.c:137
 msgid "Windows Live ID authentication:Unable to connect"
 msgstr "Windows Live ID autentisering: Kunde inte ansluta"
 
-#: ../libpurple/protocols/msn/nexus.c:272
+#. we must have failed!
+msgid ""
+"Windows Live ID authentication: cannot find authenticate token in server "
+"response"
+msgstr ""
+"Windows Live ID autentisering: Kunde inte finns autentiseringsmarkös i "
+"serverns svar"
+
 msgid "Windows Live ID authentication Failed"
 msgstr "Windows Live ID autentisering misslyckades"
 
-#: ../libpurple/protocols/msn/notification.c:185
 #, c-format
 msgid "%s is not a valid group."
 msgstr "%s är inte en giltig grupp."
 
-#: ../libpurple/protocols/msn/notification.c:191
-#: ../libpurple/protocols/msn/notification.c:931
-#: ../libpurple/protocols/msn/session.c:371
 msgid "Unknown error."
 msgstr "Okänt fel."
 
-#: ../libpurple/protocols/msn/notification.c:194
 #, c-format
 msgid "%s on %s (%s)"
 msgstr "%s på %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:509
 #, c-format
 msgid "%s just sent you a Nudge!"
 msgstr "%s skickade just en vibb!"
 
-#: ../libpurple/protocols/msn/notification.c:836
 #, c-format
 msgid "Unknown error (%d)"
 msgstr "Okänt fel (%d)"
 
-#: ../libpurple/protocols/msn/notification.c:837
-#: ../libpurple/protocols/sametime/sametime.c:4425
 msgid "Unable to add user"
 msgstr "Kan inte lägga till användaren"
 
-#: ../libpurple/protocols/msn/notification.c:897
 #, c-format
 msgid "Unable to add user on %s (%s)"
 msgstr "Kan inte lägga till användare på %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:901
 #, c-format
 msgid "Unable to block user on %s (%s)"
 msgstr "Kan inte blockera användaren på %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:905
 #, c-format
 msgid "Unable to permit user on %s (%s)"
 msgstr "Kan inte tillåta användaren på %s (%s)"
 
-#: ../libpurple/protocols/msn/notification.c:913
 #, 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."
 
-#: ../libpurple/protocols/msn/notification.c:922
 #, c-format
 msgid "%s is not a valid passport account."
 msgstr "%s är inte ett giltigt passport-konto."
 
-#: ../libpurple/protocols/msn/notification.c:927
 msgid "Service Temporarily Unavailable."
 msgstr "Tjänst tillfälligt onåbar."
 
-#: ../libpurple/protocols/msn/notification.c:1263
 msgid "Unable to rename group"
 msgstr "Kan inte byta namn på grupp"
 
-#: ../libpurple/protocols/msn/notification.c:1318
 msgid "Unable to delete group"
 msgstr "Kan inte ta bort grupp"
 
-#: ../libpurple/protocols/msn/notification.c:1934
-#, 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"
+#, 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."
 
-#: ../libpurple/protocols/msn/oim.c:142
-msgid "Unable to connect to OIM server"
-msgstr "Kan inte ansluta till OIM-servern."
-
-#: ../libpurple/protocols/msn/servconn.c:135
-#: ../libpurple/protocols/qq/qq_proxy.c:242
-#: ../libpurple/protocols/qq/qq_proxy.c:324
-#: ../libpurple/protocols/qq/qq_proxy.c:369
-#: ../libpurple/protocols/qq/qq_proxy.c:402
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:64
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:167
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:191
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:204
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:233
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:247
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:272
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:307
-#: ../libpurple/protocols/qq/udp_proxy_s5.c:338
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Unable to connect"
 msgstr "Kan inte ansluta"
 
-#: ../libpurple/protocols/msn/servconn.c:137
 msgid "Writing error"
 msgstr "Skrivfel"
 
-#: ../libpurple/protocols/msn/servconn.c:139
 msgid "Reading error"
 msgstr "Läsfel"
 
-#: ../libpurple/protocols/msn/servconn.c:146
 #, c-format
 msgid ""
 "Connection error from %s server:\n"
@@ -7407,108 +5051,89 @@
 "Anslutningsfel från %s servern:\n"
 "%s"
 
-#: ../libpurple/protocols/msn/session.c:338
 msgid "Our protocol is not supported by the server."
 msgstr "Vårt protokoll stöds inte av servern."
 
-#: ../libpurple/protocols/msn/session.c:342
 msgid "Error parsing HTTP."
 msgstr "Fel vid avkodning av HTTP."
 
-#: ../libpurple/protocols/msn/session.c:346
-#: ../libpurple/protocols/oscar/flap_connection.c:384
-#: ../libpurple/protocols/yahoo/yahoo.c:207
 msgid "You have signed on from another location."
 msgstr "Du har loggat in från en annan plats."
 
-#: ../libpurple/protocols/msn/session.c:351
 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."
 
-#: ../libpurple/protocols/msn/session.c:356
 msgid "The MSN servers are going down temporarily."
 msgstr "MSN-servern går ner temporärt."
 
-#: ../libpurple/protocols/msn/session.c:361
 #, c-format
 msgid "Unable to authenticate: %s"
 msgstr "Kan inte autentisera: %s"
 
-#: ../libpurple/protocols/msn/session.c:366
-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:387
-#: ../libpurple/protocols/msn/session.c:389
+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."
+
 msgid "Handshaking"
 msgstr "Handskakning"
 
-#: ../libpurple/protocols/msn/session.c:390
 msgid "Starting authentication"
 msgstr "Starta autentisering"
 
-#: ../libpurple/protocols/msn/session.c:391
 msgid "Getting cookie"
 msgstr "Hämtar kaka"
 
-#: ../libpurple/protocols/msn/session.c:393
 msgid "Sending cookie"
 msgstr "Skickar kaka"
 
-#: ../libpurple/protocols/msn/session.c:394
 msgid "Retrieving buddy list"
 msgstr "Tar emot kompislista"
 
-#: ../libpurple/protocols/msn/state.c:34
 msgid "Away From Computer"
 msgstr "Inte vid datorn"
 
-#: ../libpurple/protocols/msn/state.c:35
 msgid "On The Phone"
 msgstr "Pratar i telefon"
 
-#: ../libpurple/protocols/msn/state.c:36
 msgid "Out To Lunch"
 msgstr "På lunch"
 
-#: ../libpurple/protocols/msn/switchboard.c:398
 msgid "Message may have not been sent because a timeout occurred:"
 msgstr "Meddelandet kanske inte skickades eftersom väntetiden tog slut:"
 
-#: ../libpurple/protocols/msn/switchboard.c:406
 msgid "Message could not be sent, not allowed while invisible:"
 msgstr "Meddelandet kunde inte skickas, inte tillåtet som osynlig:"
 
-#: ../libpurple/protocols/msn/switchboard.c:410
 msgid "Message could not be sent because the user is offline:"
 msgstr "Meddelandet kunde inte skickas eftersom användaren är frånkopplad:"
 
-#: ../libpurple/protocols/msn/switchboard.c:414
 msgid "Message could not be sent because a connection error occurred:"
 msgstr "Meddelandet kunde inte skickas eftersom ett anslutningsfel uppstod:"
 
-#: ../libpurple/protocols/msn/switchboard.c:418
 msgid "Message could not be sent because we are sending too quickly:"
 msgstr "Meddelandet kunde inte skickas eftersom skickade för snabbt:"
 
-#: ../libpurple/protocols/msn/switchboard.c:422
-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:429
-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:437
+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:"
+
+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:"
+
 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:"
-
-#: ../libpurple/protocols/msn/userlist.c:243
+msgstr ""
+"Meddelandet kunde kanske inte skickas på grund av att ett okänt fel uppstod:"
+
 #, c-format
 msgid "%s has added you to his or her buddy list."
 msgstr "%s har lagt till dig till sin kompislista."
 
-#: ../libpurple/protocols/msn/userlist.c:312
 #, c-format
 msgid "%s has removed you from his or her buddy list."
 msgstr "%s har tagit bort dig från sin kontaktlista."
@@ -7516,248 +5141,214 @@
 #. only notify the user about problems adding to the friends list
 #. * maybe we should do something else for other lists, but it probably
 #. * won't cause too many problems if we just ignore it
-#: ../libpurple/protocols/msn/userlist.c:693
 #, c-format
 msgid "Unable to add \"%s\"."
 msgstr "Kunde inte lägga till \"%s\"."
 
-#: ../libpurple/protocols/msn/userlist.c:696
 msgid "The screen name specified is invalid."
 msgstr "Det angivna skärmnamnet är felaktigt."
 
-#: ../libpurple/protocols/myspace/myspace.c:111
+msgid "Has you"
+msgstr "Har dig"
+
+#. *< type
+#. *< ui_requirement
+#. *< flags
+#. *< dependencies
+#. *< priority
+#. *< id
+#. *< name
+#. *< version
+#. *  summary
+#. *  description
+msgid "MSN Protocol Plugin"
+msgstr "Insticksmodul för MSN-protokollet"
+
 msgid "Missing Cipher"
 msgstr "Chiffer Saknas"
 
-#: ../libpurple/protocols/myspace/myspace.c:112
 msgid "The RC4 cipher could not be found"
 msgstr "RC4-chiffret kan inte hittas"
 
-#: ../libpurple/protocols/myspace/myspace.c:113
-msgid "Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will not be loaded."
-msgstr "Uppgradera till en version av libpurble med RC4-stöd (>= 2.0.1). MySpaceIM-insticksmodulen kommer inte läsas in."
-
-#: ../libpurple/protocols/myspace/myspace.c:286
-#, c-format
-msgid "Sorry, passwords over %d characters in length (yours is %d) are not supported by MySpace."
-msgstr "Tyvärr, lösenord som är längre än %d tecken (ditt är %d) stöds inte av MySpace."
+msgid ""
+"Upgrade to a libpurple with RC4 support (>= 2.0.1). MySpaceIM plugin will "
+"not be loaded."
+msgstr ""
+"Uppgradera till en version av libpurble med RC4-stöd (>= 2.0.1). MySpaceIM-"
+"insticksmodulen kommer inte läsas in."
+
+#, c-format
+msgid ""
+"Sorry, passwords over %d characters in length (yours is %d) are not "
+"supported by MySpace."
+msgstr ""
+"Tyvärr, lösenord som är längre än %d tecken (ditt är %d) stöds inte av "
+"MySpace."
 
 #. Notify an error message also, because this is important!
-#: ../libpurple/protocols/myspace/myspace.c:292
-#: ../libpurple/protocols/myspace/myspace.c:1810
 msgid "MySpaceIM Error"
 msgstr "MySpaceIM-fel"
 
-#: ../libpurple/protocols/myspace/myspace.c:350
 msgid "Reading challenge"
 msgstr "Läser challenge"
 
-#: ../libpurple/protocols/myspace/myspace.c:356
 msgid "Unexpected challenge length from server"
 msgstr "Oväntad challengelängd från server"
 
-#: ../libpurple/protocols/myspace/myspace.c:360
 msgid "Logging in"
 msgstr "Loggar in"
 
-#: ../libpurple/protocols/myspace/myspace.c:1293
 #, c-format
 msgid "Connection to server lost (no data received within %d seconds)"
 msgstr "Anslutning till servern tappad (ingen data mottagen på %d sekunder)"
 
 #. Can't write _()'d strings in array initializers. Workaround.
-#: ../libpurple/protocols/myspace/myspace.c:1335
 msgid "New mail messages"
 msgstr "Nya e-postmeddelanden"
 
-#: ../libpurple/protocols/myspace/myspace.c:1336
 msgid "New blog comments"
 msgstr "Nya bloggkommentarer"
 
-#: ../libpurple/protocols/myspace/myspace.c:1337
 msgid "New profile comments"
 msgstr "Nya profilkommentarer"
 
-#: ../libpurple/protocols/myspace/myspace.c:1338
 msgid "New friend requests!"
 msgstr "Nya vänförfrågningar"
 
-#: ../libpurple/protocols/myspace/myspace.c:1339
 msgid "New picture comments"
 msgstr "Nya bildkommentarer"
 
-#: ../libpurple/protocols/myspace/myspace.c:1367
 msgid "MySpace"
 msgstr "MySpace"
 
 #. The session is now set up, ready to be connected. This emits the
 #. * signedOn signal, so clients can now do anything with msimprpl, and
 #. * we're ready for it (session key, userid, username all setup).
-#: ../libpurple/protocols/myspace/myspace.c:1550
-#: ../libpurple/protocols/sametime/sametime.c:1544
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../libpurple/protocols/myspace/myspace.c:1561
-#: ../libpurple/protocols/myspace/myspace.c:1563
 msgid "No username set"
 msgstr "Inget användarnamn angett"
 
-#: ../libpurple/protocols/myspace/myspace.c:1562
-msgid "Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile.username and choose a username and try to login again."
-msgstr "Gå till http://editprofile.myspace.com/index.cfm?fuseaction=profile.username och välj ett användarnamn och försök igen."
-
-#: ../libpurple/protocols/myspace/myspace.c:1789
+msgid ""
+"Please go to http://editprofile.myspace.com/index.cfm?fuseaction=profile."
+"username and choose a username and try to login again."
+msgstr ""
+"Gå till http://editprofile.myspace.com/index.cfm?fuseaction=profile.username "
+"och välj ett användarnamn och försök igen."
+
 #, c-format
 msgid "Protocol error, code %d: %s"
 msgstr "Protokollfel, gav felkod %d: %s"
 
 # Vad säger att det är till just en chatt kompisen ska läggas till?
-#: ../libpurple/protocols/myspace/myspace.c:1981
-#: ../libpurple/protocols/myspace/myspace.c:2015
 msgid "Failed to add buddy"
 msgstr "Kunde inte lägga till kompis"
 
-#: ../libpurple/protocols/myspace/myspace.c:1981
 msgid "'addbuddy' command failed."
 msgstr "'addbuddy'-kommandot misslyckades."
 
 # Vet inte vad den gör, mycket öppen för förslag från någon som vet MySpaceIM.
-#: ../libpurple/protocols/myspace/myspace.c:2015
-#: ../libpurple/protocols/myspace/myspace.c:2252
 msgid "persist command failed"
 msgstr "'persist'-kommandot misslyckades"
 
-#: ../libpurple/protocols/myspace/myspace.c:2120
 #, c-format
 msgid "No such user: %s"
 msgstr "Ingen sådan användare: %s"
 
-#: ../libpurple/protocols/myspace/myspace.c:2121
 msgid "User lookup"
 msgstr "Användarsökning"
 
-#: ../libpurple/protocols/myspace/myspace.c:2233
-#: ../libpurple/protocols/myspace/myspace.c:2252
-#: ../libpurple/protocols/myspace/myspace.c:2274
 msgid "Failed to remove buddy"
 msgstr "Kunde inte ta bort kompis från chatt"
 
-#: ../libpurple/protocols/myspace/myspace.c:2233
 msgid "'delbuddy' command failed"
 msgstr "'delbuddy'-kommadot misslyckades"
 
-#: ../libpurple/protocols/myspace/myspace.c:2274
 msgid "blocklist command failed"
 msgstr "'blocklist'-kommandot misslyckades"
 
-#: ../libpurple/protocols/myspace/myspace.c:2320
 msgid "Invalid input condition"
 msgstr "Ogiltigt inmatningsvillkor"
 
-#. TODO: g_realloc like msn, yahoo, irc, jabber?
-#: ../libpurple/protocols/myspace/myspace.c:2338
-#: ../libpurple/protocols/myspace/myspace.c:2369
 msgid "Read buffer full"
 msgstr "Kö full"
 
-#: ../libpurple/protocols/myspace/myspace.c:2407
 msgid "Unparseable message"
 msgstr "Otolkbart meddelande"
 
-#: ../libpurple/protocols/myspace/myspace.c:2476
 #, c-format
 msgid "Couldn't connect to host: %s (%d)"
 msgstr "Kunde inte ansluta till värd: %s (%d)"
 
-#: ../libpurple/protocols/myspace/myspace.c:2647
 msgid "IM Friends"
 msgstr "Snabbmeddelandevänner"
 
-#: ../libpurple/protocols/myspace/myspace.c:2747
-#, c-format
-msgid "%d buddies were added or updated from the server (including buddies already on the server-side list)"
-msgstr "%d vänner lades till eller uppdaterades av servern (inklusive vänner som redan fanns på serverns lista)"
-
-#: ../libpurple/protocols/myspace/myspace.c:2748
+#, c-format
+msgid ""
+"%d buddies were added or updated from the server (including buddies already "
+"on the server-side list)"
+msgstr ""
+"%d vänner lades till eller uppdaterades av servern (inklusive vänner som "
+"redan fanns på serverns lista)"
+
 msgid "Add contacts from server"
 msgstr "Lägg till kontakter från server"
 
-#: ../libpurple/protocols/myspace/myspace.c:2800
-#: ../libpurple/protocols/myspace/myspace.c:2865
 msgid "Add friends from MySpace.com"
 msgstr "Lägg till vänner från MySpace.com"
 
-#: ../libpurple/protocols/myspace/myspace.c:2801
 msgid "Importing friends failed"
 msgstr "Importering av vänner misslyckades"
 
 #. TODO: find out how
-#: ../libpurple/protocols/myspace/myspace.c:2857
 msgid "Find people..."
 msgstr "Hitta personer..."
 
-#: ../libpurple/protocols/myspace/myspace.c:2860
 msgid "Change IM name..."
 msgstr "Ändring visningsnamn..."
 
-#: ../libpurple/protocols/myspace/myspace.c:3162
 msgid "myim URL handler"
 msgstr "myim URL-hanterare"
 
-#: ../libpurple/protocols/myspace/myspace.c:3163
 msgid "No suitable MySpaceIM account could be found to open this myim URL."
-msgstr "Inget passande MySpaceIM-konto kunde hittas för att öppna denna myim-URL."
-
-#: ../libpurple/protocols/myspace/myspace.c:3164
+msgstr ""
+"Inget passande MySpaceIM-konto kunde hittas för att öppna denna myim-URL."
+
 msgid "Enable the proper MySpaceIM account and try again."
 msgstr "Aktivera det riktiga MySpaceIM-kontot och försök igen."
 
-#: ../libpurple/protocols/myspace/myspace.c:3287
 msgid "Show display name in status text"
 msgstr "Visa visningnamn i statustext"
 
-#: ../libpurple/protocols/myspace/myspace.c:3290
 msgid "Show headline in status text"
 msgstr "Visa rubrik i statustext"
 
 # Jag vet faktiskt inte vad dessa kallas i de officiella klienterna, kan vara en ide att kolla upp.
-#: ../libpurple/protocols/myspace/myspace.c:3295
 msgid "Send emoticons"
 msgstr "Skicka emoticons"
 
-#: ../libpurple/protocols/myspace/myspace.c:3300
 msgid "Screen resolution (dots per inch)"
 msgstr "Skärmupplösning (punkter per tum)"
 
-#: ../libpurple/protocols/myspace/myspace.c:3303
 msgid "Base font size (points)"
 msgstr "Grundstorlek för tecken (punkter)"
 
-#: ../libpurple/protocols/myspace/user.c:95
-#: ../libpurple/protocols/zephyr/zephyr.c:786
-#: ../libpurple/protocols/zephyr/zephyr.c:1204
 msgid "User"
 msgstr "Användare"
 
-#: ../libpurple/protocols/myspace/user.c:105
-#: ../libpurple/protocols/oscar/oscar.c:2979
 msgid "Profile"
 msgstr "Profil"
 
-#: ../libpurple/protocols/myspace/user.c:128
 msgid "Headline"
 msgstr "Rubrik"
 
-#: ../libpurple/protocols/myspace/user.c:133
 msgid "Song"
 msgstr "Sång"
 
-#: ../libpurple/protocols/myspace/user.c:141
 msgid "Total Friends"
 msgstr "Totala vänner"
 
-#: ../libpurple/protocols/myspace/user.c:159
 msgid "Client Version"
 msgstr "Klientversion"
 
@@ -7767,148 +5358,118 @@
 #. * projectile or weapon."  This term often has an electrical
 #. * connotation, for example, "he was zapped by electricity when
 #. * he put a fork in the toaster."
-#: ../libpurple/protocols/myspace/zap.c:51
-#: ../libpurple/protocols/myspace/zap.c:214
 msgid "Zap"
 msgstr "Zappa"
 
-#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "%s has zapped you!"
 msgstr "%s har zappat dig!"
 
-#: ../libpurple/protocols/myspace/zap.c:51
 #, c-format
 msgid "Zapping %s..."
 msgstr "Zappar %s..."
 
 #. Whack means "to hit or strike someone with a sharp blow"
-#: ../libpurple/protocols/myspace/zap.c:54
 msgid "Whack"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:54
-#, fuzzy, c-format
+msgstr "Banka på"
+
+#, c-format
 msgid "%s has whacked you!"
-msgstr "Användaren har blockerat dig"
-
-#: ../libpurple/protocols/myspace/zap.c:54
+msgstr "%s har bankat på dig!"
+
 #, c-format
 msgid "Whacking %s..."
-msgstr ""
+msgstr "Bankar på %s..."
 
 #. Torch means "to set on fire."  Don't worry, this doesn't
 #. * make a whole lot of sense in English, either.  Feel free
 #. * to translate it literally.
-#: ../libpurple/protocols/myspace/zap.c:59
 msgid "Torch"
 msgstr "Bränna"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "%s has torched you!"
 msgstr "%s har brännt dig!"
 
-#: ../libpurple/protocols/myspace/zap.c:59
 #, c-format
 msgid "Torching %s..."
 msgstr "Bränner %s..."
 
 #. Smooch means "to kiss someone, often enthusiastically"
-#: ../libpurple/protocols/myspace/zap.c:62
 msgid "Smooch"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:62
-#, fuzzy, c-format
+msgstr "Kyssa"
+
+#, c-format
 msgid "%s has smooched you!"
-msgstr "%s har loggat in."
-
-#: ../libpurple/protocols/myspace/zap.c:62
+msgstr "%s har kysst dig!"
+
 #, c-format
 msgid "Smooching %s..."
-msgstr ""
+msgstr "Kysser %s..."
 
 #. A hug is a display of affection; wrapping your arms around someone
-#: ../libpurple/protocols/myspace/zap.c:65
 msgid "Hug"
 msgstr "Kram"
 
-#: ../libpurple/protocols/myspace/zap.c:65
 #, c-format
 msgid "%s has hugged you!"
 msgstr "%s har kramat dig!"
 
-#: ../libpurple/protocols/myspace/zap.c:65
 #, c-format
 msgid "Hugging %s..."
 msgstr "Kramar %s..."
 
 #. Slap means "to hit someone with an open/flat hand"
-#: ../libpurple/protocols/myspace/zap.c:68
-#, fuzzy
 msgid "Slap"
-msgstr "Sömnig"
-
-#: ../libpurple/protocols/myspace/zap.c:68
-#, fuzzy, c-format
+msgstr "Smiska till"
+
+#, c-format
 msgid "%s has slapped you!"
-msgstr "%s har loggat in."
-
-#: ../libpurple/protocols/myspace/zap.c:68
+msgstr "%s har smiskat till dig!"
+
 #, c-format
 msgid "Slapping %s..."
-msgstr ""
+msgstr "Smiskar till %s..."
 
 #. Goose means "to pinch someone on their butt"
-#: ../libpurple/protocols/myspace/zap.c:71
-#, fuzzy
 msgid "Goose"
-msgstr "Borta"
-
-#: ../libpurple/protocols/myspace/zap.c:71
-#, fuzzy, c-format
+msgstr "Rumpnypa"
+
+#, c-format
 msgid "%s has goosed you!"
-msgstr "%s har gått iväg."
-
-#: ../libpurple/protocols/myspace/zap.c:71
-#, fuzzy, c-format
+msgstr "%s har rumpnypt dig!"
+
+#, c-format
 msgid "Goosing %s..."
-msgstr "Slå upp %s"
+msgstr "Rumpnyper %s..."
 
 #. A high-five is when two people's hands slap each other
 #. * in the air above their heads.  It is done to celebrate
 #. * something, often a victory, or to congratulate someone.
-#: ../libpurple/protocols/myspace/zap.c:76
 msgid "High-five"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:76
-#, fuzzy, c-format
+msgstr "High-five"
+
+#, c-format
 msgid "%s has high-fived you!"
-msgstr "%s har loggat in."
-
-#: ../libpurple/protocols/myspace/zap.c:76
+msgstr "%s har high-fiveat dig!"
+
 #, c-format
 msgid "High-fiving %s..."
-msgstr ""
+msgstr "High-fivear %s..."
 
 #. We're not entirely sure what the MySpace people mean by
 #. * this... but we think it's the equivalent of "prank."  Or, for
 #. * someone to perform a mischievous trick or practical joke.
-#: ../libpurple/protocols/myspace/zap.c:81
 msgid "Punk"
-msgstr ""
-
-#: ../libpurple/protocols/myspace/zap.c:81
-#, fuzzy, c-format
+msgstr "Lura"
+
+#, c-format
 msgid "%s has punk'd you!"
-msgstr "%s har loggat in."
-
-#: ../libpurple/protocols/myspace/zap.c:81
+msgstr "%s har lurat dig!"
+
 #, c-format
 msgid "Punking %s..."
-msgstr ""
+msgstr "Lurar %s..."
 
 #. Raspberry is a slang term for the vibrating sound made
 #. * when you stick your tongue out of your mouth with your
@@ -7917,244 +5478,203 @@
 #. * gesture, so it does not carry a harsh negative
 #. * connotation.  It is generally used in a playful tone
 #. * with friends.
-#: ../libpurple/protocols/myspace/zap.c:90
 msgid "Raspberry"
 msgstr ""
 
-#: ../libpurple/protocols/myspace/zap.c:90
 #, fuzzy, c-format
 msgid "%s has raspberried you!"
-msgstr "%s har loggat in."
-
-#: ../libpurple/protocols/myspace/zap.c:90
+msgstr "%s har zappat dig!"
+
 #, c-format
 msgid "Raspberrying %s..."
 msgstr ""
 
-#: ../libpurple/protocols/novell/nmuser.c:1864
 msgid "Required parameters not passed in"
 msgstr "Nödvändiga parametrar passade inte in"
 
-#: ../libpurple/protocols/novell/nmuser.c:1867
 msgid "Unable to write to network"
 msgstr "Kan inte skriva till nätverk"
 
-#: ../libpurple/protocols/novell/nmuser.c:1870
 msgid "Unable to read from network"
 msgstr "Kan inte läsa från nätverk"
 
-#: ../libpurple/protocols/novell/nmuser.c:1873
 msgid "Error communicating with server"
 msgstr "Fel vid kommunikation med servern"
 
-#: ../libpurple/protocols/novell/nmuser.c:1877
 msgid "Conference not found"
 msgstr "Konferensen inte funnen"
 
-#: ../libpurple/protocols/novell/nmuser.c:1880
 msgid "Conference does not exist"
 msgstr "Konferensen finns inte"
 
-#: ../libpurple/protocols/novell/nmuser.c:1884
 msgid "A folder with that name already exists"
 msgstr "En katalog med det namnet finn redan"
 
-#: ../libpurple/protocols/novell/nmuser.c:1887
 msgid "Not supported"
 msgstr "Ej stödd"
 
-#: ../libpurple/protocols/novell/nmuser.c:1891
 msgid "Password has expired"
 msgstr "Lösenord har gått ut"
 
-#: ../libpurple/protocols/novell/nmuser.c:1894
 msgid "Incorrect password"
 msgstr "Felaktigt lösenord"
 
-#: ../libpurple/protocols/novell/nmuser.c:1897
 msgid "User not found"
 msgstr "Användaren hittades inte"
 
-#: ../libpurple/protocols/novell/nmuser.c:1900
 msgid "Account has been disabled"
 msgstr "Kontot har blivit avaktiverat"
 
-#: ../libpurple/protocols/novell/nmuser.c:1903
 msgid "The server could not access the directory"
 msgstr "Servern kunde inte läsa katalogen"
 
-#: ../libpurple/protocols/novell/nmuser.c:1906
 msgid "Your system administrator has disabled this operation"
 msgstr "Din systemadministratör har stängt av denna operationen"
 
-#: ../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"
 
-#: ../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"
 
-#: ../libpurple/protocols/novell/nmuser.c:1915
 msgid "Cannot add yourself"
 msgstr "Kan inte lägga till dig själv"
 
-#: ../libpurple/protocols/novell/nmuser.c:1918
 msgid "Master archive is misconfigured"
 msgstr "Huvudarkiv är felkonfigurerat"
 
-#: ../libpurple/protocols/novell/nmuser.c:1922
 msgid "Incorrect screen name or password"
 msgstr "Felaktigt skärmnamn eller lösenord"
 
-#: ../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"
 
-#: ../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 ""
+"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"
+
 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"
 
-#: ../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"
 
-#: ../libpurple/protocols/novell/nmuser.c:1938
 msgid "You have entered an incorrect screen name"
 msgstr "Du har uppgett ett felaktigt skärmnamn"
 
-#: ../libpurple/protocols/novell/nmuser.c:1941
 msgid "An error occurred while updating the directory"
 msgstr "Ett fel uppstod när katalogen uppdaterades"
 
-#: ../libpurple/protocols/novell/nmuser.c:1944
 msgid "Incompatible protocol version"
 msgstr "Inkompatibel protokollversion"
 
-#: ../libpurple/protocols/novell/nmuser.c:1947
 msgid "The user has blocked you"
 msgstr "Användaren har blockerat dig"
 
-#: ../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 ""
+"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"
+
 msgid "The user is either offline or you are blocked"
 msgstr "Användaren är antingen frånkopplad eller så är du blockerad"
 
-#: ../libpurple/protocols/novell/nmuser.c:1956
 #, c-format
 msgid "Unknown error: 0x%X"
 msgstr "Okänt fel: 0x%X"
 
-#: ../libpurple/protocols/novell/novell.c:124
 #, c-format
 msgid "Login failed (%s)."
 msgstr "Inloggningen misslyckades (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:249
 #, 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)."
-
-#: ../libpurple/protocols/novell/novell.c:398
+msgstr ""
+"Kan inte skicka meddelandet. Kunde inte hämta detaljer för användaren (%s)."
+
 #, 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?
-#: ../libpurple/protocols/novell/novell.c:424
 #, c-format
 msgid "Unable to send message (%s)."
 msgstr "Kan inte skicka meddelandet (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:495
-#: ../libpurple/protocols/novell/novell.c:987
 #, c-format
 msgid "Unable to invite user (%s)."
 msgstr "Kan itne bjuda in användaren (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:534
 #, 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)."
-
-#: ../libpurple/protocols/novell/novell.c:539
+msgstr ""
+"Kan inte skicka meddelandet till %s. Kunde inte skapa konferensen (%s)."
+
 #, c-format
 msgid "Unable to send message. Could not create the conference (%s)."
 msgstr "Kan inte skicka meddelandet. Kunde inte skapa konferensen (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:586
-#, 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:634
-#, 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:707
+#, 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)."
+
+#, 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)."
+
 #, c-format
 msgid "Could not get details for user %s (%s)."
 msgstr "Kan inte hämta detaljer om användaren %s (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:753
-#: ../libpurple/protocols/novell/novell.c:899
 #, c-format
 msgid "Unable to add user to privacy list (%s)."
 msgstr "Kan inte lägga till användare på avskärmningslista (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:800
 #, c-format
 msgid "Unable to add %s to deny list (%s)."
 msgstr "Kunde inte lägga till %s till din spärrlista (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:853
 #, c-format
 msgid "Unable to add %s to permit list (%s)."
 msgstr "Kunde inte lägga till %s till din tillåtelse-lista (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:921
 #, c-format
 msgid "Unable to remove %s from privacy list (%s)."
 msgstr "Kunde inte ta bort %s från din privacy lista (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:944
-#: ../libpurple/protocols/novell/novell.c:1649
 #, c-format
 msgid "Unable to change server side privacy settings (%s)."
 msgstr "Kunde inte ändra serverns avskärmningsinställningar (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1014
 #, c-format
 msgid "Unable to create conference (%s)."
 msgstr "Kunde inte skapa konferens (%s)."
 
-#: ../libpurple/protocols/novell/novell.c:1123
-#: ../libpurple/protocols/novell/novell.c:1694
 msgid "Error communicating with server. Closing connection."
 msgstr "Fel vid kommunikation med servern. Stänger uppkopplingen."
 
-#: ../libpurple/protocols/novell/novell.c:1478
 msgid "Telephone Number"
 msgstr "Telefonnummer"
 
-#: ../libpurple/protocols/novell/novell.c:1484
 msgid "Personal Title"
 msgstr "Personlig titel"
 
-#: ../libpurple/protocols/novell/novell.c:1488
 msgid "Mailstop"
 msgstr "Brevstopp"
 
-#: ../libpurple/protocols/novell/novell.c:1504
-#: ../libpurple/protocols/sametime/sametime.c:4122
 msgid "User ID"
 msgstr "AnvändarID"
 
@@ -8164,41 +5684,29 @@
 #. purple_notify_user_info_add_pair(user_info, tag, value);
 #. }
 #.
-#: ../libpurple/protocols/novell/novell.c:1517
 msgid "Full name"
 msgstr "Fullständigt namn"
 
-#: ../libpurple/protocols/novell/novell.c:1639
 #, c-format
 msgid "GroupWise Conference %d"
 msgstr "GroupWise konferens %d"
 
-#: ../libpurple/protocols/novell/novell.c:1670
-msgid "Unable to make SSL connection to server."
-msgstr "Kan inte skapa SSL anslutning till servern."
-
-#: ../libpurple/protocols/novell/novell.c:1722
 msgid "Authenticating..."
 msgstr "Autentiserar..."
 
-#: ../libpurple/protocols/novell/novell.c:1734
 msgid "Unable to connect to server."
 msgstr "Kan inte ansluta till servern."
 
-#: ../libpurple/protocols/novell/novell.c:1737
 msgid "Waiting for response..."
 msgstr "Väntar på svar..."
 
-#: ../libpurple/protocols/novell/novell.c:1872
 #, c-format
 msgid "%s has been invited to this conversation."
 msgstr "%s har blivit inbjuden till denna konversation."
 
-#: ../libpurple/protocols/novell/novell.c:1900
 msgid "Invitation to Conversation"
 msgstr "Inbjudan till konversation"
 
-#: ../libpurple/protocols/novell/novell.c:1901
 #, c-format
 msgid ""
 "Invitation from: %s\n"
@@ -8209,32 +5717,27 @@
 "\n"
 "Skickad: %s"
 
-#: ../libpurple/protocols/novell/novell.c:1903
 msgid "Would you like to join the conversation?"
 msgstr "Vill du går med i konversationen?"
 
-#: ../libpurple/protocols/novell/novell.c:2017
 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."
 
-#: ../libpurple/protocols/novell/novell.c:2074
-#, c-format
-msgid "%s appears to be offline and did not receive the message that you just sent."
+#, 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!
-#. *  purple_request_fields(gc, _("Server Address"),...);
-#.
-#. ...but for now just error out with a nice message.
-#: ../libpurple/protocols/novell/novell.c:2172
-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:2200
+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."
+
 msgid "Error. SSL support is not installed."
 msgstr "Fel. SSL-stöd är inte installerat."
 
-#: ../libpurple/protocols/novell/novell.c:2509
 #, c-format
 msgid "This conference has been closed. No more messages can be sent."
 msgstr "Denna konferens har stängts. Inga fler meddelande kan bli skickade."
@@ -8249,39 +5752,18 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/novell/novell.c:3523
-#: ../libpurple/protocols/novell/novell.c:3525
 msgid "Novell GroupWise Messenger Protocol Plugin"
 msgstr "Novell GroupWise Messenger Protokoll-insticksmodul"
 
-#: ../libpurple/protocols/novell/novell.c:3550
 msgid "Server address"
 msgstr "Serveradress"
 
-#: ../libpurple/protocols/novell/novell.c:3554
 msgid "Server port"
 msgstr "Serverport"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:389
-#: ../libpurple/protocols/yahoo/yahoo.c:2471
-#: ../libpurple/protocols/yahoo/yahoo.c:2638
-#: ../libpurple/protocols/yahoo/ycht.c:481
-#: ../libpurple/proxy.c:584
-#: ../libpurple/proxy.c:1129
-#: ../libpurple/proxy.c:1238
-#: ../libpurple/proxy.c:1338
-#: ../libpurple/proxy.c:1466
 msgid "Server closed the connection."
 msgstr "Servern stängde konversationen."
 
-#: ../libpurple/protocols/oscar/flap_connection.c:391
-#: ../libpurple/protocols/yahoo/yahoo.c:2465
-#: ../libpurple/protocols/yahoo/yahoo.c:2632
-#: ../libpurple/proxy.c:596
-#: ../libpurple/proxy.c:1141
-#: ../libpurple/proxy.c:1250
-#: ../libpurple/proxy.c:1350
-#: ../libpurple/proxy.c:1478
 #, c-format
 msgid ""
 "Lost connection with server:\n"
@@ -8290,12 +5772,6 @@
 "Tappade anslutningen med servern:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/flap_connection.c:394
-#: ../libpurple/proxy.c:1158
-#: ../libpurple/proxy.c:1263
-#: ../libpurple/proxy.c:1362
-#: ../libpurple/proxy.c:1434
-#: ../libpurple/proxy.c:1491
 msgid "Received invalid data on connection with server."
 msgstr "Tog emot felaktig data vid anslutning till server."
 
@@ -8309,8 +5785,6 @@
 #. *< 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"
 
@@ -8324,321 +5798,244 @@
 #. *< 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:4412
-#: ../libpurple/protocols/zephyr/zephyr.c:2997
 msgid "Encoding"
 msgstr "Kodning"
 
 # Osäker (And weeei!)
-#: ../libpurple/protocols/oscar/odc.c:42
 msgid "The remote user has closed the connection."
-msgstr "Användaren har stängt anslutningen."
-
-#: ../libpurple/protocols/oscar/odc.c:44
+msgstr "Motparten har stängt anslutningen."
+
 msgid "The remote user has declined your request."
 msgstr "Användaren har nekat din förfrågan."
 
-#: ../libpurple/protocols/oscar/odc.c:46
 #, c-format
 msgid "Lost connection with the remote user:<br>%s"
 msgstr "Tappade anslutningen till användaren: <br>%s"
 
-#: ../libpurple/protocols/oscar/odc.c:49
 msgid "Received invalid data on connection with remote user."
 msgstr "Tog emot felaktig data över anslutningen till användaren."
 
-#: ../libpurple/protocols/oscar/odc.c:51
 msgid "Could not establish a connection with the remote user."
 msgstr "Kunde inte skapa en anslutning till användaren."
 
-#: ../libpurple/protocols/oscar/odc.c:562
 msgid "Direct IM established"
 msgstr "Direktmeddelande har etablerats"
 
-#: ../libpurple/protocols/oscar/odc.c:600
-#, c-format
-msgid "%s tried to send you a %s file, but we only allow files up to %s over Direct IM.  Try using file transfer instead.\n"
-msgstr "%s försöker sända dig en %s-fil, men vi tillåter bara filer upp till %s över Diektanslutning. Försök som filöverföring istället.\n"
-
-#: ../libpurple/protocols/oscar/oft.c:656
+#, c-format
+msgid ""
+"%s tried to send you a %s file, but we only allow files up to %s over Direct "
+"IM.  Try using file transfer instead.\n"
+msgstr ""
+"%s försöker sända dig en %s-fil, men vi tillåter bara filer upp till %s över "
+"Diektanslutning. Försök som filöverföring istället.\n"
+
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:116
 msgid "Invalid error"
 msgstr "Ogiltigt fel"
 
-#: ../libpurple/protocols/oscar/oscar.c:117
 msgid "Invalid SNAC"
 msgstr "Ogiltig SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:118
 msgid "Rate to host"
 msgstr "Hastighet till värd"
 
-#: ../libpurple/protocols/oscar/oscar.c:119
 msgid "Rate to client"
 msgstr "Hastighet till klient"
 
-#: ../libpurple/protocols/oscar/oscar.c:121
 msgid "Service unavailable"
 msgstr "Tjänsten är otillgänglig"
 
-#: ../libpurple/protocols/oscar/oscar.c:122
 msgid "Service not defined"
 msgstr "Tjänst ej definierad"
 
-#: ../libpurple/protocols/oscar/oscar.c:123
 msgid "Obsolete SNAC"
 msgstr "Obsolet SNAC"
 
-#: ../libpurple/protocols/oscar/oscar.c:124
 msgid "Not supported by host"
 msgstr "Ej stödd av värd"
 
-#: ../libpurple/protocols/oscar/oscar.c:125
 msgid "Not supported by client"
 msgstr "Ej stödd av klient"
 
-#: ../libpurple/protocols/oscar/oscar.c:126
 msgid "Refused by client"
 msgstr "Vägrad av klient"
 
-#: ../libpurple/protocols/oscar/oscar.c:127
 msgid "Reply too big"
 msgstr "Svar förstort"
 
-#: ../libpurple/protocols/oscar/oscar.c:128
 msgid "Responses lost"
 msgstr "Svar förlorade"
 
-#: ../libpurple/protocols/oscar/oscar.c:129
 msgid "Request denied"
 msgstr "Begäran nekad"
 
-#: ../libpurple/protocols/oscar/oscar.c:130
 msgid "Busted SNAC payload"
 msgstr "Spräckt SNAC-last"
 
-#: ../libpurple/protocols/oscar/oscar.c:131
 msgid "Insufficient rights"
 msgstr "Otillräckliga rättigheter"
 
-#: ../libpurple/protocols/oscar/oscar.c:132
 msgid "In local permit/deny"
 msgstr "I lokal tillåt/neka"
 
-#: ../libpurple/protocols/oscar/oscar.c:133
 msgid "Too evil (sender)"
 msgstr "För onskefull (avsändare)"
 
-#: ../libpurple/protocols/oscar/oscar.c:134
 msgid "Too evil (receiver)"
 msgstr "För onskefull (mottagare)"
 
-#: ../libpurple/protocols/oscar/oscar.c:135
 msgid "User temporarily unavailable"
 msgstr "Användare är tillfälligt oåtkommlig"
 
-#: ../libpurple/protocols/oscar/oscar.c:136
 msgid "No match"
 msgstr "Ingen träff"
 
-#: ../libpurple/protocols/oscar/oscar.c:137
 msgid "List overflow"
 msgstr "Listöverflöde"
 
-#: ../libpurple/protocols/oscar/oscar.c:138
 msgid "Request ambiguous"
 msgstr "Begäran tvetydig"
 
-#: ../libpurple/protocols/oscar/oscar.c:139
 msgid "Queue full"
 msgstr "Kö full"
 
-#: ../libpurple/protocols/oscar/oscar.c:140
 msgid "Not while on AOL"
 msgstr "Inte på AOL"
 
-#: ../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.)"
+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.)"
+
+#, 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:2391
-#: ../pidgin/gtkutils.c:2421
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:332
 msgid "Buddy Icon"
 msgstr "Kompisikon"
 
-#: ../libpurple/protocols/oscar/oscar.c:642
 msgid "Voice"
 msgstr "Röst"
 
-#: ../libpurple/protocols/oscar/oscar.c:645
 msgid "AIM Direct IM"
 msgstr "AIM-direktmeddelande"
 
-#: ../libpurple/protocols/oscar/oscar.c:648
-#: ../libpurple/protocols/silc/silc.c:899
-#: ../libpurple/protocols/silc/util.c:557
-#: ../libpurple/protocols/silc10/silc.c:679
-#: ../libpurple/protocols/silc10/util.c:549
 msgid "Chat"
 msgstr "Chatta"
 
-#: ../libpurple/protocols/oscar/oscar.c:651
-#: ../libpurple/protocols/oscar/oscar.c:6065
 msgid "Get File"
 msgstr "Hämta fil"
 
-#: ../libpurple/protocols/oscar/oscar.c:658
 msgid "Games"
 msgstr "Spel"
 
-#: ../libpurple/protocols/oscar/oscar.c:661
 msgid "Add-Ins"
 msgstr "Lägg till"
 
-#: ../libpurple/protocols/oscar/oscar.c:664
 msgid "Send Buddy List"
 msgstr "Skicka kompislista"
 
-#: ../libpurple/protocols/oscar/oscar.c:667
 msgid "ICQ Direct Connect"
 msgstr "ICQ-direktanslutning"
 
-#: ../libpurple/protocols/oscar/oscar.c:670
 msgid "AP User"
 msgstr "AP-användare"
 
-#: ../libpurple/protocols/oscar/oscar.c:673
 msgid "ICQ RTF"
 msgstr "ICQ-RTF"
 
-#: ../libpurple/protocols/oscar/oscar.c:676
 msgid "Nihilist"
 msgstr "Nihilist"
 
-#: ../libpurple/protocols/oscar/oscar.c:679
 msgid "ICQ Server Relay"
 msgstr "ICQ-serverrelay"
 
-#: ../libpurple/protocols/oscar/oscar.c:682
 msgid "Old ICQ UTF8"
 msgstr "Gamla ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:685
 msgid "Trillian Encryption"
 msgstr "Trillansk kryptering"
 
-#: ../libpurple/protocols/oscar/oscar.c:688
 msgid "ICQ UTF8"
 msgstr "ICQ UTF8"
 
-#: ../libpurple/protocols/oscar/oscar.c:691
 msgid "Hiptop"
 msgstr "Hiptop"
 
-#: ../libpurple/protocols/oscar/oscar.c:694
 msgid "Security Enabled"
 msgstr "Säkerhet aktiverad"
 
-#: ../libpurple/protocols/oscar/oscar.c:697
 msgid "Video Chat"
 msgstr "Videochatt"
 
-#: ../libpurple/protocols/oscar/oscar.c:701
 msgid "iChat AV"
 msgstr "iChat AV"
 
-#: ../libpurple/protocols/oscar/oscar.c:704
 msgid "Live Video"
 msgstr "Live-video"
 
-#: ../libpurple/protocols/oscar/oscar.c:707
 msgid "Camera"
 msgstr "Kamera"
 
-#: ../libpurple/protocols/oscar/oscar.c:725
-#: ../libpurple/protocols/oscar/oscar.c:5835
 #, c-format
 msgid "Free For Chat"
 msgstr "Tillgänglig för chatt"
 
-#: ../libpurple/protocols/oscar/oscar.c:729
-#: ../libpurple/protocols/oscar/oscar.c:5870
 #, c-format
 msgid "Not Available"
 msgstr "Ej tillgänglig"
 
-#: ../libpurple/protocols/oscar/oscar.c:731
-#: ../libpurple/protocols/oscar/oscar.c:5856
 #, c-format
 msgid "Occupied"
 msgstr "Upptagen"
 
-#: ../libpurple/protocols/oscar/oscar.c:735
 #, c-format
 msgid "Web Aware"
 msgstr "Webbmedveten"
 
-#: ../libpurple/protocols/oscar/oscar.c:737
-#: ../libpurple/protocols/qq/qq.c:183
-#: ../libpurple/protocols/qq/qq.c:288
-#: ../libpurple/protocols/yahoo/yahoo.c:3097
-#: ../libpurple/status.c:157
-#: ../pidgin/gtkdocklet.c:557
-#: ../pidgin/gtkstatusbox.c:1060
 #, c-format
 msgid "Invisible"
 msgstr "Osynlig"
 
-#: ../libpurple/protocols/oscar/oscar.c:739
 #, c-format
 msgid "Online"
 msgstr "Ansluten"
 
-#: ../libpurple/protocols/oscar/oscar.c:838
-#: ../libpurple/protocols/oscar/oscar.c:3722
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:721
-#: ../pidgin/gtkprefs.c:1142
 msgid "IP Address"
 msgstr "IP-adress"
 
-#: ../libpurple/protocols/oscar/oscar.c:845
-#: ../libpurple/protocols/oscar/oscar.c:2906
 msgid "Warning Level"
 msgstr "Varningsnivåer"
 
-#: ../libpurple/protocols/oscar/oscar.c:855
 msgid "Buddy Comment"
 msgstr "Kompiskommentar"
 
 # Osäker!!!
-#: ../libpurple/protocols/oscar/oscar.c:995
 #, c-format
 msgid ""
 "Could not connect to authentication server:\n"
 "%s"
 msgstr ""
-"Kunde inte ansluta till identifieringsserver:\n"
+"Kunde inte ansluta till autentiseringsserver:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1003
 #, c-format
 msgid ""
 "Could not connect to BOS server:\n"
@@ -8647,159 +6044,142 @@
 "Kunde inte ansluta till BOS-server:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:1043
 msgid "Screen name sent"
 msgstr "Användar-ID skickat"
 
-#: ../libpurple/protocols/oscar/oscar.c:1048
 msgid "Connection established, cookie sent"
 msgstr "Anslutning etablerad, kaka skickad"
 
 #. TODO: Don't call this with ssi
-#: ../libpurple/protocols/oscar/oscar.c:1077
 msgid "Finalizing connection"
 msgstr "Avsluta anslutning"
 
-#: ../libpurple/protocols/oscar/oscar.c:1262
-#, 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:1348
-#: ../libpurple/protocols/yahoo/yahoo.c:2107
+#, 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."
+
+#. Unregistered screen name
 msgid "Invalid screen name."
 msgstr "Ogiltigt Skärmnamn"
 
-#: ../libpurple/protocols/oscar/oscar.c:1355
-#: ../libpurple/protocols/qq/login_logout.c:485
-#: ../libpurple/protocols/simple/simple.c:1048
-#: ../libpurple/protocols/yahoo/yahoo.c:2128
 msgid "Incorrect password."
 msgstr "Felaktigt lösenord."
 
-#: ../libpurple/protocols/oscar/oscar.c:1360
+#. Suspended account
 msgid "Your account is currently suspended."
 msgstr "Ditt konto är avstängt för tillfället."
 
 #. service temporarily unavailable
-#: ../libpurple/protocols/oscar/oscar.c:1364
 msgid "The AOL Instant Messenger service is temporarily unavailable."
 msgstr "Tjänsten är tillfälligt onåbar."
 
-#: ../libpurple/protocols/oscar/oscar.c:1369
-#: ../libpurple/protocols/oscar/oscar.c:1380
-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:1374
+#. screen name connecting too frequently
+#. IP address connecting too frequently
+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."
+
+#. client too old
 #, 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"
 
-#: ../libpurple/protocols/oscar/oscar.c:1413
 msgid "Could Not Connect"
 msgstr "Kunde inte ansluta"
 
-#: ../libpurple/protocols/oscar/oscar.c:1417
 msgid "Received authorization"
 msgstr "Mottog auktorisering"
 
-#: ../libpurple/protocols/oscar/oscar.c:1439
 msgid "The SecurID key entered is invalid."
 msgstr "SecurID-nyckeln som är angiven är ogiltig."
 
-#: ../libpurple/protocols/oscar/oscar.c:1452
 msgid "Enter SecurID"
 msgstr "Ange SecurID"
 
-#: ../libpurple/protocols/oscar/oscar.c:1453
 msgid "Enter the 6 digit number from the digital display."
 msgstr "Slå in de 6 siffrorna från den digitala skärmen."
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/protocols/oscar/oscar.c:1455
-#: ../libpurple/protocols/oscar/oscar.c:2247
-#: ../libpurple/protocols/oscar/oscar.c:2296
-#: ../libpurple/protocols/oscar/oscar.c:5940
-#: ../libpurple/protocols/oscar/oscar.c:6221
-#: ../libpurple/request.h:1388
+#. *
+#. * A wrapper for purple_request_action() that uses @c OK and @c Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_ok_cancel_with_hint instead.
+#.
 msgid "_OK"
 msgstr "_OK"
 
-#: ../libpurple/protocols/oscar/oscar.c:1494
-#: ../libpurple/protocols/oscar/oscar.c:1537
-#, 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:1497
-#: ../libpurple/protocols/oscar/oscar.c:1540
+#, 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."
+
 msgid "Unable to get a valid AIM login hash."
 msgstr "Kunde inte hämta en giltig AIM-inloggnings-hash."
 
-#: ../libpurple/protocols/oscar/oscar.c:1625
 #, c-format
 msgid "You may be disconnected shortly.  Check %s for updates."
 msgstr "Du kanske snart blir frånkopplad. Kolla på %s efter uppdateringar."
 
-#: ../libpurple/protocols/oscar/oscar.c:1628
 msgid "Unable to get a valid login hash."
 msgstr "Kunde inte hämta en giltig login-hash."
 
-#: ../libpurple/protocols/oscar/oscar.c:1658
 msgid "Password sent"
 msgstr "Lösenord skickat"
 
-#: ../libpurple/protocols/oscar/oscar.c:1714
 msgid "Unable to initialize connection"
 msgstr "Kan inte skapa anslutning"
 
-#: ../libpurple/protocols/oscar/oscar.c:2205
 msgid "Please authorize me so I can add you to my buddy list."
 msgstr "Användaren vill lägga till dig i dennes kompislista."
 
-#: ../libpurple/protocols/oscar/oscar.c:2245
 msgid "Authorization Request Message:"
 msgstr "Meddelande om auktoriseringsbegäran:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2246
 msgid "Please authorize me!"
 msgstr "Snälla auktorisera mig!"
 
-#: ../libpurple/protocols/oscar/oscar.c:2287
-#: ../libpurple/protocols/oscar/oscar.c:2295
-#: ../libpurple/protocols/oscar/oscar.c:2422
-#: ../libpurple/protocols/oscar/oscar.c:5316
-#: ../libpurple/protocols/yahoo/yahoo.c:1032
 msgid "No reason given."
 msgstr "Ingen motivering angiven."
 
-#: ../libpurple/protocols/oscar/oscar.c:2294
 msgid "Authorization Denied Message:"
 msgstr "Meddelande om auktorisering nekad:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2422
-#, c-format
-msgid ""
-"The user %u has denied your request to add them to your buddy list for the following reason:\n"
+#, 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"
 
-#: ../libpurple/protocols/oscar/oscar.c:2423
 msgid "ICQ authorization denied."
 msgstr "ICQ-auktorisering nekades."
 
 #. Someone has granted you authorization
-#: ../libpurple/protocols/oscar/oscar.c:2430
 #, 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."
-
-#: ../libpurple/protocols/oscar/oscar.c:2438
+msgstr ""
+"Användaren %u har tillåtit dig att lägga till honom/henne i din kompislista."
+
 #, c-format
 msgid ""
 "You have received a special message\n"
@@ -8812,7 +6192,6 @@
 "Från: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2446
 #, c-format
 msgid ""
 "You have received an ICQ page\n"
@@ -8825,7 +6204,6 @@
 "Från: %s [%s]\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2454
 #, c-format
 msgid ""
 "You have received an ICQ e-mail from %s [%s]\n"
@@ -8838,60 +6216,55 @@
 "Meddelandet är:\n"
 "%s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2475
 #, 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)"
 
-#: ../libpurple/protocols/oscar/oscar.c:2481
 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?"
 
-#: ../libpurple/protocols/oscar/oscar.c:2486
-#: ../pidgin/gtkroomlist.c:309
 msgid "_Add"
 msgstr "_Lägg till"
 
-#: ../libpurple/protocols/oscar/oscar.c:2487
 msgid "_Decline"
 msgstr "_Neka"
 
-#: ../libpurple/protocols/oscar/oscar.c:2611
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2620
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2629
-#, 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:2638
+#, 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."
+
 #, 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."
-
-#: ../libpurple/protocols/oscar/oscar.c:2647
+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."
+
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:2656
 #, 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."
@@ -8899,455 +6272,427 @@
 msgstr[1] "Du missade %hu meddelanden från %s av okända orsaker."
 
 #. Data is assumed to be the destination sn
-#: ../libpurple/protocols/oscar/oscar.c:2811
 #, c-format
 msgid "Unable to send message: %s"
 msgstr "Kan inte skicka meddelande: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2811
-#: ../libpurple/protocols/oscar/oscar.c:2816
-#: ../libpurple/protocols/oscar/oscar.c:2880
 msgid "Unknown reason."
 msgstr "Okänd anledning."
 
-#: ../libpurple/protocols/oscar/oscar.c:2814
-#: ../libpurple/protocols/sametime/sametime.c:2409
 #, c-format
 msgid "Unable to send message to %s:"
 msgstr "Kan inte skicka meddelandet till %s:"
 
-#: ../libpurple/protocols/oscar/oscar.c:2880
 #, c-format
 msgid "User information not available: %s"
 msgstr "Användarinformation är inte tillgänglig: %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:2911
 msgid "Online Since"
 msgstr "Ansluten sedan"
 
-#: ../libpurple/protocols/oscar/oscar.c:2916
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1185
 msgid "Member Since"
 msgstr "Medlem sedan"
 
-#: ../libpurple/protocols/oscar/oscar.c:2951
 msgid "Available Message"
 msgstr "Tillgängliga meddelanden"
 
-#: ../libpurple/protocols/oscar/oscar.c:3059
 msgid "Your AIM connection may be lost."
 msgstr "Din anslutning kan vara borta."
 
 #. The conversion failed!
-#: ../libpurple/protocols/oscar/oscar.c:3247
-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:3411
-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:3494
-#: ../libpurple/protocols/toc/toc.c:977
+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.]"
+
+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."
+
 #, c-format
 msgid "You have been disconnected from chat room %s."
 msgstr "Du har blivit frånkopplad från chattrummet %s."
 
-#: ../libpurple/protocols/oscar/oscar.c:3744
-#: ../libpurple/protocols/silc/util.c:589
-#: ../libpurple/protocols/silc10/util.c:581
 msgid "Mobile Phone"
 msgstr "Mobilnummer"
 
-#: ../libpurple/protocols/oscar/oscar.c:3774
 msgid "Personal Web Page"
 msgstr "Personlig webbsida"
 
-#: ../libpurple/protocols/oscar/oscar.c:3798
-#: ../libpurple/protocols/qq/buddy_info.c:40
 msgid "Additional Information"
 msgstr "Extra information"
 
-#: ../libpurple/protocols/oscar/oscar.c:3806
-#: ../libpurple/protocols/oscar/oscar.c:3819
 msgid "Zip Code"
 msgstr "Postnummer"
 
-#: ../libpurple/protocols/oscar/oscar.c:3830
 msgid "Division"
 msgstr "Avdelning"
 
-#: ../libpurple/protocols/oscar/oscar.c:3831
 msgid "Position"
 msgstr "Befattning"
 
-#: ../libpurple/protocols/oscar/oscar.c:3833
 msgid "Web Page"
 msgstr "Webbsida"
 
-#: ../libpurple/protocols/oscar/oscar.c:3836
 msgid "Work Information"
 msgstr "Information om arbete"
 
-#: ../libpurple/protocols/oscar/oscar.c:3892
 msgid "Pop-Up Message"
 msgstr "Popup-meddelande"
 
-#: ../libpurple/protocols/oscar/oscar.c:3932
 #, 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"
 
-#: ../libpurple/protocols/oscar/oscar.c:3937
 msgid "Screen name"
 msgstr "Skärmnamn"
 
-#: ../libpurple/protocols/oscar/oscar.c:3963
 #, c-format
 msgid "No results found for e-mail address %s"
 msgstr "Inget resultat funnet för e-postadress %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:3984
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:3986
 msgid "Account Confirmation Requested"
 msgstr "Kontobekräftelsebegäran"
 
-#: ../libpurple/protocols/oscar/oscar.c:4017
 #, c-format
 msgid "Error Changing Account Info"
 msgstr "Fel vid ändring av kontoinformation"
 
-#: ../libpurple/protocols/oscar/oscar.c:4020
-#, 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:4023
+#, 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."
+
 #, 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:4026
-#, 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:4029
-#, 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:4032
-#, 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:4035
-#, 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:4038
+#, 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."
+
+#, 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."
+
+#, 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."
+
+#, 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."
+
 #, c-format
 msgid "Error 0x%04x: Unknown error."
 msgstr "Fel 0x%04x: Okänt fel."
 
-#: ../libpurple/protocols/oscar/oscar.c:4048
 #, c-format
 msgid "The e-mail address for %s is %s"
 msgstr "E-postaderssen för %s är %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:4050
 msgid "Account Info"
 msgstr "Kontoinformation"
 
-#: ../libpurple/protocols/oscar/oscar.c:4233
-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:4504
+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."
+
 msgid "Unable to set AIM profile."
 msgstr "Kan inte ändra i AIM-profil."
 
-#: ../libpurple/protocols/oscar/oscar.c:4505
-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:4519
-#, 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:4524
+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."
+
+#, 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."
+
 msgid "Profile too long."
 msgstr "Profilen är för lång."
 
-#: ../libpurple/protocols/oscar/oscar.c:4569
-#, 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:4574
+#, 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."
+
 msgid "Away message too long."
 msgstr "Frånvaromeddelandet är för långt."
 
-#: ../libpurple/protocols/oscar/oscar.c:4647
-#, 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:4649
-#: ../libpurple/protocols/oscar/oscar.c:5102
-#: ../libpurple/protocols/oscar/oscar.c:5117
+#, 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."
+
 msgid "Unable To Add"
 msgstr "Kan inte lägga till"
 
-#: ../libpurple/protocols/oscar/oscar.c:4768
 msgid "Unable To Retrieve Buddy List"
 msgstr "Kunde inte hämta kompislista"
 
-#: ../libpurple/protocols/oscar/oscar.c:4769
-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 minutes."
-msgstr "AIM-servrarna kunde för tillfället inte skicka din kompislista. Din kompislista är inte försvunnen utan kommer antagligen vara tillgänglig om några timmar igen."
-
-#: ../libpurple/protocols/oscar/oscar.c:4952
-#: ../libpurple/protocols/oscar/oscar.c:4954
-#: ../libpurple/protocols/oscar/oscar.c:5182
-#: ../libpurple/protocols/oscar/oscar.c:5183
-#: ../libpurple/protocols/oscar/oscar.c:5188
+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 minutes."
+msgstr ""
+"AIM-servrarna kunde för tillfället inte skicka din kompislista. Din "
+"kompislista är inte försvunnen utan kommer antagligen vara tillgänglig om "
+"några timmar igen."
+
 msgid "Orphans"
 msgstr "Föräldralösa"
 
-#: ../libpurple/protocols/oscar/oscar.c:5100
-#, 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:5100
-#: ../libpurple/protocols/oscar/oscar.c:5115
+#, 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."
+
 msgid "(no name)"
 msgstr "(inget namn)"
 
-#: ../libpurple/protocols/oscar/oscar.c:5114
 #, 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:5231
-#, 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:5239
+#, 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?"
+
 msgid "Authorization Given"
 msgstr "Auktorisering given"
 
 #. Granted
-#: ../libpurple/protocols/oscar/oscar.c:5312
 #, 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."
-
-#: ../libpurple/protocols/oscar/oscar.c:5313
+msgstr ""
+"Användaren %s har tillåtit dig att lägga till henne/honom till din "
+"kompislista."
+
 msgid "Authorization Granted"
 msgstr "Auktorisering beviljades"
 
 #. Denied
-#: ../libpurple/protocols/oscar/oscar.c:5316
-#, c-format
-msgid ""
-"The user %s has denied your request to add them to your buddy list for the following reason:\n"
+#, 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"
 
-#: ../libpurple/protocols/oscar/oscar.c:5317
 msgid "Authorization Denied"
 msgstr "Auktorisering nekades"
 
-#: ../libpurple/protocols/oscar/oscar.c:5353
-#: ../libpurple/protocols/toc/toc.c:1371
 msgid "_Exchange:"
 msgstr "_Utbyte:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5393
 msgid "Invalid chat name specified."
 msgstr "Ogiltigt chattnamn angivet."
 
-#: ../libpurple/protocols/oscar/oscar.c:5462
 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."
-
-#: ../libpurple/protocols/oscar/oscar.c:5624
-#: ../libpurple/protocols/oscar/oscar.c:5629
+msgstr ""
+"Din IM-bild skickades inte. Du kan inte skicka IM-bilder via AIM-chattar."
+
 msgid "Away Message"
 msgstr "Frånvaromeddelande"
 
-#: ../libpurple/protocols/oscar/oscar.c:5629
 msgid "<i>(retrieving)</i>"
 msgstr "<i>(mottar)</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:5829
 msgid "iTunes Music Store Link"
 msgstr "Länk till iTunes Musikaffär"
 
-#: ../libpurple/protocols/oscar/oscar.c:5937
 #, c-format
 msgid "Buddy Comment for %s"
 msgstr "Kompiskommentar för %s"
 
-#: ../libpurple/protocols/oscar/oscar.c:5938
 msgid "Buddy Comment:"
 msgstr "Kompiskommentar:"
 
-#: ../libpurple/protocols/oscar/oscar.c:5985
 #, 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."
-
-#: ../libpurple/protocols/oscar/oscar.c:5989
-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:5995
-#: ../libpurple/protocols/oscar/peer.c:1047
+msgstr ""
+"Du har valt att öppna en direktanslutning för snabbmeddelanden till %s."
+
+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?"
+
 msgid "C_onnect"
 msgstr "_Anslut"
 
-#: ../libpurple/protocols/oscar/oscar.c:6030
 msgid "Get AIM Info"
 msgstr "Hämta AIM-info"
 
-#: ../libpurple/protocols/oscar/oscar.c:6036
 msgid "Edit Buddy Comment"
 msgstr "Ändra kompiskommentar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6044
 msgid "Get Status Msg"
 msgstr "Hämta statusmeddelande"
 
-#: ../libpurple/protocols/oscar/oscar.c:6057
 msgid "Direct IM"
 msgstr "Direktmeddelande"
 
-#: ../libpurple/protocols/oscar/oscar.c:6079
 msgid "Re-request Authorization"
 msgstr "Begär autentiserings igen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6138
 msgid "Require authorization"
 msgstr "Kräver auktorisering"
 
-#: ../libpurple/protocols/oscar/oscar.c:6141
 msgid "Web aware (enabling this will cause you to receive SPAM!)"
 msgstr "Webbnärvaro (aktivera detta innebär att du kommer få SPAM!)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6146
 msgid "ICQ Privacy Options"
 msgstr "ICQ sekretessinställningar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6165
 msgid "The new formatting is invalid."
 msgstr "Den nya formateringen är ogiltig."
 
-#: ../libpurple/protocols/oscar/oscar.c:6166
 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."
-
-#: ../libpurple/protocols/oscar/oscar.c:6219
+msgstr ""
+"Användar-ID formatering kan endast förändra stora-/småbokstäver och "
+"mellanslag."
+
 msgid "Change Address To:"
 msgstr "Ändra adress till:"
 
-#: ../libpurple/protocols/oscar/oscar.c:6265
 msgid "<i>you are not waiting for authorization</i>"
 msgstr "<i>du väntar inte på auktorisering</i>"
 
-#: ../libpurple/protocols/oscar/oscar.c:6268
 msgid "You are awaiting authorization from the following buddies"
 msgstr "Du väntar på auktorisering från följande kompisar"
 
-#: ../libpurple/protocols/oscar/oscar.c:6269
-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:6286
+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.\""
+
 msgid "Find Buddy by E-Mail"
 msgstr "Hitta kompis på e-postadress"
 
-#: ../libpurple/protocols/oscar/oscar.c:6287
 msgid "Search for a buddy by e-mail address"
 msgstr "Sök efter en kompis på dess e-postadress"
 
-#: ../libpurple/protocols/oscar/oscar.c:6288
 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."
 
-#: ../libpurple/protocols/oscar/oscar.c:6291
 msgid "_Search"
 msgstr "_Sök"
 
-#: ../libpurple/protocols/oscar/oscar.c:6449
 msgid "Set User Info (URL)..."
 msgstr "Ändra användarinformation (URL)..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6460
 msgid "Change Password (URL)"
 msgstr "Byt lösenord (URL)"
 
-#: ../libpurple/protocols/oscar/oscar.c:6464
 msgid "Configure IM Forwarding (URL)"
 msgstr "Konfigurera vidarebefordring av snabbmeddelanden (URL)"
 
 #. ICQ actions
-#: ../libpurple/protocols/oscar/oscar.c:6474
 msgid "Set Privacy Options..."
 msgstr "Ange sekretessinställningar..."
 
 #. AIM actions
-#: ../libpurple/protocols/oscar/oscar.c:6481
 msgid "Confirm Account"
 msgstr "Bekräfta konto"
 
-#: ../libpurple/protocols/oscar/oscar.c:6485
 msgid "Display Currently Registered E-Mail Address"
 msgstr "Visa för tillfället registrerad epost-adress"
 
-#: ../libpurple/protocols/oscar/oscar.c:6489
 msgid "Change Currently Registered E-Mail Address..."
 msgstr "Ändra för tillfället registrerad epost-adress..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6496
 msgid "Show Buddies Awaiting Authorization"
 msgstr "Visa kompisar som väntar på auktorisering"
 
-#: ../libpurple/protocols/oscar/oscar.c:6502
 msgid "Search for Buddy by E-Mail Address..."
 msgstr "Sök efter kompis på e-postadress..."
 
-#: ../libpurple/protocols/oscar/oscar.c:6507
 msgid "Search for Buddy by Information"
 msgstr "Sök efter kompis via information"
 
-#: ../libpurple/protocols/oscar/oscar.c:6575
 msgid "Use recent buddies group"
 msgstr "Använd senaste kompisgruppen"
 
-#: ../libpurple/protocols/oscar/oscar.c:6578
 msgid "Show how long you have been idle"
 msgstr "Visar hur länge du varit inaktiv"
 
-#: ../libpurple/protocols/oscar/oscar.c:6733
 msgid ""
 "Always use ICQ proxy server for file transfers\n"
 "(slower, but does not reveal your IP address)"
@@ -9355,411 +6700,307 @@
 "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:699
 #, 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."
 
-#: ../libpurple/protocols/oscar/peer.c:784
 #, c-format
 msgid "Attempting to connect to %s:%hu."
 msgstr "Försöker ansluta till %s: %hu."
 
-#: ../libpurple/protocols/oscar/peer.c:858
 #, c-format
 msgid "Attempting to connect via proxy server."
 msgstr "Försöker ansluta via en proxy-server."
 
-#: ../libpurple/protocols/oscar/peer.c:1035
 #, 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"
 
-#: ../libpurple/protocols/oscar/peer.c:1039
-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 ""
+"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."
+
 msgid "Primary Information"
 msgstr "Primär information"
 
-#: ../libpurple/protocols/qq/buddy_info.c:41
 msgid "Personal Introduction"
 msgstr "Personlig introduktion"
 
-#: ../libpurple/protocols/qq/buddy_info.c:42
 msgid "QQ Number"
 msgstr "QQ-nummer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:47
 msgid "Country/Region"
 msgstr "Land/Region"
 
-#: ../libpurple/protocols/qq/buddy_info.c:48
 msgid "Province/State"
 msgstr "Provins/Stat"
 
-#: ../libpurple/protocols/qq/buddy_info.c:50
 msgid "Horoscope Symbol"
 msgstr "Horoskopstecken"
 
-#: ../libpurple/protocols/qq/buddy_info.c:52
 msgid "Zodiac Sign"
 msgstr "Stjärntecken"
 
-#: ../libpurple/protocols/qq/buddy_info.c:53
 msgid "Blood Type"
 msgstr "Blodgrupp"
 
-#: ../libpurple/protocols/qq/buddy_info.c:54
 msgid "College"
 msgstr "Universitet"
 
-#: ../libpurple/protocols/qq/buddy_info.c:55
 msgid "Email"
 msgstr "E-post"
 
-#: ../libpurple/protocols/qq/buddy_info.c:57
 msgid "Zipcode"
 msgstr "Postnummer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:58
 msgid "Cellphone Number"
 msgstr "Mobilnummer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:59
 msgid "Phone Number"
 msgstr "Telefonnummer"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aquarius"
 msgstr "Vattuman"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Pisces"
 msgstr "Fiskarna"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Aries"
 msgstr "Stenbocken"
 
-#: ../libpurple/protocols/qq/buddy_info.c:64
 msgid "Taurus"
 msgstr "Oxen"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Gemini"
 msgstr "Tvillingen"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Cancer"
 msgstr "Kräftan"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Leo"
 msgstr "Lejon"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Virgo"
 msgstr "Jungfrun"
 
-#: ../libpurple/protocols/qq/buddy_info.c:65
 msgid "Libra"
 msgstr "Vågen"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Scorpio"
 msgstr "Skorpionen"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Sagittarius"
 msgstr "Skytten"
 
-#: ../libpurple/protocols/qq/buddy_info.c:66
 msgid "Capricorn"
 msgstr "Kräftan"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rat"
 msgstr "Råtta"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Ox"
 msgstr "Oxen"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Tiger"
 msgstr "Tiger"
 
-#: ../libpurple/protocols/qq/buddy_info.c:71
 msgid "Rabbit"
 msgstr "Kanin"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Dragon"
 msgstr "Drake"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Snake"
 msgstr "Orm"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Horse"
 msgstr "Häst"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Goat"
 msgstr "Get"
 
-#: ../libpurple/protocols/qq/buddy_info.c:72
 msgid "Monkey"
 msgstr "Apa"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Rooster"
 msgstr "Tupp"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Dog"
 msgstr "Hund"
 
-#: ../libpurple/protocols/qq/buddy_info.c:73
 msgid "Pig"
 msgstr "Gris"
 
-#: ../libpurple/protocols/qq/buddy_info.c:78
 msgid "Other"
 msgstr "Annan"
 
-#: ../libpurple/protocols/qq/buddy_info.c:522
-#: ../libpurple/protocols/qq/buddy_info.c:523
 msgid "Modify my information"
 msgstr "Ändra min information"
 
-#: ../libpurple/protocols/qq/buddy_info.c:524
 msgid "Update my information"
 msgstr "Uppdatera min information"
 
-#: ../libpurple/protocols/qq/buddy_info.c:548
 msgid "Your information has been updated"
 msgstr "Din infromation har blivit uppdaterad"
 
-#: ../libpurple/protocols/qq/buddy_info.c:601
-#, 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:618
-#: ../libpurple/protocols/qq/buddy_info.c:631
+#, 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."
+
 msgid "Invalid QQ Face"
 msgstr "Ogiltigt QQ-ansikte"
 
-#: ../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"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:209
 msgid "Input your reason:"
 msgstr "Ange din anledning"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:212
 msgid "Reject request"
 msgstr "Avslå förfrågan"
 
 #. 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..."
 
 # Osäker: (Hrm...
-#: ../libpurple/protocols/qq/buddy_opt.c:277
 msgid "Add buddy with auth request failed"
-msgstr "Lägg till kompis med misslyckad authförfrågan"
+msgstr "Lägg till kompis med misslyckad autentiseringsförfrågan"
 
 #. TODO: We don't really need to notify the user about this, do we?
-#: ../libpurple/protocols/qq/buddy_opt.c:309
 msgid "You have successfully removed a buddy"
 msgstr "Du har problemfritt tagit bort en kompis"
 
 #. TODO: Does the user really need to be notified about this?
-#: ../libpurple/protocols/qq/buddy_opt.c:338
 msgid "You have successfully removed yourself from your friend's buddy list"
 msgstr "Du har problemfritt tagit bort dig själv från din väns kompislista"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:404
 #, c-format
 msgid "User %d needs authentication"
 msgstr "Användaren %d behöver autentisering"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:406
-#: ../libpurple/protocols/qq/group_join.c:136
 msgid "Input request here"
 msgstr "Inmatningsförfrågan här"
 
 #. TODO: Awkward string to fix post string freeze - standardize auth dialogues? -evands
-#: ../libpurple/protocols/qq/buddy_opt.c:407
-#: ../libpurple/protocols/qq/group_join.c:137
 msgid "Would you be my friend?"
 msgstr "Vill du bli min vän?"
 
 #. multiline
 #. masked
 #. hint
-#: ../libpurple/protocols/qq/buddy_opt.c:408
-#: ../libpurple/protocols/qq/group_join.c:138
-#: ../libpurple/protocols/qq/group_opt.c:143
 msgid "Send"
 msgstr "Skicka"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:418
 #, c-format
 msgid "You have added %d to buddy list"
 msgstr "Du har lagt till %d till kompislistan"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:515
 msgid "QQid Error"
 msgstr "QQid-fel"
 
-#: ../libpurple/protocols/qq/buddy_opt.c:516
 msgid "Invalid QQid"
 msgstr "Ogiltig QQid"
 
-#: ../libpurple/protocols/qq/group.c:65
 msgid "ID: "
 msgstr "ID:"
 
-#: ../libpurple/protocols/qq/group.c:98
 msgid "Group ID"
 msgstr "Grupp ID"
 
-#: ../libpurple/protocols/qq/group.c:100
 msgid "Creator"
 msgstr "Skapare"
 
-#: ../libpurple/protocols/qq/group.c:103
 msgid "Group Description"
 msgstr "Gruppbeskrivning"
 
-#: ../libpurple/protocols/qq/group.c:109
 msgid "Auth"
 msgstr "Auktorisera"
 
-#: ../libpurple/protocols/qq/group.c:119
 msgid "QQ Qun"
 msgstr "QQ Qun"
 
-#: ../libpurple/protocols/qq/group.c:120
 msgid "Please enter external group ID"
 msgstr "Var god ange externt gruppID"
 
-#: ../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"
 
-#: ../libpurple/protocols/qq/group_im.c:126
 #, c-format
 msgid "User %d requested to join group %d"
 msgstr "Användaren %d har ansökt om att få gå med i grupp %d"
 
-#: ../libpurple/protocols/qq/group_im.c:127
-#: ../libpurple/protocols/qq/group_im.c:181
-#: ../libpurple/protocols/qq/sys_msg.c:193
 #, c-format
 msgid "Reason: %s"
 msgstr "Anledning: %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
 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:91
-#: ../libpurple/protocols/qq/sys_msg.c:248
 msgid "Approve"
 msgstr "Godkänn"
 
-#: ../libpurple/protocols/qq/group_im.c:180
 #, c-format
 msgid "Your request to join group %d has been rejected by admin %d"
 msgstr "Din förfrågan att få gå med i %d har blivit avslaget av moderator %d"
 
-#: ../libpurple/protocols/qq/group_im.c:221
 #, c-format
 msgid "Your request to join group %d has been approved by admin %d"
 msgstr "Din förfrågan att få gå med i %d godkändes av moderator %d"
 
-#: ../libpurple/protocols/qq/group_im.c:257
 #, c-format
 msgid "You [%d] have left group \"%d\""
 msgstr "Du [%d] har lämnat gruppen \"%d\""
 
-#: ../libpurple/protocols/qq/group_im.c:291
 #, c-format
 msgid "You [%d] have been added to group \"%d\""
 msgstr "Du [%d] har lagts till till gruppen \"%d\""
 
-#: ../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."
 
-#: ../libpurple/protocols/qq/group_internal.c:41
 msgid "I am not a member"
 msgstr "Jag är inte en medlem"
 
-#: ../libpurple/protocols/qq/group_internal.c:44
 msgid "I am a member"
 msgstr "Jag är en medlem"
 
-#: ../libpurple/protocols/qq/group_internal.c:47
 msgid "I am applying to join"
 msgstr "Jag söker för att gå med"
 
-#: ../libpurple/protocols/qq/group_internal.c:50
 msgid "I am the admin"
 msgstr "Jag är moderatorn"
 
-#: ../libpurple/protocols/qq/group_internal.c:53
 msgid "Unknown status"
 msgstr "Okänd status"
 
-#: ../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"
 
-#: ../libpurple/protocols/qq/group_join.c:233
 msgid "You have successfully left the group"
 msgstr "Du har problemfritt lämnat gruppen"
 
-#: ../libpurple/protocols/qq/group_join.c:257
 msgid "QQ Group Auth"
 msgstr "QQ Grupp-auth"
 
-#: ../libpurple/protocols/qq/group_join.c:258
 msgid "Your authorization request has been accepted by the QQ server"
 msgstr "Din auktoriseringsoperation har accepterats av QQ-servern"
 
-#: ../libpurple/protocols/qq/group_join.c:329
 msgid "You entered a group ID outside the acceptable range"
 msgstr "Du angav ett gruppID utanför det tillåtna intervallet"
 
-#: ../libpurple/protocols/qq/group_join.c:360
 msgid "Are you sure you want to leave this Qun?"
 msgstr "Är du säker på att du vill ta bort %s?"
 
-#: ../libpurple/protocols/qq/group_join.c:362
 msgid ""
 "Note, if you are the creator, \n"
 "this operation will eventually remove this Qun."
@@ -9767,158 +7008,118 @@
 "Notera att om du är skaparen, \n"
 "denna operation kommer till slut ta bort detta Qun."
 
-#: ../libpurple/protocols/qq/group_network.c:92
 #, c-format
 msgid "Code [0x%02X]: %s"
 msgstr "Kod [0x%02X]: %s"
 
-#: ../libpurple/protocols/qq/group_network.c:93
 msgid "Group Operation Error"
 msgstr "Gruppoperationsfel"
 
 #. we want to see window
-#: ../libpurple/protocols/qq/group_opt.c:124
-#: ../libpurple/protocols/qq/sys_msg.c:87
 msgid "Do you want to approve the request?"
 msgstr "Vill du godkänna förfrågan?"
 
-#: ../libpurple/protocols/qq/group_opt.c:137
 msgid "Enter your reason:"
 msgstr "Ange din anledning"
 
-#: ../libpurple/protocols/qq/group_opt.c:235
 msgid "You have successfully modified Qun member"
 msgstr "Du har problemfritt ändrat Qun-medlemmen"
 
-#: ../libpurple/protocols/qq/group_opt.c:305
 msgid "You have successfully modified Qun information"
 msgstr "Du har problemfritt ändrat Qun-informationen"
 
-#: ../libpurple/protocols/qq/group_opt.c:392
 msgid "You have successfully created a Qun"
 msgstr "Du har problemfritt skapat ett Qun"
 
-#: ../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
-#: ../libpurple/protocols/qq/group_opt.c:398
 msgid "Setup"
 msgstr "Ange"
 
-#: ../libpurple/protocols/qq/im.c:432
 msgid "System Message"
 msgstr "Systemmeddelande"
 
-#: ../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"
 msgstr "Problem att hålla vid liv"
 
-#: ../libpurple/protocols/qq/login_logout.c:408
 msgid "Error requesting login token"
 msgstr "Problem att efterfråga inloggningsmarkör"
 
-#: ../libpurple/protocols/qq/login_logout.c:488
 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
-#: ../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."
 
-#: ../libpurple/protocols/qq/qq.c:186
 #, c-format
 msgid "Unknown-%d"
 msgstr "Okänd-%d"
 
-#: ../libpurple/protocols/qq/qq.c:211
 msgid "TCP Address"
 msgstr "TCP-adress"
 
-#: ../libpurple/protocols/qq/qq.c:213
 msgid "UDP Address"
 msgstr "UDP-adress"
 
-#: ../libpurple/protocols/qq/qq.c:242
 msgid "Level"
 msgstr "Nivå"
 
-#: ../libpurple/protocols/qq/qq.c:373
 msgid "Invalid name"
 msgstr "Ogiltigt namn"
 
-#: ../libpurple/protocols/qq/qq.c:439
 #, c-format
 msgid "<b>Current Online</b>: %d<br>\n"
 msgstr "<b>Online just nu</b>: %d<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:440
 #, c-format
 msgid "<b>Last Refresh</b>: %s<br>\n"
 msgstr "<b>Senast uppdatering</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:444
 #, c-format
 msgid "<b>Connection Mode</b>: %s<br>\n"
 msgstr "<b>Anslutningsläge</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:445
 #, 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:446
 #, c-format
 msgid "<b>My Public IP</b>: %s<br>\n"
 msgstr "<b>Mit publika IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:451
 #, c-format
 msgid "<b>Login Time</b>: %s<br>\n"
 msgstr "<b>Anslutningsnamn</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:452
 #, c-format
 msgid "<b>Last Login IP</b>: %s<br>\n"
 msgstr "<b>Senaste login IP</b>: %s<br>\n"
 
-#: ../libpurple/protocols/qq/qq.c:453
 #, c-format
 msgid "<b>Last Login Time</b>: %s\n"
 msgstr "<b>Senast login tid</b>: %s\n"
 
-#: ../libpurple/protocols/qq/qq.c:457
 msgid "Login Information"
 msgstr "Inloggningsinformation"
 
-#: ../libpurple/protocols/qq/qq.c:533
 msgid "Set My Information"
 msgstr "Ange min information"
 
-#: ../libpurple/protocols/qq/qq.c:536
-#: ../libpurple/protocols/toc/toc.c:1680
 msgid "Change Password"
 msgstr "Byt lösenord"
 
-#: ../libpurple/protocols/qq/qq.c:539
 msgid "Show Login Information"
 msgstr "Visa inloggningsinformation"
 
-#: ../libpurple/protocols/qq/qq.c:560
 msgid "Leave this QQ Qun"
 msgstr "Gå ur denna QQ Qun"
 
-#: ../libpurple/protocols/qq/qq.c:584
 msgid "Block this buddy"
 msgstr "Blockera denna kompis"
 
@@ -9932,334 +7133,273 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/qq/qq.c:725
-#: ../libpurple/protocols/qq/qq.c:727
 msgid "QQ Protocol\tPlugin"
 msgstr "QQ protokoll\tmodul"
 
-#: ../libpurple/protocols/qq/qq.c:752
 msgid "Connect using TCP"
 msgstr "Ansluter med TCP"
 
-#: ../libpurple/protocols/qq/recv_core.c:309
 msgid "Socket error"
 msgstr "Uttag-fel"
 
-#: ../libpurple/protocols/qq/recv_core.c:319
 msgid "Unable to read from socket"
 msgstr "Kan inte läsa från uttag"
 
-#: ../libpurple/protocols/qq/send_file.c:707
 #, c-format
 msgid "%d has declined the file %s"
 msgstr "%d har har nekat filen %s"
 
-#: ../libpurple/protocols/qq/send_file.c:710
-#: ../libpurple/protocols/qq/send_file.c:739
 msgid "File Send"
 msgstr "Filsändning"
 
-#: ../libpurple/protocols/qq/send_file.c:736
 #, c-format
 msgid "%d canceled the transfer of %s"
 msgstr "%d avbröt överföringen av %s"
 
-#: ../libpurple/protocols/qq/sendqueue.c:123
 msgid "Connection lost"
 msgstr "Anslutningen tappades"
 
-#. cancel login progress
-#: ../libpurple/protocols/qq/sendqueue.c:131
 msgid "Login failed, no reply"
 msgstr "Inloggningen misslyckades, inget svar"
 
-#: ../libpurple/protocols/qq/sys_msg.c:110
 msgid "Do you want to add this buddy?"
 msgstr "Vill du lägga till den här kompisen?"
 
 #. only need to get value
-#: ../libpurple/protocols/qq/sys_msg.c:166
 #, c-format
 msgid "You have been added by %s"
 msgstr "Du har lagts till av %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:169
-#: ../libpurple/protocols/qq/sys_msg.c:263
 msgid "Would you like to add him?"
 msgstr "Vill du lägga till honom?"
 
-#: ../libpurple/protocols/qq/sys_msg.c:176
 #, c-format
 msgid "%s has added you [%s] to his or her buddy list"
 msgstr "%s har lagt till dig [%s] till sin kompislista"
 
-#: ../libpurple/protocols/qq/sys_msg.c:192
 #, c-format
 msgid "User %s rejected your request"
 msgstr "Användaren %s avslog din förfrågan"
 
-#: ../libpurple/protocols/qq/sys_msg.c:212
 #, c-format
 msgid "User %s approved your request"
 msgstr "Användaren %s godkände din förfrågan"
 
 #. TODO: this should go through purple_account_request_authorization()
-#: ../libpurple/protocols/qq/sys_msg.c:238
 #, c-format
 msgid "%s wants to add you [%s] as a friend"
 msgstr "%s vill lägga till dig [%s] som en vän"
 
-#: ../libpurple/protocols/qq/sys_msg.c:239
 #, c-format
 msgid "Message: %s"
 msgstr "Meddelande: %s"
 
-#: ../libpurple/protocols/qq/sys_msg.c:261
 #, c-format
 msgid "%s is not in your buddy list"
 msgstr "%s finns inte på din kompislista"
 
-#: ../libpurple/protocols/sametime/sametime.c:417
 msgid "Connection closed (writing)"
 msgstr "Anslutningen stängd (skrivande)"
 
-#: ../libpurple/protocols/sametime/sametime.c:1290
 #, c-format
 msgid "<b>Group Title:</b> %s<br>"
 msgstr "<b>Grupptitel:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1291
 #, c-format
 msgid "<b>Notes Group ID:</b> %s<br>"
 msgstr "<b>Notes gruppID:</b> %s<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:1293
 #, c-format
 msgid "Info for Group %s"
 msgstr "Information om gruppen %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1295
 msgid "Notes Address Book Information"
 msgstr "Notes adressboksinformation"
 
-#: ../libpurple/protocols/sametime/sametime.c:1327
 msgid "Invite Group to Conference..."
 msgstr "Bjud in grupp till konferensen..."
 
-#: ../libpurple/protocols/sametime/sametime.c:1337
 msgid "Get Notes Address Book Info"
 msgstr "Hämta Notes adressboksinformation"
 
-#: ../libpurple/protocols/sametime/sametime.c:1504
 msgid "Sending Handshake"
 msgstr "Skickar handskakning"
 
-#: ../libpurple/protocols/sametime/sametime.c:1509
 msgid "Waiting for Handshake Acknowledgement"
 msgstr "Väntar på bekräftelse av handskakning"
 
-#: ../libpurple/protocols/sametime/sametime.c:1514
 msgid "Handshake Acknowledged, Sending Login"
 msgstr "Handskakning bekräftad, sänder inloggning"
 
-#: ../libpurple/protocols/sametime/sametime.c:1519
 msgid "Waiting for Login Acknowledgement"
 msgstr "Väntar på bekräftelse av inloggning"
 
-#: ../libpurple/protocols/sametime/sametime.c:1524
 msgid "Login Redirected"
 msgstr "Anslutningen vidarebefordrad"
 
-#: ../libpurple/protocols/sametime/sametime.c:1530
 msgid "Forcing Login"
 msgstr "Tvingar inloggning"
 
-#: ../libpurple/protocols/sametime/sametime.c:1534
 msgid "Login Acknowledged"
 msgstr "Inloggning bekräftad"
 
-#: ../libpurple/protocols/sametime/sametime.c:1539
 msgid "Starting Services"
 msgstr "Startar tjänster"
 
-#: ../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
+#, 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"
+
 msgid "Sametime Administrator Announcement"
 msgstr "Sametimeadministratörannonsering"
 
-#: ../libpurple/protocols/sametime/sametime.c:1702
 msgid "Connection reset"
 msgstr "Anslutningen nollställd"
 
-#: ../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
-#: ../libpurple/protocols/sametime/sametime.c:1732
-#: ../libpurple/protocols/sametime/sametime.c:3726
 msgid "Unable to connect to host"
 msgstr "Kan inte ansluta till värd"
 
-#: ../libpurple/protocols/sametime/sametime.c:1770
 #, c-format
 msgid "Announcement from %s"
 msgstr "Utskick från %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:1944
 msgid "Conference Closed"
 msgstr "Konferansen är stängd"
 
-#: ../libpurple/protocols/sametime/sametime.c:2403
 msgid "Unable to send message: "
 msgstr "Kan inte skicka meddelande: "
 
-#: ../libpurple/protocols/sametime/sametime.c:2959
 msgid "Place Closed"
 msgstr "Platsen är stängd"
 
-#: ../libpurple/protocols/sametime/sametime.c:3229
 msgid "Microphone"
 msgstr "Mikrofon"
 
-#: ../libpurple/protocols/sametime/sametime.c:3230
 msgid "Speakers"
 msgstr "Högtalare"
 
-#: ../libpurple/protocols/sametime/sametime.c:3231
 msgid "Video Camera"
 msgstr "Videokamera"
 
-#: ../libpurple/protocols/sametime/sametime.c:3269
-#: ../libpurple/protocols/sametime/sametime.c:4145
 msgid "Supports"
 msgstr "Stödjer"
 
-#: ../libpurple/protocols/sametime/sametime.c:3274
-#: ../libpurple/protocols/sametime/sametime.c:4119
 msgid "External User"
 msgstr "Extern användare"
 
-#: ../libpurple/protocols/sametime/sametime.c:3380
 msgid "Create conference with user"
 msgstr "Skapa konferens med användare"
 
-#: ../libpurple/protocols/sametime/sametime.c:3381
-#, 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:3385
+#, 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"
+
 msgid "New Conference"
 msgstr "Ny konferens"
 
-#: ../libpurple/protocols/sametime/sametime.c:3387
 msgid "Create"
 msgstr "Skapa"
 
-#: ../libpurple/protocols/sametime/sametime.c:3452
 msgid "Available Conferences"
 msgstr "Tillgängliga konferenser"
 
-#: ../libpurple/protocols/sametime/sametime.c:3458
 msgid "Create New Conference..."
 msgstr "Skapa ny konferens..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3465
 msgid "Invite user to a conference"
 msgstr "Bjud in användaren till en konferens"
 
-#: ../libpurple/protocols/sametime/sametime.c:3466
-#, 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:3471
+#, 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."
+
 msgid "Invite to Conference"
 msgstr "Bjud in till konferens"
 
-#: ../libpurple/protocols/sametime/sametime.c:3562
 msgid "Invite to Conference..."
 msgstr "Bjud in till konferens..."
 
-#: ../libpurple/protocols/sametime/sametime.c:3567
 msgid "Send TEST Announcement"
 msgstr "Skicka TEST-annonsering"
 
-#: ../libpurple/protocols/sametime/sametime.c:3586
-#: ../pidgin/gtkconv.c:4434
 msgid "Topic:"
 msgstr "Ämne:"
 
-#: ../libpurple/protocols/sametime/sametime.c:3614
 msgid "No Sametime Community Server specified"
 msgstr "Ingen Sametime communityserver specificerad"
 
-#: ../libpurple/protocols/sametime/sametime.c:3636
-#, 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:3641
+#, 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."
+
 msgid "Meanwhile Connection Setup"
 msgstr "Meanwhile anslutningsinställningar"
 
-#: ../libpurple/protocols/sametime/sametime.c:3642
 msgid "No Sametime Community Server Specified"
 msgstr "Ingen Sametime communityserver specificerad"
 
-#: ../libpurple/protocols/sametime/sametime.c:3644
-#: ../pidgin/gtkblist.c:4372
 msgid "Connect"
 msgstr "Anslut"
 
-#: ../libpurple/protocols/sametime/sametime.c:4135
 #, c-format
 msgid "Unknown (0x%04x)<br>"
 msgstr "Okänd (0x%04x)<br>"
 
-#: ../libpurple/protocols/sametime/sametime.c:4137
 msgid "Last Known Client"
 msgstr "Senast kända klient"
 
-#: ../libpurple/protocols/sametime/sametime.c:4301
-#: ../libpurple/protocols/sametime/sametime.c:5506
 msgid "User Name"
 msgstr "Användarnamn"
 
-#: ../libpurple/protocols/sametime/sametime.c:4304
-#: ../libpurple/protocols/sametime/sametime.c:5509
 msgid "Sametime ID"
 msgstr "Sametime ID"
 
-#: ../libpurple/protocols/sametime/sametime.c:4328
 msgid "An ambiguous user ID was entered"
 msgstr "Ett svårförståligt användarid angavs"
 
-#: ../libpurple/protocols/sametime/sametime.c:4329
-#, 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:4334
+#, 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."
+
 msgid "Select User"
 msgstr "Välj användare"
 
-#: ../libpurple/protocols/sametime/sametime.c:4418
 msgid "Unable to add user: user not found"
 msgstr "Kan inte lägga till användaren: användaren ej funnen"
 
-#: ../libpurple/protocols/sametime/sametime.c:4420
-#, 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:5011
+#, 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."
+
 #, c-format
 msgid ""
 "Error reading file %s: \n"
@@ -10268,239 +7408,180 @@
 "Fel vid läsning av %s:\n"
 "%s.\n"
 
-#: ../libpurple/protocols/sametime/sametime.c:5146
 msgid "Remotely Stored Buddy List"
 msgstr "Fjärrlagrad kompislista"
 
-#: ../libpurple/protocols/sametime/sametime.c:5151
 msgid "Buddy List Storage Mode"
 msgstr "Lagringsläge för kompislista"
 
-#: ../libpurple/protocols/sametime/sametime.c:5154
 msgid "Local Buddy List Only"
 msgstr "Lokal kompislista enbart"
 
-#: ../libpurple/protocols/sametime/sametime.c:5156
 msgid "Merge List from Server"
 msgstr "Slå ihop lista från server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5158
 msgid "Merge and Save List to Server"
 msgstr "Slå ihop och lagra listan på server"
 
-#: ../libpurple/protocols/sametime/sametime.c:5160
 msgid "Synchronize List with Server"
 msgstr "Synkronizera listan med servern"
 
-#: ../libpurple/protocols/sametime/sametime.c:5215
 #, c-format
 msgid "Import Sametime List for Account %s"
 msgstr "Importera Sametimelista för kontot %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5255
 #, c-format
 msgid "Export Sametime List for Account %s"
 msgstr "Exportera Sametimelista för kontot %s"
 
-#: ../libpurple/protocols/sametime/sametime.c:5309
 msgid "Unable to add group: group exists"
 msgstr "Kunde inte lägga till gruppen: gruppen existerar redan"
 
-#: ../libpurple/protocols/sametime/sametime.c:5310
 #, c-format
 msgid "A group named '%s' already exists in your buddy list."
 msgstr "En grupp vid namn '%s' finns redan i din kompislista."
 
-#: ../libpurple/protocols/sametime/sametime.c:5313
-#: ../libpurple/protocols/sametime/sametime.c:5443
 msgid "Unable to add group"
 msgstr "Kan inte lägga till grupp"
 
-#: ../libpurple/protocols/sametime/sametime.c:5372
 msgid "Possible Matches"
 msgstr "Möjliga matchningar"
 
-#: ../libpurple/protocols/sametime/sametime.c:5388
 msgid "Notes Address Book group results"
 msgstr "Notes adressboksgruppresultat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5389
-#, 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:5394
+#, 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."
+
 msgid "Select Notes Address Book"
 msgstr "Välj Notes adressbok"
 
-#: ../libpurple/protocols/sametime/sametime.c:5437
 msgid "Unable to add group: group not found"
 msgstr "Kunde inte lägga till grupp: gruppen ej funnen"
 
-#: ../libpurple/protocols/sametime/sametime.c:5439
-#, 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:5480
+#, 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."
+
 msgid "Notes Address Book Group"
 msgstr "Notes adressboksgrupp"
 
-#: ../libpurple/protocols/sametime/sametime.c:5481
-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:5530
+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."
+
 #, c-format
 msgid "Search results for '%s'"
 msgstr "Sökresultat för '%s'"
 
-#: ../libpurple/protocols/sametime/sametime.c:5531
-#, 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."
-
-#: ../libpurple/protocols/sametime/sametime.c:5538
-#: ../pidgin/gtknotify.c:762
+#, 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."
+
 msgid "Search Results"
 msgstr "Sökresultat"
 
-#: ../libpurple/protocols/sametime/sametime.c:5563
 msgid "No matches"
 msgstr "Ingen träff"
 
-#: ../libpurple/protocols/sametime/sametime.c:5564
 #, 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."
 
-#: ../libpurple/protocols/sametime/sametime.c:5568
 msgid "No Matches"
 msgstr "Ingen träff"
 
-#: ../libpurple/protocols/sametime/sametime.c:5605
 msgid "Search for a user"
 msgstr "Sök efter en användare"
 
-#: ../libpurple/protocols/sametime/sametime.c:5606
-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:5609
+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."
+
 msgid "User Search"
 msgstr "Användarsökning"
 
-#: ../libpurple/protocols/sametime/sametime.c:5622
 msgid "Import Sametime List..."
 msgstr "Importera Sametime lista..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5626
 msgid "Export Sametime List..."
 msgstr "Exportera Sametime lista..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5630
 msgid "Add Notes Address Book Group..."
 msgstr "Lägg till Notes adressboksgrupp..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5634
 msgid "User Search..."
 msgstr "Användarsökning..."
 
-#: ../libpurple/protocols/sametime/sametime.c:5740
 msgid "Force login (ignore server redirects)"
 msgstr "Tvinga inloggning (ignorera server-vidarebefodringar)"
 
 #. pretend to be Sametime Connect
-#: ../libpurple/protocols/sametime/sametime.c:5750
 msgid "Hide client identity"
 msgstr "Göm klientidentitet"
 
-#: ../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"
 
-#: ../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"
 
-#: ../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"
 
-#: ../libpurple/protocols/silc/buddy.c:111
-#: ../libpurple/protocols/silc10/buddy.c:116
 msgid "Error occurred during key agreement"
 msgstr "Fel uppstod under nyckelöverenskommelse"
 
-#: ../libpurple/protocols/silc/buddy.c:115
-#: ../libpurple/protocols/silc10/buddy.c:120
 msgid "Key Agreement failed"
 msgstr "Nyckelöverenskommelsen misslyckades"
 
-#: ../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"
 
-#: ../libpurple/protocols/silc/buddy.c:125
-#: ../libpurple/protocols/silc10/buddy.c:130
 msgid "Key agreement was aborted"
 msgstr "Nyckelöverenskommelsen var avbruten"
 
-#: ../libpurple/protocols/silc/buddy.c:130
-#: ../libpurple/protocols/silc10/buddy.c:135
 msgid "Key agreement is already started"
 msgstr "Nyckelöverenskommelse har redan startats"
 
-#: ../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"
 
-#: ../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"
 
-#: ../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 ""
+"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?"
+
 #, c-format
 msgid ""
 "The remote user is waiting key agreement on:\n"
@@ -10511,910 +7592,485 @@
 "Fjärrdator: %s\n"
 "Fjärrport: %d"
 
-#: ../libpurple/protocols/silc/buddy.c:315
-#: ../libpurple/protocols/silc10/buddy.c:312
 msgid "Key Agreement Request"
 msgstr "Nyckelöverenskommelseförfrågan"
 
-#: ../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"
 
-#: ../libpurple/protocols/silc/buddy.c:413
-#: ../libpurple/protocols/silc10/buddy.c:424
 msgid "Cannot set IM key"
 msgstr "Kan inte sätta IM-nyckel"
 
-#: ../libpurple/protocols/silc/buddy.c:453
-#: ../libpurple/protocols/silc10/buddy.c:466
 msgid "Set IM Password"
 msgstr "Sätt IM-lösenord"
 
-#: ../libpurple/protocols/silc/buddy.c:496
-#: ../libpurple/protocols/silc/buddy.c:507
-#: ../libpurple/protocols/silc/buddy.c:540
-#: ../libpurple/protocols/silc/ops.c:1503
-#: ../libpurple/protocols/silc/ops.c:1514
-#: ../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"
 
-#: ../libpurple/protocols/silc/buddy.c:541
-#: ../libpurple/protocols/silc/ops.c:1504
-#: ../libpurple/protocols/silc/ops.c:1515
-#: ../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"
 
-#: ../libpurple/protocols/silc/buddy.c:622
-#: ../libpurple/protocols/silc/buddy.c:1658
-#: ../libpurple/protocols/silc10/buddy.c:635
-#: ../libpurple/protocols/silc10/buddy.c:1657
 msgid "Show Public Key"
 msgstr "Visa publik nyckel"
 
-#: ../libpurple/protocols/silc/buddy.c:623
-#: ../libpurple/protocols/silc/buddy.c:1030
-#: ../libpurple/protocols/silc/chat.c:239
-#: ../libpurple/protocols/silc10/buddy.c:636
-#: ../libpurple/protocols/silc10/buddy.c:1036
-#: ../libpurple/protocols/silc10/chat.c:237
 msgid "Could not load public key"
 msgstr "Kunde inte ladda publik nyckel"
 
-#: ../libpurple/protocols/silc/buddy.c:701
-#: ../libpurple/protocols/silc/ops.c:1053
-#: ../libpurple/protocols/silc/ops.c:1168
-#: ../libpurple/protocols/silc/ops.c:1290
-#: ../libpurple/protocols/silc/ops.c:1291
-#: ../libpurple/protocols/silc/ops.c:1309
-#: ../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"
 
-#: ../libpurple/protocols/silc/buddy.c:702
-#: ../libpurple/protocols/silc/ops.c:1169
-#: ../libpurple/protocols/silc/ops.c:1310
-#: ../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"
 
-#: ../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"
 
-#: ../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."
+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.
-#: ../libpurple/protocols/silc/buddy.c:1062
-#: ../libpurple/protocols/silc10/buddy.c:1070
 msgid "Open..."
 msgstr "Öppna..."
 
-#: ../libpurple/protocols/silc/buddy.c:1073
-#: ../libpurple/protocols/silc10/buddy.c:1081
 #, c-format
 msgid "The %s buddy is not present in the network"
 msgstr "%s kompisenär inte tillgänglig på nätverket"
 
-#: ../libpurple/protocols/silc/buddy.c:1076
-#: ../libpurple/protocols/silc10/buddy.c:1084
-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:1080
-#: ../libpurple/protocols/silc10/buddy.c:1088
+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."
+
 msgid "_Import..."
 msgstr "_Importera..."
 
-#: ../libpurple/protocols/silc/buddy.c:1186
-#: ../libpurple/protocols/silc10/buddy.c:1184
 msgid "Select correct user"
 msgstr "Välj rätt användare"
 
-#: ../libpurple/protocols/silc/buddy.c:1188
-#: ../libpurple/protocols/silc10/buddy.c:1186
-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:1190
-#: ../libpurple/protocols/silc10/buddy.c:1188
-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:1477
-#: ../libpurple/protocols/silc10/buddy.c:1477
+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."
+
+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."
+
 msgid "Detached"
 msgstr "Frånskild"
 
-#: ../libpurple/protocols/silc/buddy.c:1481
-#: ../libpurple/protocols/silc/silc.c:58
-#: ../libpurple/protocols/silc10/buddy.c:1481
-#: ../libpurple/protocols/silc10/silc.c:49
 msgid "Indisposed"
 msgstr "Otillgänglig"
 
-#: ../libpurple/protocols/silc/buddy.c:1485
-#: ../libpurple/protocols/silc/silc.c:60
-#: ../libpurple/protocols/silc10/buddy.c:1485
-#: ../libpurple/protocols/silc10/silc.c:51
 msgid "Wake Me Up"
 msgstr "Väck mig"
 
-#: ../libpurple/protocols/silc/buddy.c:1487
-#: ../libpurple/protocols/silc/silc.c:52
-#: ../libpurple/protocols/silc10/buddy.c:1487
-#: ../libpurple/protocols/silc10/silc.c:43
 msgid "Hyper Active"
 msgstr "Hyperaktiv"
 
-#: ../libpurple/protocols/silc/buddy.c:1489
-#: ../libpurple/protocols/silc10/buddy.c:1489
 msgid "Robot"
 msgstr "Robot"
 
-#: ../libpurple/protocols/silc/buddy.c:1496
-#: ../libpurple/protocols/silc/silc.c:874
-#: ../libpurple/protocols/silc/util.c:520
-#: ../libpurple/protocols/silc10/buddy.c:1496
-#: ../libpurple/protocols/silc10/silc.c:654
-#: ../libpurple/protocols/silc10/util.c:512
 msgid "Happy"
 msgstr "Glad"
 
-#: ../libpurple/protocols/silc/buddy.c:1498
-#: ../libpurple/protocols/silc/silc.c:876
-#: ../libpurple/protocols/silc/util.c:522
-#: ../libpurple/protocols/silc10/buddy.c:1498
-#: ../libpurple/protocols/silc10/silc.c:656
-#: ../libpurple/protocols/silc10/util.c:514
 msgid "Sad"
 msgstr "Ledsen"
 
-#: ../libpurple/protocols/silc/buddy.c:1500
-#: ../libpurple/protocols/silc/silc.c:878
-#: ../libpurple/protocols/silc/util.c:524
-#: ../libpurple/protocols/silc10/buddy.c:1500
-#: ../libpurple/protocols/silc10/silc.c:658
-#: ../libpurple/protocols/silc10/util.c:516
 msgid "Angry"
 msgstr "Arg"
 
-#: ../libpurple/protocols/silc/buddy.c:1502
-#: ../libpurple/protocols/silc/silc.c:880
-#: ../libpurple/protocols/silc/util.c:526
-#: ../libpurple/protocols/silc10/buddy.c:1502
-#: ../libpurple/protocols/silc10/silc.c:660
-#: ../libpurple/protocols/silc10/util.c:518
 msgid "Jealous"
 msgstr "Avundsjuk"
 
-#: ../libpurple/protocols/silc/buddy.c:1504
-#: ../libpurple/protocols/silc/silc.c:882
-#: ../libpurple/protocols/silc/util.c:528
-#: ../libpurple/protocols/silc10/buddy.c:1504
-#: ../libpurple/protocols/silc10/silc.c:662
-#: ../libpurple/protocols/silc10/util.c:520
 msgid "Ashamed"
 msgstr "Skäms"
 
-#: ../libpurple/protocols/silc/buddy.c:1506
-#: ../libpurple/protocols/silc/silc.c:884
-#: ../libpurple/protocols/silc/util.c:530
-#: ../libpurple/protocols/silc10/buddy.c:1506
-#: ../libpurple/protocols/silc10/silc.c:664
-#: ../libpurple/protocols/silc10/util.c:522
 msgid "Invincible"
 msgstr "Osårbar"
 
-#: ../libpurple/protocols/silc/buddy.c:1508
-#: ../libpurple/protocols/silc/util.c:532
-#: ../libpurple/protocols/silc10/buddy.c:1508
-#: ../libpurple/protocols/silc10/util.c:524
 msgid "In Love"
 msgstr "Kär"
 
-#: ../libpurple/protocols/silc/buddy.c:1510
-#: ../libpurple/protocols/silc/silc.c:888
-#: ../libpurple/protocols/silc/util.c:534
-#: ../libpurple/protocols/silc10/buddy.c:1510
-#: ../libpurple/protocols/silc10/silc.c:668
-#: ../libpurple/protocols/silc10/util.c:526
 msgid "Sleepy"
 msgstr "Sömnig"
 
-#: ../libpurple/protocols/silc/buddy.c:1512
-#: ../libpurple/protocols/silc/silc.c:890
-#: ../libpurple/protocols/silc/util.c:536
-#: ../libpurple/protocols/silc10/buddy.c:1512
-#: ../libpurple/protocols/silc10/silc.c:670
-#: ../libpurple/protocols/silc10/util.c:528
 msgid "Bored"
 msgstr "Uttråkad"
 
-#: ../libpurple/protocols/silc/buddy.c:1514
-#: ../libpurple/protocols/silc/silc.c:892
-#: ../libpurple/protocols/silc/util.c:538
-#: ../libpurple/protocols/silc10/buddy.c:1514
-#: ../libpurple/protocols/silc10/silc.c:672
-#: ../libpurple/protocols/silc10/util.c:530
 msgid "Excited"
 msgstr "Upphetsad"
 
-#: ../libpurple/protocols/silc/buddy.c:1516
-#: ../libpurple/protocols/silc/silc.c:894
-#: ../libpurple/protocols/silc/util.c:540
-#: ../libpurple/protocols/silc10/buddy.c:1516
-#: ../libpurple/protocols/silc10/silc.c:674
-#: ../libpurple/protocols/silc10/util.c:532
 msgid "Anxious"
 msgstr "Orolig"
 
-#: ../libpurple/protocols/silc/buddy.c:1548
-#: ../libpurple/protocols/silc/ops.c:1207
-#: ../libpurple/protocols/silc10/buddy.c:1548
-#: ../libpurple/protocols/silc10/ops.c:1202
 msgid "User Modes"
 msgstr "Användarlägen"
 
-#: ../libpurple/protocols/silc/buddy.c:1565
-#: ../libpurple/protocols/silc/ops.c:1224
-#: ../libpurple/protocols/silc10/buddy.c:1565
-#: ../libpurple/protocols/silc10/ops.c:1219
 msgid "Preferred Contact"
 msgstr "Föredragen kontakt"
 
-#: ../libpurple/protocols/silc/buddy.c:1570
-#: ../libpurple/protocols/silc/ops.c:1229
-#: ../libpurple/protocols/silc10/buddy.c:1570
-#: ../libpurple/protocols/silc10/ops.c:1224
 msgid "Preferred Language"
 msgstr "Föredraget språk"
 
-#: ../libpurple/protocols/silc/buddy.c:1575
-#: ../libpurple/protocols/silc/ops.c:1234
-#: ../libpurple/protocols/silc10/buddy.c:1575
-#: ../libpurple/protocols/silc10/ops.c:1229
 msgid "Device"
 msgstr "Enhet"
 
-#: ../libpurple/protocols/silc/buddy.c:1580
-#: ../libpurple/protocols/silc/ops.c:1239
-#: ../libpurple/protocols/silc10/buddy.c:1580
-#: ../libpurple/protocols/silc10/ops.c:1234
-#: ../libpurple/protocols/silc10/silc.c:722
-#: ../libpurple/protocols/silc10/silc.c:724
 msgid "Timezone"
 msgstr "Tidszon"
 
-#: ../libpurple/protocols/silc/buddy.c:1585
-#: ../libpurple/protocols/silc/ops.c:1244
-#: ../libpurple/protocols/silc10/buddy.c:1585
-#: ../libpurple/protocols/silc10/ops.c:1239
 msgid "Geolocation"
 msgstr "Geografisk plats"
 
-#: ../libpurple/protocols/silc/buddy.c:1641
-#: ../libpurple/protocols/silc10/buddy.c:1639
 msgid "Reset IM Key"
 msgstr "Nollställ IM-nyckel"
 
-#: ../libpurple/protocols/silc/buddy.c:1646
-#: ../libpurple/protocols/silc10/buddy.c:1645
 msgid "IM with Key Exchange"
 msgstr "IM med nyckelutbyte"
 
-#: ../libpurple/protocols/silc/buddy.c:1651
-#: ../libpurple/protocols/silc10/buddy.c:1650
 msgid "IM with Password"
 msgstr "IM med lösenord"
 
-#: ../libpurple/protocols/silc/buddy.c:1664
-#: ../libpurple/protocols/silc10/buddy.c:1663
 msgid "Get Public Key..."
 msgstr "Hämta publik nyckel..."
 
-#: ../libpurple/protocols/silc/buddy.c:1671
-#: ../libpurple/protocols/silc/ops.c:1612
-#: ../libpurple/protocols/silc10/buddy.c:1670
-#: ../libpurple/protocols/silc10/ops.c:1624
 msgid "Kill User"
 msgstr "Döda användare"
 
-#: ../libpurple/protocols/silc/buddy.c:1681
-#: ../libpurple/protocols/silc/chat.c:997
-#: ../libpurple/protocols/silc10/buddy.c:1680
-#: ../libpurple/protocols/silc10/chat.c:977
 msgid "Draw On Whiteboard"
 msgstr "Rita på whiteboard"
 
-#: ../libpurple/protocols/silc/chat.c:39
-#: ../libpurple/protocols/silc10/chat.c:39
 msgid "_Passphrase:"
 msgstr "_Lösenord:"
 
-#: ../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"
 
-#: ../libpurple/protocols/silc/chat.c:81
-#: ../libpurple/protocols/silc/chat.c:177
-#: ../libpurple/protocols/silc10/chat.c:81
-#: ../libpurple/protocols/silc10/chat.c:174
 msgid "Channel Information"
 msgstr "Kanalinformation"
 
-#: ../libpurple/protocols/silc/chat.c:82
-#: ../libpurple/protocols/silc10/chat.c:82
 msgid "Cannot get channel information"
 msgstr "Kan inte hämta kanalinformation"
 
-#: ../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"
 
-#: ../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"
 
-#: ../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"
 
-#: ../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
-#: ../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"
 
-#: ../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"
 
-#: ../libpurple/protocols/silc/chat.c:153
-#: ../libpurple/protocols/silc10/chat.c:152
 #, c-format
 msgid "<br><b>Channel Modes:</b> "
 msgstr "<br><b>Kanallägen:</b> "
 
-#: ../libpurple/protocols/silc/chat.c:167
-#: ../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"
 
-#: ../libpurple/protocols/silc/chat.c:168
-#: ../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"
 
-#: ../libpurple/protocols/silc/chat.c:238
-#: ../libpurple/protocols/silc10/chat.c:236
 msgid "Add Channel Public Key"
 msgstr "Lägg till kanalpublik nyckel"
 
 #. Add new public key
-#: ../libpurple/protocols/silc/chat.c:306
-#: ../libpurple/protocols/silc10/chat.c:291
 msgid "Open Public Key..."
 msgstr "Öppna publik nyckel..."
 
-#: ../libpurple/protocols/silc/chat.c:425
-#: ../libpurple/protocols/silc10/chat.c:401
 msgid "Channel Passphrase"
 msgstr "Kanalens lösenord"
 
-#: ../libpurple/protocols/silc/chat.c:432
-#: ../libpurple/protocols/silc10/chat.c:408
 msgid "Channel Public Keys List"
 msgstr "Kanalpublik nyckellista"
 
-#: ../libpurple/protocols/silc/chat.c:437
-#: ../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 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:446
-#: ../libpurple/protocols/silc/chat.c:447
-#: ../libpurple/protocols/silc/chat.c:483
-#: ../libpurple/protocols/silc/chat.c:484
-#: ../libpurple/protocols/silc/chat.c:931
-#: ../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
+#, c-format
+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."
+
 msgid "Channel Authentication"
 msgstr "Kanalautentisering"
 
-#: ../libpurple/protocols/silc/chat.c:448
-#: ../libpurple/protocols/silc/chat.c:485
-#: ../libpurple/protocols/silc10/chat.c:424
-#: ../libpurple/protocols/silc10/chat.c:463
 msgid "Add / Remove"
 msgstr "Lägg till/Ta bort"
 
-#: ../libpurple/protocols/silc/chat.c:601
-#: ../libpurple/protocols/silc10/chat.c:581
 msgid "Group Name"
 msgstr "Gruppnamn"
 
-#: ../libpurple/protocols/silc/chat.c:605
-#: ../libpurple/protocols/silc/ops.c:1817
-#: ../libpurple/protocols/silc/silc.c:1151
-#: ../libpurple/protocols/silc10/chat.c:585
-#: ../libpurple/protocols/silc10/ops.c:1901
-#: ../libpurple/protocols/silc10/silc.c:931
 msgid "Passphrase"
 msgstr "Lösenord"
 
-#: ../libpurple/protocols/silc/chat.c:616
-#: ../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."
 
-#: ../libpurple/protocols/silc/chat.c:618
-#: ../libpurple/protocols/silc10/chat.c:598
 msgid "Add Channel Private Group"
 msgstr "Lägg till kanal-privat grupp"
 
-#: ../libpurple/protocols/silc/chat.c:746
-#: ../libpurple/protocols/silc10/chat.c:726
 msgid "User Limit"
 msgstr "Användargräns"
 
-#: ../libpurple/protocols/silc/chat.c:747
-#: ../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."
-
-#: ../libpurple/protocols/silc/chat.c:911
-#: ../libpurple/protocols/silc10/chat.c:891
+msgstr ""
+"Antalet användare begränsat på kanal. Sätt till noll för att nollställa "
+"användargräns."
+
 msgid "Invite List"
 msgstr "Gästlista"
 
-#: ../libpurple/protocols/silc/chat.c:916
-#: ../libpurple/protocols/silc10/chat.c:896
 msgid "Ban List"
 msgstr "Spärrlista"
 
-#: ../libpurple/protocols/silc/chat.c:924
-#: ../libpurple/protocols/silc10/chat.c:904
 msgid "Add Private Group"
 msgstr "Lägg till privat grupp"
 
-#: ../libpurple/protocols/silc/chat.c:937
-#: ../libpurple/protocols/silc10/chat.c:917
 msgid "Reset Permanent"
 msgstr "Nollställ Permanent"
 
-#: ../libpurple/protocols/silc/chat.c:942
-#: ../libpurple/protocols/silc10/chat.c:922
 msgid "Set Permanent"
 msgstr "Sätt permanent"
 
-#: ../libpurple/protocols/silc/chat.c:950
-#: ../libpurple/protocols/silc10/chat.c:930
 msgid "Set User Limit"
 msgstr "Sätt användarbegränsning"
 
-#: ../libpurple/protocols/silc/chat.c:956
-#: ../libpurple/protocols/silc10/chat.c:936
 msgid "Reset Topic Restriction"
 msgstr "Nollställ ämnesrestriktioner"
 
-#: ../libpurple/protocols/silc/chat.c:961
-#: ../libpurple/protocols/silc10/chat.c:941
 msgid "Set Topic Restriction"
 msgstr "Sätt Ämnesestriktioner"
 
-#: ../libpurple/protocols/silc/chat.c:968
-#: ../libpurple/protocols/silc10/chat.c:948
 msgid "Reset Private Channel"
 msgstr "Nollställ Privat Kanal"
 
-#: ../libpurple/protocols/silc/chat.c:973
-#: ../libpurple/protocols/silc10/chat.c:953
 msgid "Set Private Channel"
 msgstr "Sätt Privat Kanal"
 
-#: ../libpurple/protocols/silc/chat.c:980
-#: ../libpurple/protocols/silc10/chat.c:960
 msgid "Reset Secret Channel"
 msgstr "Nollställ Hemlig Kanal"
 
-#: ../libpurple/protocols/silc/chat.c:985
-#: ../libpurple/protocols/silc10/chat.c:965
 msgid "Set Secret Channel"
 msgstr "Sätt Hemlig Kanal"
 
-#: ../libpurple/protocols/silc/chat.c:1046
-#: ../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:1048
-#: ../libpurple/protocols/silc10/chat.c:1104
+#, 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"
+
 msgid "Join Private Group"
 msgstr "Anslut till privat grupp"
 
-#: ../libpurple/protocols/silc/chat.c:1049
-#: ../libpurple/protocols/silc10/chat.c:1105
 msgid "Cannot join private group"
 msgstr "Kunde inte ansluta till privat grupp"
 
-#: ../libpurple/protocols/silc/chat.c:1245
-#: ../libpurple/protocols/silc/silc.c:1348
-#: ../libpurple/protocols/silc10/chat.c:1299
-#: ../libpurple/protocols/silc10/silc.c:1137
 msgid "Call Command"
 msgstr "Uppringningskommando"
 
-#: ../libpurple/protocols/silc/chat.c:1245
-#: ../libpurple/protocols/silc/silc.c:1349
-#: ../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:1246
-#: ../libpurple/protocols/silc/silc.c:1350
-#: ../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:1144
-#: ../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>"
 
-#: ../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>"
 
-#: ../libpurple/protocols/silc/ops.c:1190
-#: ../libpurple/protocols/silc/ops.c:1328
-#: ../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"
 
-#: ../libpurple/protocols/silc/ops.c:1218
-#: ../libpurple/protocols/silc10/ops.c:1213
 msgid "Status Text"
 msgstr "Statustext"
 
-#: ../libpurple/protocols/silc/ops.c:1280
-#: ../libpurple/protocols/silc/ops.c:1354
-#: ../libpurple/protocols/silc10/ops.c:1285
-#: ../libpurple/protocols/silc10/ops.c:1357
 msgid "Public Key Fingerprint"
 msgstr "Publik nyckelfingeravtryck"
 
-#: ../libpurple/protocols/silc/ops.c:1281
-#: ../libpurple/protocols/silc/ops.c:1355
-#: ../libpurple/protocols/silc10/ops.c:1286
-#: ../libpurple/protocols/silc10/ops.c:1358
 msgid "Public Key Babbleprint"
 msgstr "Publik nyckelpladderavtryck"
 
-#: ../libpurple/protocols/silc/ops.c:1294
-#: ../libpurple/protocols/silc10/ops.c:1298
 msgid "_More..."
 msgstr "_Mer..."
 
-#: ../libpurple/protocols/silc/ops.c:1373
-#: ../libpurple/protocols/silc/silc.c:1208
-#: ../libpurple/protocols/silc10/ops.c:1371
-#: ../libpurple/protocols/silc10/silc.c:988
 msgid "Detach From Server"
 msgstr "Frånskilj från server"
 
-#: ../libpurple/protocols/silc/ops.c:1373
-#: ../libpurple/protocols/silc10/ops.c:1371
 msgid "Cannot detach"
 msgstr "Kan inte skilja"
 
-#: ../libpurple/protocols/silc/ops.c:1393
-#: ../libpurple/protocols/silc10/ops.c:1382
 msgid "Cannot set topic"
 msgstr "Kan inte ange kanalämne"
 
-#: ../libpurple/protocols/silc/ops.c:1422
-#: ../libpurple/protocols/silc10/ops.c:1414
 msgid "Failed to change nickname"
 msgstr "Kunde inte byta nick"
 
-#: ../libpurple/protocols/silc/ops.c:1471
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Roomlist"
 msgstr "Rumlista"
 
-#: ../libpurple/protocols/silc/ops.c:1471
-#: ../libpurple/protocols/silc10/ops.c:1462
 msgid "Cannot get room list"
 msgstr "Kan inte hämta rumlista"
 
-#: ../libpurple/protocols/silc/ops.c:1472
 msgid "Network is empty"
 msgstr "Nätverket är tomt"
 
-#: ../libpurple/protocols/silc/ops.c:1516
-#: ../libpurple/protocols/silc10/ops.c:1507
 msgid "No public key was received"
 msgstr "Ingen publik nyckel var mottagen"
 
-#: ../libpurple/protocols/silc/ops.c:1528
-#: ../libpurple/protocols/silc/ops.c:1541
-#: ../libpurple/protocols/silc10/ops.c:1519
-#: ../libpurple/protocols/silc10/ops.c:1532
 msgid "Server Information"
 msgstr "Serverinformation"
 
-#: ../libpurple/protocols/silc/ops.c:1529
-#: ../libpurple/protocols/silc10/ops.c:1520
 msgid "Cannot get server information"
 msgstr "Kan inte hämta serverinformation"
 
-#: ../libpurple/protocols/silc/ops.c:1552
-#: ../libpurple/protocols/silc10/ops.c:1549
-#: ../libpurple/protocols/silc10/ops.c:1558
 msgid "Server Statistics"
 msgstr "Serverstatestik"
 
-#: ../libpurple/protocols/silc/ops.c:1553
-#: ../libpurple/protocols/silc10/ops.c:1550
 msgid "Cannot get server statistics"
 msgstr "Kan inte hämta serverstatestik"
 
-#: ../libpurple/protocols/silc/ops.c:1560
-#: ../libpurple/protocols/silc10/ops.c:1581
 #, c-format
 msgid ""
 "Local server start time: %s\n"
@@ -11449,72 +8105,48 @@
 "Totala serveroperatörer: %d\n"
 "Totala routeroperatörer: %d\n"
 
-#: ../libpurple/protocols/silc/ops.c:1592
-#: ../libpurple/protocols/silc10/ops.c:1604
 msgid "Network Statistics"
 msgstr "Nätverksstatestik"
 
-#: ../libpurple/protocols/silc/ops.c:1600
-#: ../libpurple/protocols/silc10/ops.c:1612
 msgid "Ping failed"
 msgstr "Ping misslyckades"
 
-#: ../libpurple/protocols/silc/ops.c:1605
-#: ../libpurple/protocols/silc10/ops.c:1617
 msgid "Ping reply received from server"
 msgstr "Svar på Ping mottagen från server"
 
-#: ../libpurple/protocols/silc/ops.c:1613
-#: ../libpurple/protocols/silc10/ops.c:1625
 msgid "Could not kill user"
 msgstr "Kunde inte döda användare"
 
-#: ../libpurple/protocols/silc/ops.c:1652
 msgid "WATCH"
 msgstr "TITTA"
 
-#: ../libpurple/protocols/silc/ops.c:1652
 msgid "Cannot watch user"
 msgstr "Kan inte följa användaren"
 
-#: ../libpurple/protocols/silc/ops.c:1728
-#: ../libpurple/protocols/silc/ops.c:1779
-#: ../libpurple/protocols/silc/silc.c:377
-#: ../libpurple/protocols/silc10/ops.c:1811
-#: ../libpurple/protocols/silc10/ops.c:1858
-#: ../libpurple/protocols/silc10/silc.c:190
 msgid "Resuming session"
 msgstr "Återupptar session"
 
-#: ../libpurple/protocols/silc/ops.c:1730
-#: ../libpurple/protocols/silc10/ops.c:1813
 msgid "Authenticating connection"
 msgstr "Autentiserar uppkoppling"
 
-#: ../libpurple/protocols/silc/ops.c:1781
-#: ../libpurple/protocols/silc10/ops.c:1860
 msgid "Verifying server public key"
 msgstr "Verifierar publik servernyckel"
 
-#: ../libpurple/protocols/silc/ops.c:1818
-#: ../libpurple/protocols/silc10/ops.c:1902
 msgid "Passphrase required"
 msgstr "Lösenord krävs"
 
-#: ../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. 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?"
+
 #, 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?"
 
-#: ../libpurple/protocols/silc/pk.c:107
-#: ../libpurple/protocols/silc10/pk.c:113
 #, c-format
 msgid ""
 "Fingerprint and babbleprint for the %s key are:\n"
@@ -11527,103 +8159,65 @@
 "%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
 msgid "Verify Public Key"
 msgstr "Verifiera publik nyckel"
 
-#: ../libpurple/protocols/silc/pk.c:115
-#: ../libpurple/protocols/silc10/pk.c:121
 msgid "_View..."
 msgstr "_Visa..."
 
-#: ../libpurple/protocols/silc/pk.c:140
-#: ../libpurple/protocols/silc10/pk.c:143
 msgid "Unsupported public key type"
 msgstr "Ej stödd  publik nyckeltyp"
 
-#: ../libpurple/protocols/silc/silc.c:317
-#: ../libpurple/protocols/silc10/ops.c:1749
 msgid "Disconnected by server"
 msgstr "Frånkopplad av server"
 
-#: ../libpurple/protocols/silc/silc.c:324
-#: ../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:329
-#: ../libpurple/protocols/silc10/ops.c:1705
 msgid "Key Exchange failed"
 msgstr "Nyckelutbytet misslyckades"
 
-#: ../libpurple/protocols/silc/silc.c:338
-#: ../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:365
-#: ../libpurple/protocols/silc/silc.c:411
-#: ../libpurple/protocols/silc10/silc.c:161
+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."
+
 msgid "Connection failed"
 msgstr "Anslutning misslyckad"
 
-#: ../libpurple/protocols/silc/silc.c:380
-#: ../libpurple/protocols/silc10/silc.c:193
 msgid "Performing key exchange"
 msgstr "Utför nyckelutbyte"
 
 #. Progress
-#: ../libpurple/protocols/silc/silc.c:435
-#: ../libpurple/protocols/silc10/silc.c:325
 msgid "Connecting to SILC Server"
 msgstr "Ansluter till SILC-server"
 
-#: ../libpurple/protocols/silc/silc.c:444
-#, c-format
 msgid "Could not load SILC key pair"
 msgstr "Kunde inte ladda SILC nyckelpar"
 
-#: ../libpurple/protocols/silc/silc.c:458
-#: ../libpurple/protocols/silc10/silc.c:355
 msgid "Unable to create connection"
 msgstr "Kan inte skapa anslutning"
 
-#: ../libpurple/protocols/silc/silc.c:487
-#: ../libpurple/protocols/silc10/silc.c:267
 msgid "Out of memory"
 msgstr "Slut på minne"
 
-#: ../libpurple/protocols/silc/silc.c:538
-#: ../libpurple/protocols/silc10/silc.c:313
 msgid "Cannot initialize SILC protocol"
 msgstr "Kan inte inleda SILC-klientanslutning"
 
-#: ../libpurple/protocols/silc/silc.c:547
 msgid "Error loading SILC key pair"
 msgstr "Fel vid inläsning av SILC-nyckelpar"
 
-#: ../libpurple/protocols/silc/silc.c:870
-#: ../libpurple/protocols/silc10/silc.c:650
 msgid "Your Current Mood"
 msgstr "Ditt nuvarande humör"
 
-#: ../libpurple/protocols/silc/silc.c:872
-#: ../libpurple/protocols/silc10/silc.c:652
-#: ../pidgin/gtkprefs.c:1702
 #, c-format
 msgid "Normal"
 msgstr "Normal"
 
-#: ../libpurple/protocols/silc/silc.c:886
-#: ../libpurple/protocols/silc10/silc.c:666
 msgid "In love"
 msgstr "Kär"
 
-#: ../libpurple/protocols/silc/silc.c:897
-#: ../libpurple/protocols/silc10/silc.c:677
 msgid ""
 "\n"
 "Your Preferred Contact Methods"
@@ -11631,334 +8225,223 @@
 "\n"
 "Dina föredragna kontakmetoder"
 
-#: ../libpurple/protocols/silc/silc.c:905
-#: ../libpurple/protocols/silc/util.c:565
-#: ../libpurple/protocols/silc10/silc.c:685
-#: ../libpurple/protocols/silc10/util.c:557
 msgid "SMS"
 msgstr "SMS"
 
-#: ../libpurple/protocols/silc/silc.c:907
-#: ../libpurple/protocols/silc/util.c:567
-#: ../libpurple/protocols/silc10/silc.c:687
-#: ../libpurple/protocols/silc10/util.c:559
 msgid "MMS"
 msgstr "MMS"
 
-#: ../libpurple/protocols/silc/silc.c:909
-#: ../libpurple/protocols/silc10/silc.c:689
 msgid "Video conferencing"
 msgstr "Videokonferens"
 
-#: ../libpurple/protocols/silc/silc.c:914
-#: ../libpurple/protocols/silc10/silc.c:694
 msgid "Your Current Status"
 msgstr "Din nuvarande status"
 
-#: ../libpurple/protocols/silc/silc.c:921
-#: ../libpurple/protocols/silc10/silc.c:701
 msgid "Online Services"
 msgstr "Anslutningstjänster"
 
-#: ../libpurple/protocols/silc/silc.c:924
-#: ../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"
 
-#: ../libpurple/protocols/silc/silc.c:930
-#: ../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"
 
-#: ../libpurple/protocols/silc/silc.c:937
-#: ../libpurple/protocols/silc10/silc.c:717
 msgid "Your VCard File"
 msgstr "Din VCard-fil"
 
-#: ../libpurple/protocols/silc/silc.c:943
 msgid "Timezone (UTC)"
 msgstr "Tidszon (UTC)"
 
-#: ../libpurple/protocols/silc/silc.c:947
-#: ../libpurple/protocols/silc/silc.c:948
-#: ../libpurple/protocols/silc10/silc.c:729
-#: ../libpurple/protocols/silc10/silc.c:730
 msgid "User Online Status Attributes"
 msgstr "Användarens anslutningsstatusattribut"
 
-#: ../libpurple/protocols/silc/silc.c:949
-#: ../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:990
-#: ../libpurple/protocols/silc/silc.c:996
-#: ../libpurple/protocols/silc/silc.c:1617
-#: ../libpurple/protocols/silc10/silc.c:772
-#: ../libpurple/protocols/silc10/silc.c:778
-#: ../libpurple/protocols/silc10/silc.c:1415
+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."
+
 msgid "Message of the Day"
 msgstr "Meddelande för dagen"
 
-#: ../libpurple/protocols/silc/silc.c:990
-#: ../libpurple/protocols/silc10/silc.c:772
 msgid "No Message of the Day available"
 msgstr "Inget dagligt meddelande tillgänglig"
 
-#: ../libpurple/protocols/silc/silc.c:991
-#: ../libpurple/protocols/silc/silc.c:1612
-#: ../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"
 
-#: ../libpurple/protocols/silc/silc.c:1042
-#: ../libpurple/protocols/silc/silc.c:1088
-#: ../libpurple/protocols/silc/silc.c:1159
-#: ../libpurple/protocols/silc/silc.c:1160
-#: ../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"
 
-#: ../libpurple/protocols/silc/silc.c:1042
-#: ../libpurple/protocols/silc10/silc.c:824
 msgid "Passphrases do not match"
 msgstr "Lösenorden stämmer inte överens"
 
-#: ../libpurple/protocols/silc/silc.c:1088
-#: ../libpurple/protocols/silc10/silc.c:868
 msgid "Key Pair Generation failed"
 msgstr "Genrerering av nyckelpar misslyckades"
 
-#: ../libpurple/protocols/silc/silc.c:1127
-#: ../libpurple/protocols/silc10/silc.c:907
 msgid "Key length"
 msgstr "Nyckellängd"
 
-#: ../libpurple/protocols/silc/silc.c:1129
-#: ../libpurple/protocols/silc10/silc.c:909
 msgid "Public key file"
 msgstr "Publik nyckelfil"
 
-#: ../libpurple/protocols/silc/silc.c:1131
-#: ../libpurple/protocols/silc10/silc.c:911
 msgid "Private key file"
 msgstr "Privat nyckelfil"
 
-#: ../libpurple/protocols/silc/silc.c:1154
-#: ../libpurple/protocols/silc10/silc.c:934
 msgid "Passphrase (retype)"
 msgstr "Lösenord (upprepa)"
 
-#: ../libpurple/protocols/silc/silc.c:1161
-#: ../libpurple/protocols/silc10/silc.c:941
 msgid "Generate Key Pair"
 msgstr "Generera nyckelpar"
 
-#: ../libpurple/protocols/silc/silc.c:1204
-#: ../libpurple/protocols/silc10/silc.c:984
 msgid "Online Status"
 msgstr "Anslutningsstatus"
 
-#: ../libpurple/protocols/silc/silc.c:1212
-#: ../libpurple/protocols/silc10/silc.c:992
 msgid "View Message of the Day"
 msgstr "Visa Meddelande för dagen"
 
-#: ../libpurple/protocols/silc/silc.c:1216
-#: ../libpurple/protocols/silc10/silc.c:996
 msgid "Create SILC Key Pair..."
 msgstr "Skapa SILC-nyckelpar..."
 
-#: ../libpurple/protocols/silc/silc.c:1308
-#: ../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"
 
-#: ../libpurple/protocols/silc/silc.c:1488
-#: ../libpurple/protocols/silc10/silc.c:1286
 msgid "Topic too long"
 msgstr "Ämnet är för långt"
 
-#: ../libpurple/protocols/silc/silc.c:1569
-#: ../libpurple/protocols/silc10/silc.c:1367
 msgid "You must specify a nick"
 msgstr "Du måste ange ett alias"
 
-#: ../libpurple/protocols/silc/silc.c:1671
-#: ../libpurple/protocols/silc10/silc.c:1469
 #, c-format
 msgid "channel %s not found"
 msgstr "kanal %s kunde inte hittas"
 
-#: ../libpurple/protocols/silc/silc.c:1676
-#: ../libpurple/protocols/silc10/silc.c:1474
 #, c-format
 msgid "channel modes for %s: %s"
 msgstr "kanallägen för %s: %s"
 
-#: ../libpurple/protocols/silc/silc.c:1678
-#: ../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"
 
-#: ../libpurple/protocols/silc/silc.c:1691
-#: ../libpurple/protocols/silc10/silc.c:1489
 #, c-format
 msgid "Failed to set cmodes for %s"
 msgstr "Misslyckades med att ange cmodes för %s"
 
-#: ../libpurple/protocols/silc/silc.c:1721
-#: ../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:1784
-#: ../libpurple/protocols/silc10/silc.c:1582
 msgid "part [channel]:  Leave the chat"
 msgstr "part [kanal]: Lämna chatten"
 
-#: ../libpurple/protocols/silc/silc.c:1788
-#: ../libpurple/protocols/silc10/silc.c:1586
 msgid "leave [channel]:  Leave the chat"
 msgstr "leave [kanal]: Lämna chatten"
 
-#: ../libpurple/protocols/silc/silc.c:1792
-#: ../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"
 
-#: ../libpurple/protocols/silc/silc.c:1797
-#: ../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"
-
-#: ../libpurple/protocols/silc/silc.c:1801
-#: ../libpurple/protocols/silc10/silc.c:1599
+msgstr ""
+"join &lt;kanal&gt; [&lt;lösenord&gt;]:  Anslut till enn chatt på detta "
+"nätverk"
+
 msgid "list:  List channels on this network"
 msgstr "list: Listar  kanalerna på detta nätverk"
 
-#: ../libpurple/protocols/silc/silc.c:1805
-#: ../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"
 
-#: ../libpurple/protocols/silc/silc.c:1809
-#: ../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"
-
-#: ../libpurple/protocols/silc/silc.c:1813
-#: ../libpurple/protocols/silc10/silc.c:1611
+msgstr ""
+"msg &lt;nick&gt; &lt;meddelande&gt;:  Skicka ett privat meddelande till en "
+"användare"
+
 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"
-
-#: ../libpurple/protocols/silc/silc.c:1817
-#: ../libpurple/protocols/silc10/silc.c:1615
+msgstr ""
+"query &lt;nick&gt; [&lt;meddelande&gt;]:  Skicka ett privat meddelande till "
+"en användare"
+
 msgid "motd:  View the server's Message Of The Day"
 msgstr "motd:  Visar serverns Dagliga meddelande (MOTD)"
 
-#: ../libpurple/protocols/silc/silc.c:1821
-#: ../libpurple/protocols/silc10/silc.c:1619
 msgid "detach:  Detach this session"
 msgstr "detach:  Frånskilj denna session"
 
-#: ../libpurple/protocols/silc/silc.c:1825
-#: ../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"
 
-#: ../libpurple/protocols/silc/silc.c:1829
-#: ../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"
 
-#: ../libpurple/protocols/silc/silc.c:1835
-#: ../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"
 
-#: ../libpurple/protocols/silc/silc.c:1839
-#: ../libpurple/protocols/silc10/silc.c:1637
 msgid "nick &lt;newnick&gt;:  Change your nickname"
 msgstr "nick &lt;nyttalias&gt;:  Ändrar ditt alias"
 
-#: ../libpurple/protocols/silc/silc.c:1843
-#: ../libpurple/protocols/silc10/silc.c:1641
 msgid "whowas &lt;nick&gt;:  View nick's information"
 msgstr "whowas &lt;nick&gt;:  Visa information om nick"
 
-#: ../libpurple/protocols/silc/silc.c:1847
-#: ../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:1851
-#: ../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:1855
-#: ../libpurple/protocols/silc10/silc.c:1653
+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"
+
+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"
+
 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"
 
-#: ../libpurple/protocols/silc/silc.c:1859
-#: ../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"
 
-#: ../libpurple/protocols/silc/silc.c:1863
-#: ../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:1867
-#: ../libpurple/protocols/silc10/silc.c:1665
+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"
+
 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"
 
-#: ../libpurple/protocols/silc/silc.c:1871
-#: ../libpurple/protocols/silc10/silc.c:1669
 msgid "info [server]:  View server administrative details"
 msgstr "info [server]:  Visa administrativa detaljer för server"
 
-#: ../libpurple/protocols/silc/silc.c:1875
-#: ../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"
 
-#: ../libpurple/protocols/silc/silc.c:1879
-#: ../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"
-
-#: ../libpurple/protocols/silc/silc.c:1883
-#: ../libpurple/protocols/silc10/silc.c:1681
+msgstr ""
+"getkey &lt;nick|server&gt;:  Hämta serverns eller klientens publika nyckel"
+
 msgid "stats:  View server and network statistics"
 msgstr "stats:  Visa server och nätverksstatestik"
 
-#: ../libpurple/protocols/silc/silc.c:1887
-#: ../libpurple/protocols/silc10/silc.c:1685
 msgid "ping:  Send PING to the connected server"
 msgstr "ping: skicka PING till den anslutna servern"
 
-#: ../libpurple/protocols/silc/silc.c:1892
-#: ../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"
 
-#: ../libpurple/protocols/silc/silc.c:1896
-#: ../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)"
+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
@@ -11969,142 +8452,91 @@
 #. *< name
 #. *< version
 #. *  summary
-#: ../libpurple/protocols/silc/silc.c:2007
-#: ../libpurple/protocols/silc10/silc.c:1819
 msgid "SILC Protocol Plugin"
 msgstr "Insticksmodul för SILC-protokoll"
 
 #. *  description
-#: ../libpurple/protocols/silc/silc.c:2009
-#: ../libpurple/protocols/silc10/silc.c:1821
 msgid "Secure Internet Live Conferencing (SILC) Protocol"
 msgstr "Secure Internet Live Conferencing (SILC) Protokoll"
 
-#: ../libpurple/protocols/silc/silc.c:2041
-#: ../libpurple/protocols/silc10/silc.c:1853
-#: ../pidgin/gtkprefs.c:2099
 msgid "Network"
 msgstr "Nätverk"
 
-#: ../libpurple/protocols/silc/silc.c:2052
-#: ../libpurple/protocols/silc10/silc.c:1864
 msgid "Public Key file"
 msgstr "Publik nyckelfil"
 
-#: ../libpurple/protocols/silc/silc.c:2056
-#: ../libpurple/protocols/silc10/silc.c:1868
 msgid "Private Key file"
 msgstr "Privat nyckelfil"
 
-#: ../libpurple/protocols/silc/silc.c:2066
-#: ../libpurple/protocols/silc10/silc.c:1878
 msgid "Cipher"
 msgstr "Chiffer"
 
-#: ../libpurple/protocols/silc/silc.c:2076
-#: ../libpurple/protocols/silc10/silc.c:1888
 msgid "HMAC"
 msgstr "HMAC"
 
-#: ../libpurple/protocols/silc/silc.c:2079
 msgid "Use Perfect Forward Secrecy"
 msgstr "Använd Perfekt Vidarebefodrandesekretess"
 
-#: ../libpurple/protocols/silc/silc.c:2083
-#: ../libpurple/protocols/silc10/silc.c:1891
 msgid "Public key authentication"
 msgstr "Publik nyckelautentisering"
 
-#: ../libpurple/protocols/silc/silc.c:2086
-#: ../libpurple/protocols/silc10/silc.c:1894
 msgid "Block IMs without Key Exchange"
 msgstr "Blockera snabbmeddelanden utan nyckelutbyte"
 
-#: ../libpurple/protocols/silc/silc.c:2089
-#: ../libpurple/protocols/silc10/silc.c:1897
 msgid "Block messages to whiteboard"
 msgstr "Blockera meddelande till whiteboard"
 
-#: ../libpurple/protocols/silc/silc.c:2092
-#: ../libpurple/protocols/silc10/silc.c:1900
 msgid "Automatically open whiteboard"
 msgstr "Öppna automatiskt whiteboard"
 
-#: ../libpurple/protocols/silc/silc.c:2095
-#: ../libpurple/protocols/silc10/silc.c:1903
 msgid "Digitally sign and verify all messages"
 msgstr "Signera och verifiera alla meddelanden digitalt"
 
-#: ../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)
-#: ../libpurple/protocols/silc/util.c:362
-#: ../libpurple/protocols/silc10/util.c:355
 #, c-format
 msgid "Real Name: \t%s\n"
 msgstr "För- och efternamn: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:364
-#: ../libpurple/protocols/silc10/util.c:357
 #, c-format
 msgid "User Name: \t%s\n"
 msgstr "Användarnamn: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:366
-#: ../libpurple/protocols/silc10/util.c:359
 #, c-format
 msgid "E-Mail: \t\t%s\n"
 msgstr "E-Post: \t\t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:368
-#: ../libpurple/protocols/silc10/util.c:361
 #, c-format
 msgid "Host Name: \t%s\n"
 msgstr "Värdnamn: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:370
-#: ../libpurple/protocols/silc10/util.c:363
 #, c-format
 msgid "Organization: \t%s\n"
 msgstr "Organisation: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:372
-#: ../libpurple/protocols/silc10/util.c:365
 #, c-format
 msgid "Country: \t%s\n"
 msgstr "Land: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:373
-#: ../libpurple/protocols/silc10/util.c:366
 #, c-format
 msgid "Algorithm: \t%s\n"
 msgstr "Algoritm: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:374
-#: ../libpurple/protocols/silc10/util.c:367
 #, c-format
 msgid "Key Length: \t%d bits\n"
 msgstr "Nyckellängd: \t%d bits\n"
 
-#: ../libpurple/protocols/silc/util.c:376
 #, c-format
 msgid "Version: \t%s\n"
 msgstr "Version: \t%s\n"
 
-#: ../libpurple/protocols/silc/util.c:378
-#: ../libpurple/protocols/silc10/util.c:369
 #, c-format
 msgid ""
 "Public Key Fingerprint:\n"
@@ -12115,8 +8547,6 @@
 "%s\n"
 "\n"
 
-#: ../libpurple/protocols/silc/util.c:379
-#: ../libpurple/protocols/silc10/util.c:370
 #, c-format
 msgid ""
 "Public Key Babbleprint:\n"
@@ -12125,156 +8555,114 @@
 "Publik nyckelpladderavtryck:\n"
 "%s"
 
-#: ../libpurple/protocols/silc/util.c:383
-#: ../libpurple/protocols/silc/util.c:384
-#: ../libpurple/protocols/silc10/util.c:374
-#: ../libpurple/protocols/silc10/util.c:375
 msgid "Public Key Information"
 msgstr "Publik nyckelinformation"
 
-#: ../libpurple/protocols/silc/util.c:563
-#: ../libpurple/protocols/silc10/util.c:555
 msgid "Paging"
 msgstr "Sökare"
 
-#: ../libpurple/protocols/silc/util.c:569
-#: ../libpurple/protocols/silc10/util.c:561
 msgid "Video Conferencing"
 msgstr "Videokonferens"
 
-#: ../libpurple/protocols/silc/util.c:587
-#: ../libpurple/protocols/silc10/util.c:579
 msgid "Computer"
 msgstr "Dator"
 
-#: ../libpurple/protocols/silc/util.c:591
-#: ../libpurple/protocols/silc10/util.c:583
 msgid "PDA"
 msgstr "PDA"
 
-#: ../libpurple/protocols/silc/util.c:593
-#: ../libpurple/protocols/silc10/util.c:585
 msgid "Terminal"
 msgstr "Terminal"
 
-#: ../libpurple/protocols/silc/wb.c:288
-#: ../libpurple/protocols/silc10/wb.c:287
 #, 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?"
 
-#: ../libpurple/protocols/silc/wb.c:292
-#: ../libpurple/protocols/silc10/wb.c:291
-#, 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:306
-#: ../libpurple/protocols/silc10/wb.c:305
+#, 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?"
+
 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
 #, c-format
 msgid "Failure: Version mismatch, upgrade your client"
 msgstr "Misslyckande: Versionerna matchar inte, upgradera din klient"
 
-#: ../libpurple/protocols/silc10/ops.c:1934
 #, c-format
 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
+msgstr ""
+"Misslyckande: Fjärrdatorn litar inte på/stödjer inte din publika nyckel"
+
 #, c-format
 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
 #, c-format
 msgid "Failure: Remote does not support proposed cipher"
 msgstr "Misslyckande: Fjärrdator stödjer inte föreslaget chiffer"
 
-#: ../libpurple/protocols/silc10/ops.c:1943
 #, c-format
 msgid "Failure: Remote does not support proposed PKCS"
 msgstr "Misslyckande: Fjärrdatorn stödjer inte föreslagen PKCS"
 
-#: ../libpurple/protocols/silc10/ops.c:1946
 #, c-format
 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
 #, c-format
 msgid "Failure: Remote does not support proposed HMAC"
 msgstr "Misslyckande: Fjärrdatorn stödjer inte föreslagen HMAC"
 
-#: ../libpurple/protocols/silc10/ops.c:1951
 #, c-format
 msgid "Failure: Incorrect signature"
 msgstr "Misslyckande: Felaktig signatur"
 
-#: ../libpurple/protocols/silc10/ops.c:1953
 #, c-format
 msgid "Failure: Invalid cookie"
 msgstr "Misslyckande: Felaktig cookie"
 
-#: ../libpurple/protocols/silc10/ops.c:1964
 #, c-format
 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?
-#: ../libpurple/protocols/simple/simple.c:417
 msgid "Could not write"
 msgstr "Kunde inte skriva"
 
-#: ../libpurple/protocols/simple/simple.c:439
-#: ../libpurple/protocols/simple/simple.c:1544
 msgid "Could not connect"
 msgstr "Kunde inte ansluta"
 
-#: ../libpurple/protocols/simple/simple.c:1062
 msgid "Unknown server response."
 msgstr "Okänt serversvar."
 
-#: ../libpurple/protocols/simple/simple.c:1578
-#: ../libpurple/protocols/simple/simple.c:1620
-#: ../libpurple/protocols/simple/simple.c:1633
-#: ../libpurple/protocols/simple/simple.c:1684
 msgid "Could not create listen socket"
 msgstr "Kunde inte skapa lyssnarsocket"
 
-#: ../libpurple/protocols/simple/simple.c:1601
 msgid "Couldn't resolve host"
 msgstr "Kunde ej slå upp värden"
 
-#: ../libpurple/protocols/simple/simple.c:1692
 msgid "Could not resolve hostname"
 msgstr "Kunde ej slå upp värden"
 
-#: ../libpurple/protocols/simple/simple.c:1709
 msgid "SIP screen names may not contain whitespaces or @ symbols"
 msgstr "SIP-skärmnamn får inte innehålla mellanslag eller symbolen @"
 
@@ -12286,250 +8674,199 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../libpurple/protocols/simple/simple.c:1892
 msgid "SIP/SIMPLE Protocol Plugin"
 msgstr "Insticksmodul för SIP/SIMPLE-protokollet"
 
 #. *  summary
-#: ../libpurple/protocols/simple/simple.c:1893
 msgid "The SIP/SIMPLE Protocol Plugin"
 msgstr "Insticksmodulen för SIP/SIMPLE"
 
-#: ../libpurple/protocols/simple/simple.c:1921
 msgid "Publish status (note: everyone may watch you)"
 msgstr "Publicera statusen (notering: alla kan se dig)"
 
-#: ../libpurple/protocols/simple/simple.c:1927
 msgid "Use UDP"
 msgstr "Använda UDP"
 
-#: ../libpurple/protocols/simple/simple.c:1929
 msgid "Use proxy"
 msgstr "Använd proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1931
 msgid "Proxy"
 msgstr "Proxy"
 
-#: ../libpurple/protocols/simple/simple.c:1933
 msgid "Auth User"
 msgstr "Autentisera användare"
 
-#: ../libpurple/protocols/simple/simple.c:1935
 msgid "Auth Domain"
 msgstr "Autentiserad domän"
 
-#: ../libpurple/protocols/toc/toc.c:139
 #, c-format
 msgid "Looking up %s"
 msgstr "Slå upp %s"
 
-#: ../libpurple/protocols/toc/toc.c:148
 #, c-format
 msgid "Connect to %s failed"
 msgstr "Anslutning till %s misslyckades"
 
-#: ../libpurple/protocols/toc/toc.c:201
 #, c-format
 msgid "Signon: %s"
 msgstr "Inloggning: %s"
 
-#: ../libpurple/protocols/toc/toc.c:488
 #, c-format
 msgid "Unable to write file %s."
 msgstr "Kan inte skriva filen %s."
 
-#: ../libpurple/protocols/toc/toc.c:491
 #, c-format
 msgid "Unable to read file %s."
 msgstr "Kan inte läsa filen %s."
 
-#: ../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."
 
-#: ../libpurple/protocols/toc/toc.c:497
 #, c-format
 msgid "%s not currently logged in."
 msgstr "%s är inte inloggad för tillfället."
 
-#: ../libpurple/protocols/toc/toc.c:500
 #, c-format
 msgid "Warning of %s not allowed."
 msgstr "Varning för %s är inte tillåten."
 
-#: ../libpurple/protocols/toc/toc.c:503
 #, c-format
 msgid "A message has been dropped, you are exceeding the server speed limit."
 msgstr "Ett meddelande har kastats, du överskrider serverns hastighetsgräns."
 
-#: ../libpurple/protocols/toc/toc.c:506
 #, c-format
 msgid "Chat in %s is not available."
 msgstr "Chatt i %s är inte tillgänglig."
 
-#: ../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."
 
-#: ../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."
 
-#: ../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."
-
-#: ../libpurple/protocols/toc/toc.c:518
+msgstr ""
+"Du missade ett snabbmeddelande från %s eftersom det skickades för snabbt."
+
 #, c-format
 msgid "Failure."
 msgstr "Misslyckande."
 
-#: ../libpurple/protocols/toc/toc.c:521
 #, c-format
 msgid "Too many matches."
 msgstr "För många träffar."
 
-#: ../libpurple/protocols/toc/toc.c:524
 #, c-format
 msgid "Need more qualifiers."
 msgstr "Behöver fler kvalificerare."
 
-#: ../libpurple/protocols/toc/toc.c:527
 #, c-format
 msgid "Dir service temporarily unavailable."
 msgstr "Katalogtjänsten är tillfälligt onåbar."
 
-#: ../libpurple/protocols/toc/toc.c:530
 #, c-format
 msgid "E-mail lookup restricted."
 msgstr "E-postuppslagning är begränsad."
 
-#: ../libpurple/protocols/toc/toc.c:533
 #, c-format
 msgid "Keyword ignored."
 msgstr "Nyckelordet ignorerades."
 
-#: ../libpurple/protocols/toc/toc.c:536
 #, c-format
 msgid "No keywords."
 msgstr "Inga nyckelord."
 
-#: ../libpurple/protocols/toc/toc.c:539
 #, c-format
 msgid "User has no directory information."
 msgstr "Användaren har ingen kataloginformation."
 
-#: ../libpurple/protocols/toc/toc.c:543
 #, c-format
 msgid "Country not supported."
 msgstr "Landet stöds inte."
 
-#: ../libpurple/protocols/toc/toc.c:546
 #, c-format
 msgid "Failure unknown: %s."
 msgstr "Okänt misslyckande: %s."
 
-#: ../libpurple/protocols/toc/toc.c:549
 #, c-format
 msgid "Incorrect screen name or password."
 msgstr "Felaktigt skärmnamn eller lösenord."
 
-#: ../libpurple/protocols/toc/toc.c:552
 #, c-format
 msgid "The service is temporarily unavailable."
 msgstr "Tjänsten är tillfälligt onåbar."
 
-#: ../libpurple/protocols/toc/toc.c:555
 #, c-format
 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."
 
-#: ../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."
-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 ""
+"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."
+
 #, c-format
 msgid "An unknown signon error has occurred: %s."
 msgstr "Ett okänt inloggningsfel har inträffat: %s."
 
-#: ../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"
 
-#: ../libpurple/protocols/toc/toc.c:590
 msgid "Invalid Groupname"
 msgstr "Ogiltigt gruppnamn"
 
-#: ../libpurple/protocols/toc/toc.c:674
 msgid "Connection Closed"
 msgstr "Anslutningen stängd"
 
-#: ../libpurple/protocols/toc/toc.c:714
 msgid "Waiting for reply..."
 msgstr "Väntar på svar..."
 
-#: ../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."
-
-#: ../libpurple/protocols/toc/toc.c:995
+msgstr ""
+"TOC har kommit tillbaka från dess paus. Du kan nu skicka meddelanden igen."
+
 msgid "Password Change Successful"
 msgstr "Lösenordsändring lyckades"
 
-#: ../libpurple/protocols/toc/toc.c:1366
-#: ../pidgin/gtkblist.c:5929
-#: ../pidgin/gtkblist.c:6285
 msgid "_Group:"
 msgstr "_Grupp:"
 
-#: ../libpurple/protocols/toc/toc.c:1535
 msgid "Get Dir Info"
 msgstr "Hämta kataloginformation"
 
-#: ../libpurple/protocols/toc/toc.c:1675
 msgid "Set Dir Info"
 msgstr "Ställ in kataloginformation"
 
-#: ../libpurple/protocols/toc/toc.c:1797
 #, c-format
 msgid "Could not open %s for writing!"
 msgstr "Kunde inte öppna %s för läsning!"
 
-#: ../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."
 
-#: ../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."
 
-#: ../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."
 
-#: ../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"
 
-#: ../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"
@@ -12544,99 +8881,88 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/toc/toc.c:2306
-#: ../libpurple/protocols/toc/toc.c:2308
 msgid "TOC Protocol Plugin"
 msgstr "Insticksmodul för TOC-protokoll"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:784
 #, c-format
 msgid "%s has sent you a webcam invite, which is not yet supported."
 msgstr "%s har skickat dig en webbkamerainbjudan, vilket ännu inte stöds."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:840
 msgid "Your Yahoo! message did not get sent."
 msgstr "Ditt Yahoo!-meddelande skickades inte."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:962
 #, c-format
 msgid "Yahoo! system message for %s:"
 msgstr "Yahoo!-systemmeddelande till %s:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1031
 msgid "Authorization denied message:"
 msgstr "Auktoriserings nekelsemeddelande:"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1049
-#, 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:1052
+#, 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."
+
 #, 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."
-
-#: ../libpurple/protocols/yahoo/yahoo.c:1054
+msgstr ""
+"%s har (retroaktivt) nekat din att lägga till henne/honom till din "
+"kontaktlista."
+
 msgid "Add buddy rejected"
 msgstr "Lägg till kompisavvisning"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:1996
-#, 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:1999
+#, 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."
+
 msgid "Failed Yahoo! Authentication"
 msgstr "Misslyckad Yahoo!-autentisering"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2065
-#, 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:2068
+#, 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."
+
 msgid "Ignore buddy?"
 msgstr "Ignorera kompis?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2131
 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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2134
 #, 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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2188
 #, 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."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2191
 msgid "Could not add buddy to server list"
 msgstr "Kunde inte lägga till kompis i listan på servern"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2310
 #, c-format
 msgid "[ Audible %s/%s/%s.swf ] %s"
 msgstr "[ Hörbar %s/%s/%s.swf ] %s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2653
 msgid "Received unexpected HTTP response from server."
 msgstr "Mottog oväntat HTTP-svar från servern."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2677
-#: ../libpurple/protocols/yahoo/yahoo.c:2863
-#: ../libpurple/protocols/yahoo/yahoo.c:2966
-#: ../libpurple/protocols/yahoo/yahoo.c:2976
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
-#: ../libpurple/protocols/yahoo/ycht.c:585
 msgid "Connection problem"
 msgstr "Problem med anslutning"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2703
 #, c-format
 msgid ""
 "Lost connection with %s:\n"
@@ -12645,7 +8971,6 @@
 "Tappade anslutningen med %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:2728
 #, c-format
 msgid ""
 "Could not establish a connection with %s:\n"
@@ -12654,103 +8979,72 @@
 "Kunde inte skapa en anslutning med %s:\n"
 "%s"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3083
-#: ../libpurple/protocols/yahoo/yahoo.c:3769
 msgid "Not at Home"
 msgstr "Inte hemma"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3085
-#: ../libpurple/protocols/yahoo/yahoo.c:3772
 msgid "Not at Desk"
 msgstr "Inte vid skrivbordet"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3087
-#: ../libpurple/protocols/yahoo/yahoo.c:3775
 msgid "Not in Office"
 msgstr "Inte på kontoret"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3091
-#: ../libpurple/protocols/yahoo/yahoo.c:3781
 msgid "On Vacation"
 msgstr "På semester"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3095
-#: ../libpurple/protocols/yahoo/yahoo.c:3787
 msgid "Stepped Out"
 msgstr "Gått ut"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3188
-#: ../libpurple/protocols/yahoo/yahoo.c:3218
 msgid "Not on server list"
 msgstr "Finns inte i listan på servern"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3235
-#: ../libpurple/protocols/yahoo/yahoo.c:3293
 msgid "Appear Online"
 msgstr "Verka vara ansluten"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3238
-#: ../libpurple/protocols/yahoo/yahoo.c:3314
 msgid "Appear Permanently Offline"
 msgstr "Verka vara permanent frånkopplad"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3256
 msgid "Presence"
 msgstr "Närvaro"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3299
 msgid "Appear Offline"
 msgstr "Verka vara frånkopplad"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3308
 msgid "Don't Appear Permanently Offline"
 msgstr "Verka inte vara permanent frånkopplad"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3356
 msgid "Join in Chat"
 msgstr "Anslut till chatt"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3362
 msgid "Initiate Conference"
 msgstr "Starta konferens"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3390
 msgid "Presence Settings"
 msgstr "Närvaroinställningar"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3396
 msgid "Start Doodling"
 msgstr "Starta kladda"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3497
 msgid "Activate which ID?"
 msgstr "Vilket ID ska aktiveras?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3508
-msgid "Join whom in chat?"
+msgid "Join who in chat?"
 msgstr "Anslut vem till chatten?"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3520
 msgid "Activate ID..."
 msgstr "Aktivera ID..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3524
 msgid "Join User in Chat..."
 msgstr "Gå med användare i chatt..."
 
-#: ../libpurple/protocols/yahoo/yahoo.c:3529
 msgid "Open Inbox"
 msgstr "Öppna Inkorg"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4138
 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"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4143
 msgid "list: List rooms on the Yahoo network"
 msgstr "list: Listar rummen på Yahoo's nätverk"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4151
 msgid "doodle: Request user to start a Doodle session"
 msgstr "doodle: Fråga användaren angående att starta en kladd-session"
 
@@ -12764,221 +9058,182 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/yahoo/yahoo.c:4360
-#: ../libpurple/protocols/yahoo/yahoo.c:4362
 msgid "Yahoo Protocol Plugin"
 msgstr "Insticksmodul för Yahoo-protokoll"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4385
 msgid "Yahoo Japan"
 msgstr "Yahoo Japan"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4388
 msgid "Pager server"
 msgstr "Sökarserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4391
 msgid "Japan Pager server"
 msgstr "Japan Sökarsörver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4394
 msgid "Pager port"
 msgstr "Sökareport"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4397
 msgid "File transfer server"
 msgstr "Filöverföringsserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4400
 msgid "Japan file transfer server"
 msgstr "Japan filöverföringsserver"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4403
 msgid "File transfer port"
 msgstr "Port för filöverföring"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4406
 msgid "Chat room locale"
 msgstr "Chatrummets språk"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4409
 msgid "Ignore conference and chatroom invitations"
 msgstr "Ignorera inbjudningar till konferenser och chatrum"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4417
 msgid "Chat room list URL"
 msgstr "URL för chattrumlista"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4420
 msgid "Yahoo Chat server"
 msgstr "Yahoo Chat-server"
 
-#: ../libpurple/protocols/yahoo/yahoo.c:4423
 msgid "Yahoo Chat port"
 msgstr "Yahoo Chatt 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
 msgid "Sent Doodle request."
 msgstr "Skickade Doodle-förfrågan."
 
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:270
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:279
-#: ../libpurple/protocols/yahoo/yahoo_filexfer.c:288
 msgid "Unable to establish file descriptor."
 msgstr "Kan inte inte etablera filbeskrivning."
 
-#. TODO: what to do here - do we really have to disconnect?
-#: ../libpurple/protocols/yahoo/yahoo_packet.c:306
 msgid "Write Error"
 msgstr "Skrivfel"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:797
 msgid "Yahoo! Japan Profile"
 msgstr "Yahoo! Japan-profil"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:798
 msgid "Yahoo! Profile"
 msgstr "Yahoo! Profil"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:838
-msgid "Sorry, profiles marked as containing adult content are not supported at this time."
+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."
 
-#: ../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:"
+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"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1034
 msgid "Yahoo! ID"
 msgstr "Yahoo!-ID"
 
-#: ../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"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1127
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1131
 msgid "Latest News"
 msgstr "Senaste nytt"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1152
 msgid "Home Page"
 msgstr "Hemsida"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1167
 msgid "Cool Link 1"
 msgstr "Tuff länk 1"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1172
 msgid "Cool Link 2"
 msgstr "Tuff länk 2"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1176
 msgid "Cool Link 3"
 msgstr "Tuff länk 3"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1190
 msgid "Last Update"
 msgstr "Senast uppdaterad"
 
-#: ../libpurple/protocols/yahoo/yahoo_profile.c:1199
 #, c-format
 msgid "User information for %s unavailable"
 msgstr "Användarinformation om %s är inte tillgänglig"
 
-#: ../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."
+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."
 
-#: ../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 ""
+"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."
+
+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."
+
 msgid "The user's profile is empty."
 msgstr "Användarens profil är tom."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:217
 #, 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\"."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:219
 msgid "Invitation Rejected"
 msgstr "Inbjudan avvisad"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:438
 msgid "Failed to join chat"
 msgstr "Kunde inte ansluta till chatt"
 
 #. -6
-#: ../libpurple/protocols/yahoo/yahoochat.c:441
 msgid "Unknown room"
 msgstr "Okänt rum"
 
 #. -15
-#: ../libpurple/protocols/yahoo/yahoochat.c:444
 msgid "Maybe the room is full"
 msgstr "Kanske rummet är fullt"
 
 #. -35
-#: ../libpurple/protocols/yahoo/yahoochat.c:447
 msgid "Not available"
 msgstr "Ej tillgänglig"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:451
-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:534
+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"
+
 #, c-format
 msgid "You are now chatting in %s."
 msgstr "Du chattar nu i %s."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:719
 msgid "Failed to join buddy in chat"
 msgstr "Kunde inte ansluta kompis till chatt"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:720
 msgid "Maybe they're not in a chat?"
 msgstr "De kanske inte är i någon chatt?"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1416
-#: ../libpurple/protocols/yahoo/yahoochat.c:1442
 msgid "Fetching the room list failed."
 msgstr "Hämtning av rumlistan misslyckades."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1500
 msgid "Voices"
 msgstr "Röster"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1503
 msgid "Webcams"
 msgstr "Webbkamera"
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1514
-#: ../libpurple/protocols/yahoo/yahoochat.c:1584
 msgid "Unable to fetch room list."
 msgstr "Kan inte hämta rumlista."
 
-#: ../libpurple/protocols/yahoo/yahoochat.c:1577
 msgid "User Rooms"
 msgstr "Användarrum"
 
-#: ../libpurple/protocols/yahoo/ycht.c:456
 msgid "Connection problem with the YCHT server."
 msgstr "Problem med anslutning till YCHT-server."
 
-#: ../libpurple/protocols/yahoo/ycht.c:475
 #, c-format
 msgid ""
 "Lost connection with server\n"
@@ -12987,97 +9242,94 @@
 "Tappade anslutningen till servern\n"
 "%s"
 
-#: ../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
+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.)"
+
 #, c-format
 msgid "Unable to send to chat %s,%s,%s"
 msgstr "Kunde inte skicka till chatt %s,%s,%s"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:791
-#: ../libpurple/protocols/zephyr/zephyr.c:1210
 msgid "Hidden or not logged-in"
 msgstr "Gömd eller inte inloggad"
 
-#: ../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"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:1546
-#: ../libpurple/protocols/zephyr/zephyr.c:1547
 msgid "Anyone"
 msgstr "Någon"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2354
 msgid "_Class:"
 msgstr "_Klass:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2360
 msgid "_Instance:"
 msgstr "_Instans:"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2366
 msgid "_Recipient:"
 msgstr "_Mottagare:"
 
-#: ../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"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2690
 msgid "zlocate &lt;nick&gt;: Locate user"
 msgstr "zlocate &lt;nick&gt;: Lokalisera användare"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2695
 msgid "zl &lt;nick&gt;: Locate user"
 msgstr "zl &lt;nick&gt;: Lokalisera användare"
 
-#: ../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"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2705
+msgstr ""
+"instance &lt;instance&gt;: Ange instanserna att användas med denna klass"
+
 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"
 
-#: ../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"
 
-#: ../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"
-
-#: ../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
+msgstr ""
+"sub &lt;class&gt; &lt;instance&gt; &lt;recipient&gt;: Anslut till en ny chatt"
+
+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;"
+
+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;"
+
+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;"
+
+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;"
+
 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;"
-
-#: ../libpurple/protocols/zephyr/zephyr.c:2850
+msgstr ""
+"zc &lt;class&gt;: Skicka ett meddelande till &lt;<i>class</i>,PERSONAL,*&gt;"
+
 msgid "Resubscribe"
 msgstr "Återprenumerera"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2853
 msgid "Retrieve subscriptions from server"
 msgstr "Hämta prenumrationer från server"
 
@@ -13091,47 +9343,33 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../libpurple/protocols/zephyr/zephyr.c:2946
-#: ../libpurple/protocols/zephyr/zephyr.c:2948
 msgid "Zephyr Protocol Plugin"
 msgstr "Insticksmodul för Zephyr-protokoll"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2973
 msgid "Use tzc"
 msgstr "Använd tzc"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2976
 msgid "tzc command"
 msgstr "tzc kommando"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2979
 msgid "Export to .anyone"
 msgstr "Exportera till .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2982
 msgid "Export to .zephyr.subs"
 msgstr "Exportera till .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2985
 msgid "Import from .anyone"
 msgstr "Importera från .anyone"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2988
 msgid "Import from .zephyr.subs"
 msgstr "Importera från .zephyr.subs"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2991
 msgid "Realm"
 msgstr "Kungarike"
 
-#: ../libpurple/protocols/zephyr/zephyr.c:2994
 msgid "Exposure"
 msgstr "Exponering"
 
-#: ../libpurple/proxy.c:461
-#: ../libpurple/proxy.c:902
-#: ../libpurple/proxy.c:1061
-#: ../libpurple/proxy.c:1632
 #, c-format
 msgid ""
 "Unable to create socket:\n"
@@ -13140,78 +9378,75 @@
 "Kan inte skapa uttag:\n"
 "%s"
 
-#: ../libpurple/proxy.c:662
 #, c-format
 msgid "Unable to parse response from HTTP proxy: %s\n"
 msgstr "Kan inte tolka svaret från HTTP-proxyn: %s\n"
 
-#: ../libpurple/proxy.c:702
-#: ../libpurple/proxy.c:750
-#: ../libpurple/proxy.c:786
-#: ../libpurple/proxy.c:798
 #, c-format
 msgid "HTTP proxy connection error %d"
 msgstr "HTTP-proxyanslutningsfel %d"
 
-#: ../libpurple/proxy.c:794
 #, c-format
 msgid "Access denied: HTTP proxy server forbids port %d tunneling."
 msgstr "Åtkomst nekad: HTTP-proxyservern tillåter inte tunnel på port %d."
 
-#: ../libpurple/proxy.c:1022
 #, c-format
 msgid "Error resolving %s"
 msgstr "Fel vid uppslagning av %s"
 
-#: ../libpurple/proxy.c:1730
 msgid "Could not resolve host name"
 msgstr "Kunde inte slå upp värdnamnet"
 
 #. *
 #. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/request.h:1378
+#. *
+#. * A wrapper for purple_request_action() that uses @c Yes and @c No buttons.
+#. *
+#. * @deprecated Please use purple_request_yes_no_with_hint instead.
+#.
 msgid "_Yes"
 msgstr "_Ja"
 
-#: ../libpurple/request.h:1378
 msgid "_No"
 msgstr "_Nej"
 
 #. *
 #. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @since 2.3.0
 #.
-#: ../libpurple/request.h:1398
+#. *
+#. * A wrapper for purple_request_action() that uses Accept and Cancel buttons.
+#. *
+#. * @deprecated Please use purple_request_accept_cancel_with_hint instead.
+#.
 msgid "_Accept"
 msgstr "_Acceptera"
 
 #. *
 #. * The default message to use when the user becomes auto-away.
 #.
-#: ../libpurple/savedstatuses.c:48
 msgid "I'm not here right now"
 msgstr "Jag är inte här just nu"
 
-#: ../libpurple/savedstatuses.c:535
 msgid "saved statuses"
 msgstr "sparade status"
 
-#: ../libpurple/server.c:234
 #, c-format
 msgid "%s is now known as %s.\n"
 msgstr "%s är nu känd som %s.\n"
 
-#: ../libpurple/server.c:302
 #, c-format
 msgid "Requesting %s's attention..."
 msgstr "Efterfrågar %s's uppmärksamhet..."
 
-#: ../libpurple/server.c:347
 #, c-format
 msgid "%s has requested your attention!"
 msgstr "%s har efterfrågat din uppmärksamhet!"
 
-#: ../libpurple/server.c:793
 #, c-format
 msgid ""
 "%s has invited %s to the chat room %s:\n"
@@ -13220,283 +9455,231 @@
 "%s har bjudit in %s till chattrum %s\n"
 "%s"
 
-#: ../libpurple/server.c:798
 #, c-format
 msgid "%s has invited %s to the chat room %s\n"
 msgstr "%s bjuder in %s till chattrum %s\n"
 
-#: ../libpurple/server.c:802
 msgid "Accept chat invitation?"
 msgstr "Tacka ja till chattinbjudan?"
 
-#: ../libpurple/sslconn.c:164
 msgid "SSL Connection Failed"
 msgstr "SSL-anslutning misslyckades"
 
-#: ../libpurple/sslconn.c:166
 msgid "SSL Handshake Failed"
 msgstr "SSL_handskakning misslyckades"
 
-#: ../libpurple/sslconn.c:168
 msgid "SSL peer presented an invalid certificate"
 msgstr "SSL-motparten uppvisade ett ogiltig certifikat"
 
-#: ../libpurple/sslconn.c:171
 msgid "Unknown SSL error"
 msgstr "Okänt SSL-fel"
 
-#: ../libpurple/status.c:153
 msgid "Unset"
 msgstr "Osatt"
 
-#: ../libpurple/status.c:156
-#: ../pidgin/gtkdocklet.c:553
-#: ../pidgin/gtkstatusbox.c:1059
 msgid "Do not disturb"
 msgstr "Stör inte"
 
-#: ../libpurple/status.c:159
 msgid "Extended away"
 msgstr "Utökad frånvaro"
 
-#: ../libpurple/status.c:160
 msgid "Mobile"
 msgstr "Mobil"
 
-#: ../libpurple/status.c:609
+msgid "Listening to music"
+msgstr "Lyssnar på musik"
+
 #, c-format
 msgid "%s changed status from %s to %s"
 msgstr "%s har bytt status från %s till %s"
 
-#: ../libpurple/status.c:612
 #, c-format
 msgid "%s (%s) changed status from %s to %s"
 msgstr "%s (%s) har bytt status från %s till %s"
 
-#: ../libpurple/status.c:623
 #, c-format
 msgid "%s is now %s"
 msgstr "%s är nu %s"
 
-#: ../libpurple/status.c:625
 #, c-format
 msgid "%s (%s) is now %s"
 msgstr "%s (%s) är nu %s"
 
-#: ../libpurple/status.c:631
 #, c-format
 msgid "%s is no longer %s"
 msgstr "%s är inte längre %s"
 
-#: ../libpurple/status.c:633
 #, c-format
 msgid "%s (%s) is no longer %s"
 msgstr "%s (%s) är inte längre %s"
 
-#: ../libpurple/status.c:1244
 #, c-format
 msgid "%s became idle"
 msgstr "%s har blivit inaktiv"
 
-#: ../libpurple/status.c:1261
 #, c-format
 msgid "%s became unidle"
 msgstr "%s har blivit aktiv"
 
-#: ../libpurple/status.c:1324
 #, c-format
 msgid "+++ %s became idle"
 msgstr "+++ %s har blivit inaktiv"
 
-#: ../libpurple/status.c:1326
 #, c-format
 msgid "+++ %s became unidle"
 msgstr "+++ %s har blivit aktiv"
 
-#: ../libpurple/util.c:701
 #, c-format
 msgid "%x %X"
 msgstr "%x %X"
 
-#: ../libpurple/util.c:2706
 #, c-format
 msgid "Error Reading %s"
 msgstr "Fel vid läsning av %s"
 
-#: ../libpurple/util.c:2707
-#, 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:3204
+#, 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~."
+
 msgid "Calculating..."
 msgstr "Beräknar..."
 
-#: ../libpurple/util.c:3207
 msgid "Unknown."
 msgstr "Okänd."
 
-#: ../libpurple/util.c:3233
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
-#: ../libpurple/util.c:3245
 #, c-format
 msgid "%d day"
 msgid_plural "%d days"
 msgstr[0] "%d dag"
 msgstr[1] "%d dagar"
 
-#: ../libpurple/util.c:3253
 #, c-format
 msgid "%s, %d hour"
 msgid_plural "%s, %d hours"
 msgstr[0] "%s, %d timme"
 msgstr[1] "%s, %d timmar"
 
-#: ../libpurple/util.c:3259
 #, c-format
 msgid "%d hour"
 msgid_plural "%d hours"
 msgstr[0] "%d timme"
 msgstr[1] "%d timmar"
 
-#: ../libpurple/util.c:3267
 #, c-format
 msgid "%s, %d minute"
 msgid_plural "%s, %d minutes"
 msgstr[0] "%s, %d minut"
 msgstr[1] "%s, %d minuter"
 
-#: ../libpurple/util.c:3273
 #, c-format
 msgid "%d minute"
 msgid_plural "%d minutes"
 msgstr[0] "%d minut"
 msgstr[1] "%d minuter"
 
-#: ../libpurple/util.c:3533
 #, 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:3570
-#: ../libpurple/util.c:3866
 #, c-format
 msgid "Unable to connect to %s"
 msgstr "Kan inte ansluta till %s"
 
-#: ../libpurple/util.c:3693
-#, 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:3728
+#, 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."
+
 #, c-format
 msgid "Error reading from %s: %s"
 msgstr "Fel vid läsning av från %s: %s"
 
-#: ../libpurple/util.c:3759
 #, c-format
 msgid "Error writing to %s: %s"
 msgstr "Fel vid skrivning av %s: %s"
 
-#: ../libpurple/util.c:3784
 #, 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:128
 msgid "Orientation"
 msgstr "Orientering"
 
-#: ../pidgin/eggtrayicon.c:129
 msgid "The orientation of the tray."
 msgstr "Uppsamlarens orientering."
 
 #. Build the login options frame.
-#: ../pidgin/gtkaccount.c:410
 msgid "Login Options"
 msgstr "Inloggningsalternativ"
 
-#: ../pidgin/gtkaccount.c:431
 msgid "Pro_tocol:"
 msgstr "Pro_tokoll:"
 
-#: ../pidgin/gtkaccount.c:442
 msgid "Screen _name:"
 msgstr "Skärm_namn:"
 
-#: ../pidgin/gtkaccount.c:532
 msgid "_Local alias:"
 msgstr "_Lokalt alias:"
 
-#: ../pidgin/gtkaccount.c:536
 msgid "Remember pass_word"
 msgstr "_Kom ihåg lösenordet"
 
 #. Build the user options frame.
-#: ../pidgin/gtkaccount.c:594
 msgid "User Options"
 msgstr "Användaralternativ"
 
-#: ../pidgin/gtkaccount.c:607
 msgid "New _mail notifications"
 msgstr "Rapportera ny e-_post"
 
 #. Buddy icon
-#: ../pidgin/gtkaccount.c:612
 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:734
 #, c-format
 msgid "%s Options"
 msgstr "%s-alternativ"
 
-#: ../pidgin/gtkaccount.c:939
 msgid "Use GNOME Proxy Settings"
 msgstr "Använd GNOME proxyinställningar"
 
-#: ../pidgin/gtkaccount.c:940
 msgid "Use Global Proxy Settings"
 msgstr "Använd globala proxyinställningar"
 
-#: ../pidgin/gtkaccount.c:946
 msgid "No Proxy"
 msgstr "Ingen proxy"
 
-#: ../pidgin/gtkaccount.c:952
 msgid "HTTP"
 msgstr "HTTP"
 
-#: ../pidgin/gtkaccount.c:958
 msgid "SOCKS 4"
 msgstr "SOCKS 4"
 
-#: ../pidgin/gtkaccount.c:964
 msgid "SOCKS 5"
 msgstr "SOCKS 5"
 
-#: ../pidgin/gtkaccount.c:970
-#: ../pidgin/gtkprefs.c:1253
 msgid "Use Environmental Settings"
 msgstr "Använd miljöinställningar"
 
@@ -13505,368 +9688,278 @@
 #. 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:1009
 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:1012
 msgid "you can see the butterflies mating"
 msgstr "kan du se fjärilarna para sig"
 
-#: ../pidgin/gtkaccount.c:1033
 msgid "Proxy Options"
 msgstr "Proxyalternativ"
 
-#: ../pidgin/gtkaccount.c:1047
-#: ../pidgin/gtkprefs.c:1247
 msgid "Proxy _type:"
 msgstr "Proxy_typ:"
 
-#: ../pidgin/gtkaccount.c:1056
-#: ../pidgin/gtkprefs.c:1268
 msgid "_Host:"
 msgstr "_Värd:"
 
-#: ../pidgin/gtkaccount.c:1060
-#: ../pidgin/gtkprefs.c:1286
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../pidgin/gtkaccount.c:1068
 msgid "_Username:"
 msgstr "_Användarnamn:"
 
-#: ../pidgin/gtkaccount.c:1075
-#: ../pidgin/gtkprefs.c:1323
 msgid "Pa_ssword:"
 msgstr "_Lösenord:"
 
-#: ../pidgin/gtkaccount.c:1199
 msgid "Unable to save new account"
 msgstr "Kan inte spara nytt konto"
 
-#: ../pidgin/gtkaccount.c:1200
 msgid "An account already exists with the specified criteria."
 msgstr "Ett konto finns redan med de angivna uppgifterna."
 
-#: ../pidgin/gtkaccount.c:1478
 msgid "Add Account"
 msgstr "Lägg till konto"
 
-# src/menus.c:327
-#: ../pidgin/gtkaccount.c:1497
 msgid "_Basic"
 msgstr "_Basic"
 
-#: ../pidgin/gtkaccount.c:1504
 msgid "Create this new account on the server"
 msgstr "Skapa detta nya kontot på servern"
 
-#: ../pidgin/gtkaccount.c:1520
 msgid "_Advanced"
 msgstr "_Avancerat"
 
-#: ../pidgin/gtkaccount.c:1978
-#: ../pidgin/gtkplugin.c:569
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: ../pidgin/gtkaccount.c:2006
 msgid "Protocol"
 msgstr "Protokoll"
 
-#: ../pidgin/gtkaccount.c:2207
 #, 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"
+"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"
+"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"
+"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:527
+"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"
+
 #, c-format
 msgid "You have %d contact named %s. Would you like to merge them?"
-msgid_plural "You currently have %d contacts named %s. Would you like to merge them?"
+msgid_plural ""
+"You currently have %d contacts named %s. Would you like to merge them?"
 msgstr[0] "Du har för tillfället %d kontakt vid namn %s. Vill du slå ihop dem?"
-msgstr[1] "Du har för tillfället %d kontakter vid namn %s. Vill du slå ihop dem?"
-
-#: ../pidgin/gtkblist.c:528
-msgid "Merging these contacts will cause them to share a single entry on the buddy list and use a single conversation window. You can separate them again by choosing 'Expand' from the contact's context menu"
-msgstr "Slår du ihop dessa kontakter innebär det att de kommer dela på en post på din kompislista och använda ett konversationsfönster. Du kan separera dem igen genom att välja 'Expandera' från kontaktens omgivningsmeny"
-
-# src/sidebar.c:103
-#: ../pidgin/gtkblist.c:530
+msgstr[1] ""
+"Du har för tillfället %d kontakter vid namn %s. Vill du slå ihop dem?"
+
+msgid ""
+"Merging these contacts will cause them to share a single entry on the buddy "
+"list and use a single conversation window. You can separate them again by "
+"choosing 'Expand' from the contact's context menu"
+msgstr ""
+"Slår du ihop dessa kontakter innebär det att de kommer dela på en post på "
+"din kompislista och använda ett konversationsfönster. Du kan separera dem "
+"igen genom att välja 'Expandera' från kontaktens omgivningsmeny"
+
 msgid "_Merge"
 msgstr "_Slå ihop"
 
-#: ../pidgin/gtkblist.c:948
-msgid "Please enter the appropriate information about the chat you would like to join.\n"
+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"
 
-#: ../pidgin/gtkblist.c:959
-#: ../pidgin/gtkblist.c:6246
-#: ../pidgin/gtkpounce.c:546
-#: ../pidgin/gtkroomlist.c:396
 msgid "_Account:"
 msgstr "_Konto:"
 
-#: ../pidgin/gtkblist.c:1248
-#: ../pidgin/gtkprivacy.c:603
-#: ../pidgin/gtkprivacy.c:617
 msgid "_Block"
 msgstr "_Blockera"
 
-#: ../pidgin/gtkblist.c:1248
 msgid "Un_block"
 msgstr "Ta bort _blockering"
 
-#: ../pidgin/gtkblist.c:1291
 msgid "Move to"
 msgstr "Flytta till"
 
-#: ../pidgin/gtkblist.c:1331
 msgid "Get _Info"
 msgstr "Hämta _info"
 
-#: ../pidgin/gtkblist.c:1334
-#: ../pidgin/pidginstock.c:90
 msgid "I_M"
 msgstr "_Meddelande"
 
-#: ../pidgin/gtkblist.c:1340
 msgid "_Send File..."
 msgstr "_Skicka fil..."
 
-#: ../pidgin/gtkblist.c:1347
 msgid "Add Buddy _Pounce..."
 msgstr "Lägg till kom_pisattack..."
 
-#: ../pidgin/gtkblist.c:1352
-#: ../pidgin/gtkblist.c:1356
-#: ../pidgin/gtkblist.c:1471
-#: ../pidgin/gtkblist.c:1494
 msgid "View _Log"
 msgstr "Visa _logg"
 
-#: ../pidgin/gtkblist.c:1362
 msgid "Hide when offline"
 msgstr "Dölj om frånkopplade"
 
-#: ../pidgin/gtkblist.c:1362
 msgid "Show when offline"
 msgstr "Visa om frånkopplade"
 
-#: ../pidgin/gtkblist.c:1376
-#: ../pidgin/gtkblist.c:1385
-#: ../pidgin/gtkblist.c:1479
-#: ../pidgin/gtkblist.c:1500
 msgid "_Alias..."
 msgstr "_Alias..."
 
-#: ../pidgin/gtkblist.c:1379
-#: ../pidgin/gtkblist.c:1387
-#: ../pidgin/gtkblist.c:1481
-#: ../pidgin/gtkblist.c:1502
 msgid "_Remove"
 msgstr "_Ta bort"
 
-#: ../pidgin/gtkblist.c:1437
 msgid "Add _Buddy..."
 msgstr "_Lägg till kompis..."
 
-#: ../pidgin/gtkblist.c:1440
 msgid "Add C_hat..."
 msgstr "Lägg till c_hatt..."
 
-#: ../pidgin/gtkblist.c:1443
 msgid "_Delete Group"
 msgstr "_Ta bort grupp"
 
-#: ../pidgin/gtkblist.c:1445
 msgid "_Rename"
 msgstr "Byt _namn"
 
 #. join button
-#: ../pidgin/gtkblist.c:1465
-#: ../pidgin/gtkroomlist.c:307
-#: ../pidgin/gtkroomlist.c:460
-#: ../pidgin/pidginstock.c:88
 msgid "_Join"
 msgstr "_Anslut"
 
-#: ../pidgin/gtkblist.c:1467
 msgid "Auto-Join"
 msgstr "Anslut automatiskt"
 
-#: ../pidgin/gtkblist.c:1469
 msgid "Persistent"
 msgstr "Ihållande"
 
-#: ../pidgin/gtkblist.c:1507
-#: ../pidgin/gtkblist.c:1530
 msgid "_Collapse"
 msgstr "_Fäll ihop"
 
-#: ../pidgin/gtkblist.c:1535
 msgid "_Expand"
 msgstr "_Expandera"
 
-#: ../pidgin/gtkblist.c:1786
-#: ../pidgin/gtkblist.c:1798
-#: ../pidgin/gtkblist.c:4933
-#: ../pidgin/gtkblist.c:4946
 msgid "/Tools/Mute Sounds"
 msgstr "/Verktyg/Stäng av ljud"
 
-#: ../pidgin/gtkblist.c:2258
-#: ../pidgin/gtkconv.c:4919
-#: ../pidgin/gtkpounce.c:437
-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."
+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:3070
 msgid "/_Buddies"
 msgstr "/_Kompisar"
 
-#: ../pidgin/gtkblist.c:3071
 msgid "/Buddies/New Instant _Message..."
 msgstr "/Kompisar/Nytt _snabbmeddelande..."
 
-#: ../pidgin/gtkblist.c:3072
 msgid "/Buddies/Join a _Chat..."
 msgstr "/Kompisar/Anslut till _chatt..."
 
-#: ../pidgin/gtkblist.c:3073
 msgid "/Buddies/Get User _Info..."
 msgstr "/Kompisar/Hämta användar_info..."
 
-#: ../pidgin/gtkblist.c:3074
 msgid "/Buddies/View User _Log..."
 msgstr "/Kompisar/Visa användar_logg..."
 
-#: ../pidgin/gtkblist.c:3076
 msgid "/Buddies/Sh_ow"
 msgstr "/Kompisar/_Visa"
 
-#: ../pidgin/gtkblist.c:3077
 msgid "/Buddies/Show/_Offline Buddies"
 msgstr "/Kompisar/Visa/_Frånkopplade kompisar"
 
-#: ../pidgin/gtkblist.c:3078
 msgid "/Buddies/Show/_Empty Groups"
 msgstr "/Kompisar/Visa/_Tomma grupper"
 
-#: ../pidgin/gtkblist.c:3079
 msgid "/Buddies/Show/Buddy _Details"
 msgstr "/Kompisar/Visa/_Kompisdetaljer"
 
-#: ../pidgin/gtkblist.c:3080
 msgid "/Buddies/Show/Idle _Times"
 msgstr "/Kompisar/Visa/Frånvaro_tid"
 
-#: ../pidgin/gtkblist.c:3081
 msgid "/Buddies/Show/_Protocol Icons"
 msgstr "/Kompisar/Visa/_Protokollikoner"
 
-#: ../pidgin/gtkblist.c:3082
 msgid "/Buddies/_Sort Buddies"
 msgstr "/Kompisar/_Sortera kompisar"
 
-#: ../pidgin/gtkblist.c:3084
 msgid "/Buddies/_Add Buddy..."
 msgstr "/Kompisar/Lägg till _kompis..."
 
-#: ../pidgin/gtkblist.c:3085
 msgid "/Buddies/Add C_hat..."
 msgstr "/Kompisar/Lägg till c_hatt..."
 
-#: ../pidgin/gtkblist.c:3086
 msgid "/Buddies/Add _Group..."
 msgstr "/Kompisar/Lägg till _grupp..."
 
-#: ../pidgin/gtkblist.c:3088
 msgid "/Buddies/_Quit"
 msgstr "/Kompisar/_Avsluta"
 
 #. Accounts menu
-#: ../pidgin/gtkblist.c:3091
 msgid "/_Accounts"
 msgstr "/_Konton"
 
-#: ../pidgin/gtkblist.c:3092
-#: ../pidgin/gtkblist.c:6948
 msgid "/Accounts/Manage"
 msgstr "/Konton/Hantera"
 
 #. Tools
-#: ../pidgin/gtkblist.c:3095
 msgid "/_Tools"
 msgstr "/_Verktyg"
 
-#: ../pidgin/gtkblist.c:3096
 msgid "/Tools/Buddy _Pounces"
 msgstr "/Verktyg/Kom_pisattack"
 
-#: ../pidgin/gtkblist.c:3097
 msgid "/Tools/_Certificates"
 msgstr "/Verktyg/_Certifikat"
 
-#: ../pidgin/gtkblist.c:3098
 msgid "/Tools/Plu_gins"
 msgstr "/Verktyg/Insticksmodu_ler"
 
-#: ../pidgin/gtkblist.c:3099
 msgid "/Tools/Pr_eferences"
 msgstr "/Verktyg/_Inställningar"
 
-#: ../pidgin/gtkblist.c:3100
 msgid "/Tools/Pr_ivacy"
 msgstr "/Verktyg/_Spärrlista"
 
-#: ../pidgin/gtkblist.c:3102
 msgid "/Tools/_File Transfers"
 msgstr "/Verktyg/_Filöverföringar"
 
-#: ../pidgin/gtkblist.c:3103
 msgid "/Tools/R_oom List"
 msgstr "/Verktyg/R_umslista"
 
-#: ../pidgin/gtkblist.c:3104
 msgid "/Tools/System _Log"
 msgstr "/Verktyg/Visa _systemlogg"
 
-#: ../pidgin/gtkblist.c:3106
 msgid "/Tools/Mute _Sounds"
 msgstr "/Verktyg/Stäng av _ljud"
 
 #. Help
-#: ../pidgin/gtkblist.c:3108
 msgid "/_Help"
 msgstr "/_Hjälp"
 
-#: ../pidgin/gtkblist.c:3109
 msgid "/Help/Online _Help"
 msgstr "/Hjälp/Online_hjälp"
 
-#: ../pidgin/gtkblist.c:3110
 msgid "/Help/_Debug Window"
 msgstr "/Hjälp/_Felsökningsfönster"
 
-#: ../pidgin/gtkblist.c:3112
-#: ../pidgin/gtkblist.c:3114
 msgid "/Help/_About"
 msgstr "/Hjälp/_Om"
 
-#: ../pidgin/gtkblist.c:3143
 #, c-format
 msgid ""
 "\n"
@@ -13875,465 +9968,373 @@
 "\n"
 "<b>Konto:</b> %s"
 
-#: ../pidgin/gtkblist.c:3221
 msgid "Buddy Alias"
 msgstr "Kompisalias"
 
-#: ../pidgin/gtkblist.c:3250
 msgid "Logged In"
 msgstr "Ansluten"
 
-#: ../pidgin/gtkblist.c:3296
 msgid "Last Seen"
 msgstr "Senast sedd"
 
-#: ../pidgin/gtkblist.c:3317
 msgid "Spooky"
 msgstr "Skrämmande"
 
-#: ../pidgin/gtkblist.c:3319
 msgid "Awesome"
 msgstr "Fantastisk"
 
-#: ../pidgin/gtkblist.c:3321
 msgid "Rockin'"
 msgstr "Rockar"
 
-#: ../pidgin/gtkblist.c:3660
 #, c-format
 msgid "Idle %dd %dh %02dm"
 msgstr "Inaktiv %dd %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3662
 #, c-format
 msgid "Idle %dh %02dm"
 msgstr "Inaktiv %dh %02dm"
 
-#: ../pidgin/gtkblist.c:3664
 #, c-format
 msgid "Idle %dm"
 msgstr "Inaktiv %dm"
 
-#: ../pidgin/gtkblist.c:3818
 msgid "/Buddies/New Instant Message..."
 msgstr "/Kompisar/Nytt snabbmeddelande..."
 
-#: ../pidgin/gtkblist.c:3819
-#: ../pidgin/gtkblist.c:3852
 msgid "/Buddies/Join a Chat..."
 msgstr "/Kompisar/Anslut till _chatt..."
 
-#: ../pidgin/gtkblist.c:3820
 msgid "/Buddies/Get User Info..."
 msgstr "/Kompisar/Hämta användarinfo..."
 
-#: ../pidgin/gtkblist.c:3821
 msgid "/Buddies/Add Buddy..."
 msgstr "/Kompisar/Lägg till kompis..."
 
-#: ../pidgin/gtkblist.c:3822
-#: ../pidgin/gtkblist.c:3855
 msgid "/Buddies/Add Chat..."
 msgstr "/Kompisar/Lägg till chatt..."
 
-#: ../pidgin/gtkblist.c:3823
 msgid "/Buddies/Add Group..."
 msgstr "/Kompisar/Lägg till grupp..."
 
-#: ../pidgin/gtkblist.c:3858
 msgid "/Tools/Privacy"
 msgstr "/Verktyg/_Spärrlista"
 
-# Säger man inte "rumslista"?
-#: ../pidgin/gtkblist.c:3861
 msgid "/Tools/Room List"
-msgstr "/Verktyg/Rumlista"
-
-#: ../pidgin/gtkblist.c:3993
-#: ../pidgin/gtkdocklet.c:155
-#: ../pidgin/gtkdocklet.c:160
+msgstr "/Verktyg/Rumslista"
+
 #, 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:4153
 msgid "Manually"
 msgstr "Manuellt"
 
-#: ../pidgin/gtkblist.c:4156
 msgid "By status"
 msgstr "Efter status"
 
-#: ../pidgin/gtkblist.c:4157
 msgid "By log size"
 msgstr "Efter loggstorlek"
 
-#: ../pidgin/gtkblist.c:4362
-#: ../pidgin/gtkconn.c:180
 #, c-format
 msgid "%s disconnected"
 msgstr "%s kopplades ifrån."
 
-#: ../pidgin/gtkblist.c:4397
-#, c-format
-msgid "<span color=\"red\">%s disconnected: %s</span>"
-msgstr "<span color=\"red\">%s frånkopplad: %s</span>"
-
-#: ../pidgin/gtkblist.c:4549
+#, c-format
+msgid "%s disabled"
+msgstr "%s avstängt"
+
+msgid "Reconnect"
+msgstr "Återanslut"
+
+msgid "Re-enable"
+msgstr "Återaktivera konto"
+
+msgid "Ignore"
+msgstr "Ignorera"
+
+#, c-format
+msgid "%d account was disabled because you signed on from another location."
+msgid_plural ""
+"%d accounts were disabled because you signed on from another location."
+msgstr[0] ""
+"Kontot %d inaktiverades eftersom du anslöt till kontot från en annan dator."
+msgstr[1] ""
+"Kontona %d inaktiverades eftersom du anslöt till kontona från en annan dator."
+
 msgid "<b>Username:</b>"
 msgstr "<b>Användarnamn:</b>"
 
-#: ../pidgin/gtkblist.c:4556
 msgid "<b>Password:</b>"
 msgstr "<b>Lösenord:</b>"
 
-#: ../pidgin/gtkblist.c:4567
 msgid "_Login"
 msgstr "_Login"
 
-#: ../pidgin/gtkblist.c:4650
 msgid "/Accounts"
 msgstr "/Konton"
 
 #. Translators: Please maintain the use of -> and <- to refer to menu heirarchy
-#: ../pidgin/gtkblist.c:4664
 #, 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->Manage</b>. Once you enable accounts, you'll be able to sign on, set your status, and talk to your friends."
+"You have no accounts enabled. Enable your IM accounts from the <b>Accounts</"
+"b> window at <b>Accounts->Manage</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->Hantera</b>. Så snart du har aktiverat dina konton kommer du kunna välja en status och prata med dina vänner."
+"Du har inga konton aktiverade. Aktivera dina IM-konton från fönstret "
+"<b>Konton</b> vid <b>Konton->Hantera</b>. Så snart du 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:4927
 msgid "/Buddies/Show/Offline Buddies"
 msgstr "/Kompisar/Visa/Frånkopplade kompisar"
 
-#: ../pidgin/gtkblist.c:4930
 msgid "/Buddies/Show/Empty Groups"
 msgstr "/Kompisar/Visa/Tomma grupper"
 
-#: ../pidgin/gtkblist.c:4936
 msgid "/Buddies/Show/Buddy Details"
 msgstr "/Kompisar/Visa/Kompisdetaljer"
 
-#: ../pidgin/gtkblist.c:4939
 msgid "/Buddies/Show/Idle Times"
 msgstr "/Kompisar/Visa/Frånvarotid"
 
-#: ../pidgin/gtkblist.c:4942
 msgid "/Buddies/Show/Protocol Icons"
 msgstr "/Kompisar/Visa/Protokollikoner"
 
-#: ../pidgin/gtkblist.c:5854
-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"
+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"
 
 #. Set up stuff for the account box
-#: ../pidgin/gtkblist.c:5877
 msgid "A_ccount:"
 msgstr "_Konto:"
 
 #. End of account box
-#: ../pidgin/gtkblist.c:5889
 msgid "_Screen name:"
 msgstr "_Skärmnamn:"
 
-#: ../pidgin/gtkblist.c:5911
-#: ../pidgin/gtkblist.c:6267
 msgid "A_lias:"
 msgstr "A_lias:"
 
-#: ../pidgin/gtkblist.c:6179
 msgid "This protocol does not support chat rooms."
 msgstr "Protokollet stödjer inte chattrum."
 
-#: ../pidgin/gtkblist.c:6195
-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:6236
-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:6295
+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."
+
+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"
+
 msgid "Autojoin when account becomes online."
 msgstr "Gå med automatiskt då kontot är anslutet."
 
-#: ../pidgin/gtkblist.c:6296
 msgid "Hide chat when the window is closed."
 msgstr "Göm chatt när fönstret är stängt."
 
-#: ../pidgin/gtkblist.c:6322
 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:6968
 msgid "<PurpleMain>/Accounts/"
 msgstr "<PurpleMain>/Konton/"
 
-#: ../pidgin/gtkblist.c:6992
 msgid "_Edit Account"
 msgstr "_Ändra konto"
 
-#: ../pidgin/gtkblist.c:7005
-#: ../pidgin/gtkconv.c:3143
 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:7013
 msgid "_Disable"
 msgstr "A_vaktivera"
 
-#: ../pidgin/gtkblist.c:7025
 msgid "Enable Account"
 msgstr "Aktivera konto"
 
-#: ../pidgin/gtkblist.c:7031
 msgid "<PurpleMain>/Accounts/Enable Account"
 msgstr "<PurpleMain>/Konton/Aktivera Konto"
 
-#: ../pidgin/gtkblist.c:7080
 msgid "/Tools"
 msgstr "/Verktyg"
 
-#: ../pidgin/gtkblist.c:7150
 msgid "/Buddies/Sort Buddies"
 msgstr "/Kompisar/Sortera kompisar"
 
 #. Widget creation function
-#: ../pidgin/gtkcertmgr.c:530
 msgid "SSL Servers"
 msgstr "SSL-Server"
 
-#: ../pidgin/gtkconn.c:181
-#, 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:524
 msgid "Unknown command."
 msgstr "Okänt kommando."
 
-#: ../pidgin/gtkconv.c:796
-#: ../pidgin/gtkconv.c:822
 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:816
-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:869
+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."
+
 msgid "Invite Buddy Into Chat Room"
 msgstr "Bjud in kompis till chattrum"
 
 #. Put our happy label in it.
-#: ../pidgin/gtkconv.c:899
-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:920
+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"
+
 msgid "_Buddy:"
 msgstr "_Kompis:"
 
-# src/sidebar.c:103
-#: ../pidgin/gtkconv.c:931
-#: ../pidgin/gtksavedstatuses.c:1194
-#: ../pidgin/gtksavedstatuses.c:1529
 msgid "_Message:"
 msgstr "_Meddelande:"
 
-#: ../pidgin/gtkconv.c:995
 #, c-format
 msgid "<h1>Conversation with %s</h1>\n"
 msgstr "<h1>Konversation med %s</h1>\n"
 
-#: ../pidgin/gtkconv.c:1033
 msgid "Save Conversation"
 msgstr "Spara konversationen"
 
-#: ../pidgin/gtkconv.c:1179
-#: ../pidgin/gtkdebug.c:167
-#: ../pidgin/gtkdebug.c:743
 msgid "Find"
 msgstr "Sök"
 
-#: ../pidgin/gtkconv.c:1205
-#: ../pidgin/gtkdebug.c:195
 msgid "_Search for:"
 msgstr "_Sök efter:"
 
-#: ../pidgin/gtkconv.c:1676
 msgid "Un-Ignore"
 msgstr "Avignorera"
 
-#: ../pidgin/gtkconv.c:1679
-msgid "Ignore"
-msgstr "Ignorera"
-
-#: ../pidgin/gtkconv.c:1699
 msgid "Get Away Message"
 msgstr "Hämta frånvaromeddelande"
 
-#: ../pidgin/gtkconv.c:1722
 msgid "Last said"
 msgstr "Senast sagt"
 
-#: ../pidgin/gtkconv.c:2671
 msgid "Unable to save icon file to disk."
 msgstr "Kan inte spara ikonfil på disken."
 
-#: ../pidgin/gtkconv.c:2722
 msgid "Save Icon"
 msgstr "Spara ikon"
 
-#: ../pidgin/gtkconv.c:2774
 msgid "Animate"
 msgstr "Animera"
 
-#: ../pidgin/gtkconv.c:2779
 msgid "Hide Icon"
 msgstr "Dölj ikon"
 
-#: ../pidgin/gtkconv.c:2782
 msgid "Save Icon As..."
 msgstr "Spara ikon som..."
 
-#: ../pidgin/gtkconv.c:2786
 msgid "Set Custom Icon..."
 msgstr "Välj egen ikon..."
 
-#: ../pidgin/gtkconv.c:2799
 msgid "Remove Custom Icon"
 msgstr "Ta bort egen ikon"
 
-#: ../pidgin/gtkconv.c:2931
 msgid "Show All"
 msgstr "Visa Alla"
 
 #. Conversation menu
-#: ../pidgin/gtkconv.c:2950
 msgid "/_Conversation"
 msgstr "/_Konversation"
 
-#: ../pidgin/gtkconv.c:2952
 msgid "/Conversation/New Instant _Message..."
 msgstr "/Konversation/Nytt snabb_meddelande..."
 
-#: ../pidgin/gtkconv.c:2957
 msgid "/Conversation/_Find..."
 msgstr "/Konversation/_Sök..."
 
-#: ../pidgin/gtkconv.c:2959
 msgid "/Conversation/View _Log"
 msgstr "/Konversation/Visa _Logg"
 
-#: ../pidgin/gtkconv.c:2960
 msgid "/Conversation/_Save As..."
 msgstr "/Konversation/_Spara som..."
 
-#: ../pidgin/gtkconv.c:2962
 msgid "/Conversation/Clea_r Scrollback"
 msgstr "/Konversation/_Rensa tillbakablick"
 
-#: ../pidgin/gtkconv.c:2966
 msgid "/Conversation/Se_nd File..."
 msgstr "/Konversation/S_kicka fil..."
 
-#: ../pidgin/gtkconv.c:2967
 msgid "/Conversation/Add Buddy _Pounce..."
 msgstr "/Konversation/Lägg till Kom_pisattack..."
 
-#: ../pidgin/gtkconv.c:2969
 msgid "/Conversation/_Get Info"
 msgstr "/Konversation/_Hämta information"
 
-#: ../pidgin/gtkconv.c:2971
 msgid "/Conversation/In_vite..."
 msgstr "/Konversation/_Bjud in..."
 
-#: ../pidgin/gtkconv.c:2973
 msgid "/Conversation/M_ore"
 msgstr "/Konversation/_Mer"
 
-#: ../pidgin/gtkconv.c:2977
 msgid "/Conversation/Al_ias..."
 msgstr "/Konversation/Al_ias..."
 
-#: ../pidgin/gtkconv.c:2979
 msgid "/Conversation/_Block..."
 msgstr "/Konversation/_Blockera"
 
-#: ../pidgin/gtkconv.c:2981
 msgid "/Conversation/_Unblock..."
 msgstr "/Konversation/_Avblockera..."
 
-#: ../pidgin/gtkconv.c:2983
 msgid "/Conversation/_Add..."
 msgstr "/Konversation/_Lägg till..."
 
-#: ../pidgin/gtkconv.c:2985
 msgid "/Conversation/_Remove..."
 msgstr "/Konversation/_Ta bort..."
 
-#: ../pidgin/gtkconv.c:2990
 msgid "/Conversation/Insert Lin_k..."
 msgstr "/Konversation/Infoga län_k..."
 
-#: ../pidgin/gtkconv.c:2992
 msgid "/Conversation/Insert Imag_e..."
 msgstr "/Konversation/Infoga _bild..."
 
-#: ../pidgin/gtkconv.c:2998
 msgid "/Conversation/_Close"
 msgstr "/Konversation/_Stäng"
 
-# src/menus.c:311
 #. Options
-#: ../pidgin/gtkconv.c:3002
 msgid "/_Options"
-msgstr "_Alternativ"
-
-#: ../pidgin/gtkconv.c:3003
+msgstr "/_Alternativ"
+
 msgid "/Options/Enable _Logging"
 msgstr "/Alternativ/Aktivera _loggning"
 
-#: ../pidgin/gtkconv.c:3004
 msgid "/Options/Enable _Sounds"
 msgstr "/Alternativ/_Aktivera ljud"
 
-# Lite konstigt med plural på verktygsrader, men det står
-# ju faktiskt så:-)
-#: ../pidgin/gtkconv.c:3006
+# Lite konstigt med plural på verktygsrader, men det står ju faktiskt så:-)
+# Å andra sidan funkar nog bara "formateringsverktyg" också.
 msgid "/Options/Show Formatting _Toolbars"
-msgstr "/Alternativ/Visa forma_teringsverktygsrader"
-
-#: ../pidgin/gtkconv.c:3007
+msgstr "/Alternativ/Visa forma_teringsverktyg"
+
 msgid "/Options/Show Ti_mestamps"
 msgstr "/Alternativ/Visa tidsstä_mplar"
 
-#: ../pidgin/gtkconv.c:3131
 msgid "/Conversation/More"
 msgstr "/Konversation/Mer"
 
-# src/menus.c:311
-#: ../pidgin/gtkconv.c:3187
 msgid "/Options"
 msgstr "/Alternativ"
 
@@ -14342,969 +10343,708 @@
 #. 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:3222
-#: ../pidgin/gtkconv.c:3254
 msgid "/Conversation"
 msgstr "/Konversation"
 
-#: ../pidgin/gtkconv.c:3262
 msgid "/Conversation/View Log"
 msgstr "/Konversation/Visa logg"
 
-#: ../pidgin/gtkconv.c:3268
 msgid "/Conversation/Send File..."
 msgstr "/Konversation/Skicka fil..."
 
-#: ../pidgin/gtkconv.c:3272
 msgid "/Conversation/Add Buddy Pounce..."
 msgstr "/Konversation/Lägg till kompisattack..."
 
-#: ../pidgin/gtkconv.c:3278
 msgid "/Conversation/Get Info"
 msgstr "/Konversation/Hämta information"
 
-#: ../pidgin/gtkconv.c:3282
 msgid "/Conversation/Invite..."
 msgstr "/Konversation/Bjud in..."
 
-#: ../pidgin/gtkconv.c:3288
 msgid "/Conversation/Alias..."
 msgstr "/Konversation/Alias..."
 
-#: ../pidgin/gtkconv.c:3292
 msgid "/Conversation/Block..."
 msgstr "/Konversation/Blockera..."
 
-#: ../pidgin/gtkconv.c:3296
 msgid "/Conversation/Unblock..."
 msgstr "/Konversation/Avblockera..."
 
-#: ../pidgin/gtkconv.c:3300
 msgid "/Conversation/Add..."
 msgstr "/Konversation/Lägg till..."
 
-#: ../pidgin/gtkconv.c:3304
 msgid "/Conversation/Remove..."
 msgstr "/Konversation/Ta bort..."
 
-#: ../pidgin/gtkconv.c:3310
 msgid "/Conversation/Insert Link..."
 msgstr "/Konversation/Infoga länk..."
 
-#: ../pidgin/gtkconv.c:3314
 msgid "/Conversation/Insert Image..."
 msgstr "/Konversation/Infoga bild..."
 
-#: ../pidgin/gtkconv.c:3320
 msgid "/Options/Enable Logging"
 msgstr "/Alternativ/Aktivera loggning"
 
-#: ../pidgin/gtkconv.c:3323
 msgid "/Options/Enable Sounds"
 msgstr "/Alternativ/Aktivera ljud"
 
-#: ../pidgin/gtkconv.c:3336
 msgid "/Options/Show Formatting Toolbars"
 msgstr "/Alternativ/Visa formateringsverktyg"
 
-#: ../pidgin/gtkconv.c:3339
 msgid "/Options/Show Timestamps"
 msgstr "/Alternativ/Visa tidsstämplar"
 
-#: ../pidgin/gtkconv.c:3416
-#: ../pidgin/gtkconv.c:3458
 msgid "User is typing..."
 msgstr "Användaren skriver..."
 
-#: ../pidgin/gtkconv.c:3461
 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:3645
-#: ../pidgin/gtkconv.c:8180
 msgid "S_end To"
 msgstr "_Skicka till"
 
-#: ../pidgin/gtkconv.c:4357
 msgid "_Send"
 msgstr "_Skicka"
 
 #. Setup the label telling how many people are in the room.
-#: ../pidgin/gtkconv.c:4470
 msgid "0 people in room"
 msgstr "0 personer i rummet"
 
-#: ../pidgin/gtkconv.c:5843
-#: ../pidgin/gtkconv.c:5964
 #, 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:6571
-#: ../pidgin/gtkstatusbox.c:660
 msgid "Typing"
 msgstr "Skriver"
 
-#: ../pidgin/gtkconv.c:6575
 msgid "Stopped Typing"
 msgstr "Slutade skriva"
 
-#: ../pidgin/gtkconv.c:6578
 msgid "Nick Said"
 msgstr "Smeknamn nämnt"
 
-#: ../pidgin/gtkconv.c:6581
-#: ../pidgin/gtkdocklet.c:685
 msgid "Unread Messages"
 msgstr "Olästa meddeladen"
 
-#: ../pidgin/gtkconv.c:6587
 msgid "New Event"
 msgstr "Ny händelse"
 
-#: ../pidgin/gtkconv.c:7699
 msgid "clear: Clears all conversation scrollbacks."
 msgstr "clear: Rensar alla konversationers tillbakablickar."
 
-#: ../pidgin/gtkconv.c:7862
 msgid "Confirm close"
 msgstr "Bekräfta stängning"
 
-#: ../pidgin/gtkconv.c:7894
 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:8513
 msgid "Close other tabs"
 msgstr "Stäng andra flikar"
 
-#: ../pidgin/gtkconv.c:8519
 msgid "Close all tabs"
 msgstr "Stäng alla flikar"
 
-#: ../pidgin/gtkconv.c:8527
 msgid "Detach this tab"
 msgstr "Lossa denna flik"
 
-#: ../pidgin/gtkconv.c:8533
 msgid "Close this tab"
 msgstr "Stäng denna flik"
 
-#: ../pidgin/gtkconv.c:9038
 msgid "Close conversation"
 msgstr "Stäng konversationen"
 
-#: ../pidgin/gtkconv.c:9640
 msgid "Last created window"
 msgstr "Senast skapade fönster"
 
-#: ../pidgin/gtkconv.c:9642
 msgid "Separate IM and Chat windows"
 msgstr "Separera IM- och chattfönster"
 
-#: ../pidgin/gtkconv.c:9644
-#: ../pidgin/gtkprefs.c:1471
 msgid "New window"
 msgstr "Nytt fönster"
 
-#: ../pidgin/gtkconv.c:9646
 msgid "By group"
 msgstr "Efter grupp"
 
-#: ../pidgin/gtkconv.c:9648
 msgid "By account"
 msgstr "Efter konto"
 
-#: ../pidgin/gtkdebug.c:234
 msgid "Save Debug Log"
 msgstr "Spara felsökningslogg"
 
-#: ../pidgin/gtkdebug.c:582
 msgid "Invert"
 msgstr "Invertera"
 
-#: ../pidgin/gtkdebug.c:585
 msgid "Highlight matches"
 msgstr "Markera träffar"
 
-#: ../pidgin/gtkdebug.c:652
 msgid "_Icon Only"
 msgstr "Endast _ikon"
 
-#: ../pidgin/gtkdebug.c:653
 msgid "_Text Only"
 msgstr "Endast _text"
 
-#: ../pidgin/gtkdebug.c:654
 msgid "_Both Icon & Text"
 msgstr "_Båda ikon och text"
 
-#: ../pidgin/gtkdebug.c:775
 msgid "Filter"
 msgstr "Filter"
 
-#: ../pidgin/gtkdebug.c:794
 msgid "Right click for more options."
 msgstr "Högerklicka för fler alternativ."
 
-#: ../pidgin/gtkdebug.c:824
 msgid "Level "
 msgstr "Nivå"
 
-#: ../pidgin/gtkdebug.c:825
-#: ../pidgin/gtkdebug.c:831
 msgid "Select the debug filter level."
 msgstr "Välj debugfiltrets nivå."
 
-#: ../pidgin/gtkdebug.c:833
 msgid "All"
 msgstr "Alla"
 
-#: ../pidgin/gtkdebug.c:834
 msgid "Misc"
 msgstr "Övrigt"
 
-#: ../pidgin/gtkdebug.c:836
 msgid "Warning"
 msgstr "Varning"
 
-#: ../pidgin/gtkdebug.c:837
 msgid "Error "
 msgstr "Fel"
 
-#: ../pidgin/gtkdebug.c:838
 msgid "Fatal Error"
 msgstr "Allvarligt fel"
 
-#: ../pidgin/gtkdialogs.c:72
-#: ../pidgin/gtkdialogs.c:117
 msgid "lead developer"
 msgstr "utvecklingsledare"
 
-#: ../pidgin/gtkdialogs.c:73
-#: ../pidgin/gtkdialogs.c:74
-#: ../pidgin/gtkdialogs.c:75
-#: ../pidgin/gtkdialogs.c:76
-#: ../pidgin/gtkdialogs.c:77
-#: ../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:86
-#: ../pidgin/gtkdialogs.c:89
-#: ../pidgin/gtkdialogs.c:91
-#: ../pidgin/gtkdialogs.c:92
 msgid "developer"
 msgstr "utvecklare"
 
-#: ../pidgin/gtkdialogs.c:87
 msgid "support"
 msgstr "support"
 
-#: ../pidgin/gtkdialogs.c:88
 msgid "support/QA"
 msgstr "support/QA"
 
-#: ../pidgin/gtkdialogs.c:90
-#: ../pidgin/gtkdialogs.c:112
 msgid "developer & webmaster"
 msgstr "utvecklare & webbansvarig"
 
-#: ../pidgin/gtkdialogs.c:99
 msgid "Senior Contributor/QA"
 msgstr "Senior Contributor/Kvalitetsgranskning"
 
-#: ../pidgin/gtkdialogs.c:108
 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:109
-#: ../pidgin/gtkdialogs.c:110
+# Problemet är om just "ansvarig" passar in, bättre hade
+# varit typ "underhållare" fast jag fastnar alltid på att
+# det får en att tänka på humor istället och min hjärna fastnar
+# alltid på vad man kan kalla dem som gör underhållsarbete.
 msgid "maintainer"
-msgstr "maintainer"
-
-#: ../pidgin/gtkdialogs.c:111
+msgstr "underhållare"
+
 msgid "libfaim maintainer"
-msgstr "libfaim-maintainer "
+msgstr "libfaim-underhållare"
 
 #. 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:133
 msgid "Afrikaans"
 msgstr "Afrikaans"
 
-#: ../pidgin/gtkdialogs.c:134
-#: ../pidgin/gtkdialogs.c:226
 msgid "Arabic"
 msgstr "Arabiska"
 
-#: ../pidgin/gtkdialogs.c:135
 msgid "Belarusian Latin"
 msgstr "Vitryska Latin"
 
-#: ../pidgin/gtkdialogs.c:136
-#: ../pidgin/gtkdialogs.c:137
-#: ../pidgin/gtkdialogs.c:227
 msgid "Bulgarian"
 msgstr "Bulgariska"
 
-#: ../pidgin/gtkdialogs.c:138
-#: ../pidgin/gtkdialogs.c:139
-#: ../pidgin/gtkdialogs.c:140
-#: ../pidgin/gtkdialogs.c:141
 msgid "Bengali"
 msgstr "Bengali"
 
-#: ../pidgin/gtkdialogs.c:142
 msgid "Bosnian"
 msgstr "Bostniska"
 
-#: ../pidgin/gtkdialogs.c:143
-#: ../pidgin/gtkdialogs.c:228
-#: ../pidgin/gtkdialogs.c:229
 msgid "Catalan"
 msgstr "Katalanska"
 
-#: ../pidgin/gtkdialogs.c:144
-#: ../pidgin/gtkdialogs.c:145
 msgid "Valencian-Catalan"
 msgstr "Valencianska"
 
-#: ../pidgin/gtkdialogs.c:146
-#: ../pidgin/gtkdialogs.c:230
 msgid "Czech"
 msgstr "Tjeckiska"
 
-#: ../pidgin/gtkdialogs.c:147
-#: ../pidgin/gtkdialogs.c:148
 msgid "Danish"
 msgstr "Danska"
 
-#: ../pidgin/gtkdialogs.c:149
-#: ../pidgin/gtkdialogs.c:150
-#: ../pidgin/gtkdialogs.c:231
 msgid "German"
 msgstr "Tyska"
 
-#: ../pidgin/gtkdialogs.c:151
-#: ../pidgin/gtkdialogs.c:152
-#: ../pidgin/gtkdialogs.c:153
 msgid "Dzongkha"
 msgstr "Dzongkha"
 
-#: ../pidgin/gtkdialogs.c:154
-#: ../pidgin/gtkdialogs.c:155
 msgid "Greek"
 msgstr "Grekiska"
 
-#: ../pidgin/gtkdialogs.c:156
 msgid "Australian English"
 msgstr "Australiensisk engelska"
 
-#: ../pidgin/gtkdialogs.c:157
 msgid "Canadian English"
 msgstr "Kanadensiskt engelska"
 
-#: ../pidgin/gtkdialogs.c:158
 msgid "British English"
 msgstr "Brittisk engelska"
 
-#: ../pidgin/gtkdialogs.c:159
 msgid "Esperanto"
 msgstr "Esperanto"
 
-#: ../pidgin/gtkdialogs.c:160
-#: ../pidgin/gtkdialogs.c:232
-#: ../pidgin/gtkdialogs.c:233
-#: ../pidgin/gtkdialogs.c:234
-#: ../pidgin/gtkdialogs.c:235
 msgid "Spanish"
 msgstr "Spanska"
 
-#: ../pidgin/gtkdialogs.c:161
 msgid "Estonian"
 msgstr "Estniska"
 
-#: ../pidgin/gtkdialogs.c:162
-#: ../pidgin/gtkdialogs.c:163
 msgid "Euskera(Basque)"
 msgstr "Baskiska"
 
-#: ../pidgin/gtkdialogs.c:164
-#: ../pidgin/gtkdialogs.c:165
-#: ../pidgin/gtkdialogs.c:166
 msgid "Persian"
 msgstr "Persiska"
 
-#: ../pidgin/gtkdialogs.c:167
-#: ../pidgin/gtkdialogs.c:236
-#: ../pidgin/gtkdialogs.c:237
 msgid "Finnish"
 msgstr "Finska"
 
-#: ../pidgin/gtkdialogs.c:168
-#: ../pidgin/gtkdialogs.c:238
-#: ../pidgin/gtkdialogs.c:239
-#: ../pidgin/gtkdialogs.c:240
-#: ../pidgin/gtkdialogs.c:241
 msgid "French"
 msgstr "Franska"
 
-#: ../pidgin/gtkdialogs.c:169
-#: ../pidgin/gtkdialogs.c:170
-#: ../pidgin/gtkdialogs.c:242
 msgid "Galician"
 msgstr "Galiciska"
 
-#: ../pidgin/gtkdialogs.c:171
-#: ../pidgin/gtkdialogs.c:172
 msgid "Gujarati"
 msgstr "Gujarati"
 
-#: ../pidgin/gtkdialogs.c:172
 msgid "Gujarati Language Team"
 msgstr "Gujarati Språkteam"
 
-#: ../pidgin/gtkdialogs.c:173
-#: ../pidgin/gtkdialogs.c:243
 msgid "Hebrew"
 msgstr "Hebreiska"
 
-#: ../pidgin/gtkdialogs.c:174
 msgid "Hindi"
 msgstr "Hindi"
 
-#: ../pidgin/gtkdialogs.c:175
-#: ../pidgin/gtkdialogs.c:244
 msgid "Hungarian"
 msgstr "Ungerska"
 
-#: ../pidgin/gtkdialogs.c:176
 msgid "Indonesian"
 msgstr "Indonesiska"
 
-#: ../pidgin/gtkdialogs.c:177
-#: ../pidgin/gtkdialogs.c:245
 msgid "Italian"
 msgstr "Italienska"
 
-#: ../pidgin/gtkdialogs.c:178
-#: ../pidgin/gtkdialogs.c:246
-#: ../pidgin/gtkdialogs.c:247
-#: ../pidgin/gtkdialogs.c:248
 msgid "Japanese"
 msgstr "Japanska"
 
-#: ../pidgin/gtkdialogs.c:179
-#: ../pidgin/gtkdialogs.c:249
 msgid "Georgian"
 msgstr "Georgiska"
 
-#: ../pidgin/gtkdialogs.c:179
 msgid "Ubuntu Georgian Translators"
 msgstr "Ubuntu Georgiska översättare"
 
-#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada"
 msgstr "Kannada"
 
-#: ../pidgin/gtkdialogs.c:180
 msgid "Kannada Translation team"
 msgstr "Kannada översättningsteam"
 
-#: ../pidgin/gtkdialogs.c:181
-#: ../pidgin/gtkdialogs.c:250
-#: ../pidgin/gtkdialogs.c:251
 msgid "Korean"
 msgstr "Koreanska"
 
-#: ../pidgin/gtkdialogs.c:182
-#: ../pidgin/gtkdialogs.c:183
-#: ../pidgin/gtkdialogs.c:184
 msgid "Kurdish"
 msgstr "Kurdiska"
 
-#: ../pidgin/gtkdialogs.c:185
 msgid "Lao"
 msgstr "Lao"
 
-#: ../pidgin/gtkdialogs.c:186
-#: ../pidgin/gtkdialogs.c:252
-#: ../pidgin/gtkdialogs.c:253
 msgid "Lithuanian"
 msgstr "Lettländska"
 
-#: ../pidgin/gtkdialogs.c:187
-#: ../pidgin/gtkdialogs.c:188
-#: ../pidgin/gtkdialogs.c:189
-#: ../pidgin/gtkdialogs.c:254
 msgid "Macedonian"
 msgstr "Makedonska"
 
-#: ../pidgin/gtkdialogs.c:190
-#: ../pidgin/gtkdialogs.c:255
-#: ../pidgin/gtkdialogs.c:256
 msgid "Bokmål Norwegian"
 msgstr "Bokmål Norska"
 
-#: ../pidgin/gtkdialogs.c:191
 msgid "Nepali"
 msgstr "Nepalska"
 
-#: ../pidgin/gtkdialogs.c:192
 msgid "Dutch, Flemish"
 msgstr "Holländska, Flamländska"
 
-#: ../pidgin/gtkdialogs.c:193
 msgid "Norwegian Nynorsk"
 msgstr "Norska Nynorsk"
 
-#: ../pidgin/gtkdialogs.c:194
-#: ../pidgin/gtkdialogs.c:195
-#: ../pidgin/gtkdialogs.c:196
-#: ../pidgin/gtkdialogs.c:257
+msgid "Punjabi"
+msgstr "Punjabi"
+
 msgid "Polish"
 msgstr "Polska"
 
-#: ../pidgin/gtkdialogs.c:197
 msgid "Portuguese"
 msgstr "Portugisiska"
 
-#: ../pidgin/gtkdialogs.c:198
 msgid "Portuguese-Brazil"
 msgstr "Portugisiska (brasiliansk)"
 
-#: ../pidgin/gtkdialogs.c:199
 msgid "Pashto"
 msgstr "Pashto"
 
-#: ../pidgin/gtkdialogs.c:200
 msgid "Romanian"
 msgstr "Rumänska"
 
-#: ../pidgin/gtkdialogs.c:201
-#: ../pidgin/gtkdialogs.c:258
-#: ../pidgin/gtkdialogs.c:259
 msgid "Russian"
 msgstr "Ryska"
 
-#: ../pidgin/gtkdialogs.c:202
-#: ../pidgin/gtkdialogs.c:203
-#: ../pidgin/gtkdialogs.c:260
-#: ../pidgin/gtkdialogs.c:261
-#: ../pidgin/gtkdialogs.c:262
 msgid "Slovak"
 msgstr "Slovakiska"
 
-#: ../pidgin/gtkdialogs.c:204
-#: ../pidgin/gtkdialogs.c:263
 msgid "Slovenian"
 msgstr "Slovenska"
 
-#: ../pidgin/gtkdialogs.c:205
 msgid "Albanian"
 msgstr "Albanska"
 
-#: ../pidgin/gtkdialogs.c:206
-#: ../pidgin/gtkdialogs.c:207
-#: ../pidgin/gtkdialogs.c:264
-#: ../pidgin/gtkdialogs.c:265
 msgid "Serbian"
 msgstr "Serbiska"
 
-#: ../pidgin/gtkdialogs.c:208
-#: ../pidgin/gtkdialogs.c:266
-#: ../pidgin/gtkdialogs.c:267
 msgid "Swedish"
 msgstr "Svenska"
 
-#: ../pidgin/gtkdialogs.c:209
 msgid "Tamil"
 msgstr "Tamilska"
 
-#: ../pidgin/gtkdialogs.c:210
 msgid "Telugu"
 msgstr "Telugu"
 
-#: ../pidgin/gtkdialogs.c:211
 msgid "Thai"
 msgstr "Thailändska"
 
-#: ../pidgin/gtkdialogs.c:212
-#: ../pidgin/gtkdialogs.c:268
 msgid "Turkish"
 msgstr "Turkiska"
 
-#: ../pidgin/gtkdialogs.c:213
 msgid "Vietnamese"
 msgstr "Vietnamesiska"
 
-#: ../pidgin/gtkdialogs.c:213
 msgid "T.M.Thanh and the Gnome-Vi Team"
 msgstr "T.M.Thanh och Gnome-Vi Teamet"
 
-#: ../pidgin/gtkdialogs.c:214
-#: ../pidgin/gtkdialogs.c:269
 msgid "Simplified Chinese"
 msgstr "Förenklad kinesiska"
 
-#: ../pidgin/gtkdialogs.c:215
-#: ../pidgin/gtkdialogs.c:216
-#: ../pidgin/gtkdialogs.c:217
 msgid "Hong Kong Chinese"
 msgstr "Hong Kong Kinesiska"
 
-#: ../pidgin/gtkdialogs.c:218
-#: ../pidgin/gtkdialogs.c:219
-#: ../pidgin/gtkdialogs.c:270
 msgid "Traditional Chinese"
 msgstr "Traditionell kinesiska"
 
-#: ../pidgin/gtkdialogs.c:225
 msgid "Amharic"
 msgstr "Amhariska"
 
-#: ../pidgin/gtkdialogs.c:357
 #, c-format
 msgid "About %s"
 msgstr "Om %s"
 
-#: ../pidgin/gtkdialogs.c:400
-#, 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, MySpaceIM, 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 kan ansluta till AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu och QQ samtidigt.  Det är skrivet för 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:418
+#, 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, MySpaceIM, 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 kan "
+"ansluta till AIM, MSN, Yahoo!, XMPP, ICQ, IRC, SILC, SIP/SIMPLE, Novell "
+"GroupWise, Lotus Sametime, Bonjour, Zephyr, MySpaceIM, Gadu-Gadu och QQ "
+"samtidigt.  Det är skrivet för 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>"
+
 #, c-format
 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:423
 msgid "Current Developers"
 msgstr "Nuvarande utvecklare"
 
-#: ../pidgin/gtkdialogs.c:438
 msgid "Crazy Patch Writers"
 msgstr "Galna patchskrivare"
 
-#: ../pidgin/gtkdialogs.c:453
 msgid "Retired Developers"
 msgstr "Före detta utvecklare"
 
-#: ../pidgin/gtkdialogs.c:468
 msgid "Retired Crazy Patch Writers"
 msgstr "Före detta galna patchskrivare"
 
-#: ../pidgin/gtkdialogs.c:483
 msgid "Artists"
 msgstr "Artister"
 
-#: ../pidgin/gtkdialogs.c:498
 msgid "Current Translators"
 msgstr "Nuvarande översättare"
 
-#: ../pidgin/gtkdialogs.c:518
 msgid "Past Translators"
 msgstr "Före detta översättare"
 
-#: ../pidgin/gtkdialogs.c:536
 msgid "Debugging Information"
 msgstr "Felsökningsinformation"
 
-#: ../pidgin/gtkdialogs.c:753
-#: ../pidgin/gtkdialogs.c:892
-#: ../pidgin/gtkdialogs.c:973
 msgid "_Name"
 msgstr "_Namn"
 
-#: ../pidgin/gtkdialogs.c:758
-#: ../pidgin/gtkdialogs.c:897
-#: ../pidgin/gtkdialogs.c:978
+msgid "Buddy"
+msgstr "Kompis"
+
 msgid "_Account"
 msgstr "_Konto"
 
-#: ../pidgin/gtkdialogs.c:905
 msgid "Get User Info"
 msgstr "Hämta användarinformation"
 
-#: ../pidgin/gtkdialogs.c:907
-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:997
+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."
+
 msgid "View User Log"
 msgstr "Visa användarlogg"
 
-#: ../pidgin/gtkdialogs.c:999
-msgid "Please enter the screen name or alias of the person whose log you would like to view."
+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:1019
 msgid "Alias Contact"
 msgstr "Kontaktalias"
 
-#: ../pidgin/gtkdialogs.c:1020
 msgid "Enter an alias for this contact."
 msgstr "Ange ett alias för denna kontakt."
 
-#: ../pidgin/gtkdialogs.c:1042
 #, c-format
 msgid "Enter an alias for %s."
 msgstr "Ange ett alias för %s."
 
-#: ../pidgin/gtkdialogs.c:1044
 msgid "Alias Buddy"
 msgstr "Kompisalias"
 
-#: ../pidgin/gtkdialogs.c:1065
 msgid "Alias Chat"
 msgstr "Chattalias"
 
-#: ../pidgin/gtkdialogs.c:1066
 msgid "Enter an alias for this chat."
 msgstr "Ange ett alias för denna chatt."
 
-#: ../pidgin/gtkdialogs.c:1105
-#, 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:1113
+#, 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?"
+
 msgid "Remove Contact"
 msgstr "Ta bort kontakt"
 
-#: ../pidgin/gtkdialogs.c:1116
 msgid "_Remove Contact"
 msgstr "Ta bo_rt kontakt"
 
-#: ../pidgin/gtkdialogs.c:1147
-#, 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:1154
+#, 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?"
+
 msgid "Merge Groups"
 msgstr "Slå ihop grupper"
 
-#: ../pidgin/gtkdialogs.c:1157
 msgid "_Merge Groups"
 msgstr "_Slå ihop grupper"
 
-#: ../pidgin/gtkdialogs.c:1207
-#, 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:1210
+#, 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?"
+
 msgid "Remove Group"
 msgstr "Ta bort grupp"
 
-#: ../pidgin/gtkdialogs.c:1213
 msgid "_Remove Group"
 msgstr "Ta bo_rt grupp"
 
-#: ../pidgin/gtkdialogs.c:1246
-#, c-format
-msgid "You are about to remove %s from your buddy list.  Do you want to continue?"
+#, 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:1249
 msgid "Remove Buddy"
 msgstr "Ta bort kompis"
 
-#: ../pidgin/gtkdialogs.c:1252
 msgid "_Remove Buddy"
 msgstr "Ta bo_rt kompis"
 
-#: ../pidgin/gtkdialogs.c:1273
-#, 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:1276
+#, 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?"
+
 msgid "Remove Chat"
 msgstr "Ta bort chatt"
 
-#: ../pidgin/gtkdialogs.c:1279
 msgid "_Remove Chat"
 msgstr "Ta bo_rt chatt"
 
-#: ../pidgin/gtkdocklet.c:152
 msgid "Right-click for more unread messages...\n"
 msgstr "Högerklicka för fler olästa meddelanden...\n"
 
-#: ../pidgin/gtkdocklet.c:533
 msgid "Change Status"
 msgstr "Ändra status"
 
-#: ../pidgin/gtkdocklet.c:680
 msgid "Show Buddy List"
 msgstr "Visa kompislistan"
 
-#: ../pidgin/gtkdocklet.c:706
 msgid "New Message..."
 msgstr "Nytt meddelande..."
 
-#: ../pidgin/gtkdocklet.c:721
 msgid "Mute Sounds"
 msgstr "Stäng av ljud"
 
-#: ../pidgin/gtkdocklet.c:728
 msgid "Blink on New Message"
 msgstr "Blinka vid nya meddelande"
 
-#: ../pidgin/gtkdocklet.c:738
 msgid "Quit"
 msgstr "Avsluta"
 
-#: ../pidgin/gtkft.c:154
 msgid "Not started"
 msgstr "Ej startad"
 
-#: ../pidgin/gtkft.c:274
 msgid "<b>Receiving As:</b>"
 msgstr "<b>Tar emot som:</b>"
 
-#: ../pidgin/gtkft.c:276
 msgid "<b>Receiving From:</b>"
 msgstr "<b>Tar emot från:</b>"
 
-#: ../pidgin/gtkft.c:280
 msgid "<b>Sending To:</b>"
 msgstr "<b>Skickar till:</b>"
 
-#: ../pidgin/gtkft.c:282
 msgid "<b>Sending As:</b>"
 msgstr "<b>Skickar som:</b>"
 
-#: ../pidgin/gtkft.c:498
 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:503
+msgstr ""
+"Det finns ingen applikation konfigurarad att öppna den här typen av fil."
+
 msgid "An error occurred while opening the file."
 msgstr "Ett fel uppstod när filen öppnades."
 
-#: ../pidgin/gtkft.c:540
 #, c-format
 msgid "Error launching %s: %s"
 msgstr "Fel vid körning av %s: %s"
 
-#: ../pidgin/gtkft.c:549
 #, c-format
 msgid "Error running %s"
 msgstr "Fel vid körning av %s"
 
-#: ../pidgin/gtkft.c:550
 #, c-format
 msgid "Process returned error code %d"
 msgstr "Processen gav felkod %d"
 
-#: ../pidgin/gtkft.c:697
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: ../pidgin/gtkft.c:698
 msgid "Local File:"
 msgstr "Lokal fil:"
 
-#: ../pidgin/gtkft.c:700
 msgid "Speed:"
 msgstr "Hastighet:"
 
-#: ../pidgin/gtkft.c:701
 msgid "Time Elapsed:"
 msgstr "Tid som gått:"
 
-#: ../pidgin/gtkft.c:702
 msgid "Time Remaining:"
 msgstr "Tid som återstår:"
 
-#: ../pidgin/gtkft.c:784
 msgid "Close this window when all transfers _finish"
 msgstr "Stäng detta _fönster då alla överföringar är klara"
 
-#: ../pidgin/gtkft.c:794
 msgid "C_lear finished transfers"
 msgstr "_Rensa bort färdiga överföringar"
 
 #. "Download Details" arrow
-#: ../pidgin/gtkft.c:803
 msgid "File transfer _details"
 msgstr "_Detaljerad filöverföringsinformation"
 
 #. Pause button
-#: ../pidgin/gtkft.c:833
-#: ../pidgin/pidginstock.c:95
 msgid "_Pause"
 msgstr "_Pausa"
 
 #. Resume button
-#: ../pidgin/gtkft.c:843
 msgid "_Resume"
 msgstr "_Återuppta"
 
-#: ../pidgin/gtkimhtml.c:817
 msgid "Paste as Plain _Text"
 msgstr "Klistra in som ren _text"
 
-#: ../pidgin/gtkimhtml.c:834
-#: ../pidgin/gtkimhtmltoolbar.c:1195
 msgid "_Reset formatting"
 msgstr "_Rensa formatering"
 
-#: ../pidgin/gtkimhtml.c:1361
 msgid "Hyperlink color"
 msgstr "Färg på länkar"
 
-#: ../pidgin/gtkimhtml.c:1362
 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:1365
 msgid "Hyperlink prelight color"
 msgstr "Färg på utpekade länkar"
 
-#: ../pidgin/gtkimhtml.c:1366
 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:1583
 msgid "_Copy E-Mail Address"
 msgstr "_Kopiera e-postadress"
 
-#: ../pidgin/gtkimhtml.c:1595
 msgid "_Open Link in Browser"
 msgstr "_Öppna länk i webbläsare"
 
-#: ../pidgin/gtkimhtml.c:1605
 msgid "_Copy Link Location"
 msgstr "_Kopiera länk"
 
-#: ../pidgin/gtkimhtml.c:3355
 msgid ""
 "<span size='larger' weight='bold'>Unrecognized file type</span>\n"
 "\n"
@@ -15314,7 +11054,6 @@
 "\n"
 "Tillbakafaller till PNG."
 
-#: ../pidgin/gtkimhtml.c:3358
 msgid ""
 "Unrecognized file type\n"
 "\n"
@@ -15324,7 +11063,6 @@
 "\n"
 "Tillbakafaller till PNG."
 
-#: ../pidgin/gtkimhtml.c:3387
 #, c-format
 msgid ""
 "<span size='larger' weight='bold'>Error saving image</span>\n"
@@ -15335,7 +11073,6 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3390
 #, c-format
 msgid ""
 "Error saving image\n"
@@ -15346,272 +11083,229 @@
 "\n"
 "%s"
 
-#: ../pidgin/gtkimhtml.c:3468
-#: ../pidgin/gtkimhtml.c:3480
 msgid "Save Image"
 msgstr "Spara bild"
 
-#: ../pidgin/gtkimhtml.c:3508
 #, c-format
 msgid "_Save Image..."
 msgstr "_Spara bild..."
 
-#: ../pidgin/gtkimhtmltoolbar.c:163
 msgid "Select Font"
 msgstr "Välj typsnitt"
 
-#: ../pidgin/gtkimhtmltoolbar.c:242
 msgid "Select Text Color"
 msgstr "Välj textfärg"
 
-#: ../pidgin/gtkimhtmltoolbar.c:321
 msgid "Select Background Color"
 msgstr "Välj bakgrundsfärg"
 
-#: ../pidgin/gtkimhtmltoolbar.c:410
 msgid "_URL"
 msgstr "_URL"
 
-#: ../pidgin/gtkimhtmltoolbar.c:418
 msgid "_Description"
 msgstr "_Beskrivning"
 
-#: ../pidgin/gtkimhtmltoolbar.c:421
-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:425
+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."
+
 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:430
-#: ../pidgin/gtkimhtmltoolbar.c:1102
 msgid "Insert Link"
 msgstr "Infoga länk"
 
-#: ../pidgin/gtkimhtmltoolbar.c:434
-#: ../pidgin/gtkimhtmltoolbar.c:1263
 msgid "_Insert"
 msgstr "_Infoga"
 
-#: ../pidgin/gtkimhtmltoolbar.c:514
 #, c-format
 msgid "Failed to store image: %s\n"
 msgstr "Kunde inte spara bilden: %s\n"
 
-#: ../pidgin/gtkimhtmltoolbar.c:540
-#: ../pidgin/gtkimhtmltoolbar.c:550
 msgid "Insert Image"
 msgstr "Infoga bild"
 
-#: ../pidgin/gtkimhtmltoolbar.c:761
 msgid "This theme has no available smileys."
 msgstr "Detta tema har inga tillgängliga smileys."
 
 #. show everything
-#: ../pidgin/gtkimhtmltoolbar.c:778
 msgid "Smile!"
 msgstr "Smile!"
 
-#: ../pidgin/gtkimhtmltoolbar.c:846
-#: ../pidgin/gtkimhtmltoolbar.c:1220
 msgid "_Font"
 msgstr "_Typsnitt"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Group Items"
 msgstr "Gruppera föremål"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1054
 msgid "Ungroup Items"
 msgstr "Avgruppera föremål"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1088
-#: ../pidgin/plugins/convcolors.c:287
 msgid "Bold"
 msgstr "Fet"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1089
-#: ../pidgin/plugins/convcolors.c:294
 msgid "Italic"
 msgstr "Kursiv"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1090
-#: ../pidgin/plugins/convcolors.c:301
 msgid "Underline"
 msgstr "Understruken"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1091
 msgid "Strikethrough"
 msgstr "Genomstruket"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1093
 msgid "Increase Font Size"
 msgstr "Öka Typsnittsstorlek"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1094
 msgid "Decrease Font Size"
 msgstr "Minska Typsnittsstorlek"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1096
 msgid "Font Face"
 msgstr "Typsnitt"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1097
 msgid "Background Color"
 msgstr "Bakgrundsfärg"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1098
 msgid "Foreground Color"
 msgstr "Förgrundsfärg"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1100
 msgid "Reset Formatting"
 msgstr "Återställ formatering"
 
 # Jag har inte kommit på något bra att ersätta "IM" med då det står för sig själv. Finns det några bra förslag?
-#: ../pidgin/gtkimhtmltoolbar.c:1103
 msgid "Insert IM Image"
 msgstr "Infoga IM bild"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1104
 msgid "Insert Smiley"
 msgstr "Infoga Smiley"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1180
 msgid "<b>_Bold</b>"
 msgstr "<b>_Fet</b>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1181
 msgid "<i>_Italic</i>"
 msgstr "<i>_Kursiv</i>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1182
 msgid "<u>_Underline</u>"
 msgstr "<u>_Understruken</u>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1183
 msgid "<span strikethrough='true'>Strikethrough</span>"
 msgstr "<span strikethrough='true'>Genomstruket</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1184
 msgid "<span size='larger'>_Larger</span>"
 msgstr "<span size='larger'>S_törre</span>"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1186
 msgid "_Normal"
 msgstr "_Normal"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1188
 msgid "<span size='smaller'>_Smaller</span>"
 msgstr "<span size='smaller'>_Mindre</span>"
 
 #. If we want to show the formatting for the following items, we would
 #. * need to update them when formatting changes. The above items don't need
 #. * no updating nor nothin'
-#: ../pidgin/gtkimhtmltoolbar.c:1192
 msgid "_Font face"
 msgstr "_Typsnittsansikte"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1193
 msgid "Foreground _color"
 msgstr "_Förgrundsfärg"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1194
 msgid "Bac_kground color"
 msgstr "_Bakgrundsfärg"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1271
 msgid "_Image"
 msgstr "B_ild"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1277
 msgid "_Link"
 msgstr "_Länk"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1283
 msgid "_Horizontal rule"
 msgstr "_Horisontell linje"
 
-#: ../pidgin/gtkimhtmltoolbar.c:1305
 msgid "_Smile!"
 msgstr "_Smile!"
 
-#: ../pidgin/gtklog.c:293
-#, 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:304
-#, 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:309
-#, 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:453
+#, 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?"
+
+#, 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"
+
+#, 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?"
+
 #, 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:456
 #, 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:503
 msgid "%B %Y"
 msgstr "%B %Y"
 
-#: ../pidgin/gtklog.c:550
-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:554
-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:557
-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:561
+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."
+
+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."
+
+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."
+
 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:576
 msgid "_Browse logs folder"
 msgstr "_Bläddra bland logg-kataloger"
 
-#: ../pidgin/gtklog.c:640
 msgid "Total log size:"
 msgstr "Total loggstorlek"
 
-#: ../pidgin/gtklog.c:710
 #, c-format
 msgid "Conversations in %s"
 msgstr "Konversationer i %s"
 
-#: ../pidgin/gtklog.c:718
-#: ../pidgin/gtklog.c:785
 #, c-format
 msgid "Conversations with %s"
 msgstr "Konversationer med %s"
 
-#: ../pidgin/gtklog.c:810
 msgid "System Log"
 msgstr "Systemlogg"
 
-#: ../pidgin/gtkmain.c:386
 #, 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"
 
-#: ../pidgin/gtkmain.c:388
 #, c-format
 msgid ""
 "%s %s\n"
@@ -15641,7 +11335,6 @@
 "  --display=DISPLAY   X display att använda\n"
 "  -v, --version       visa den nuvarande versionen och avsluta\n"
 
-#: ../pidgin/gtkmain.c:516
 #, c-format
 msgid ""
 "%s %s has segfaulted and attempted to dump a core file.\n"
@@ -15662,7 +11355,8 @@
 "on other protocols is at\n"
 "%swiki/DeveloperPages\n"
 msgstr ""
-"%s %s har råkat ut för ett segmenteringsfel och försökte att dumpa kärnan till fil.\n"
+"%s %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"
@@ -15670,78 +11364,74 @@
 "%ssimpleticket\n"
 "\n"
 "Var god och meddela vad du gjorde vid tillfället\n"
-"och posta en backtrace från kärn-filen. Om du inte vet hur du skapar en backtrace,\n"
+"och posta en backtrace 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"
+"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:706
-#: ../pidgin/pidgin.h:51
 msgid "Pidgin"
 msgstr "Pidgin"
 
-#: ../pidgin/gtknotify.c:349
 msgid "Open All Messages"
 msgstr "Öppna alla meddelanden"
 
-#: ../pidgin/gtknotify.c:402
 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:545
 #, 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:569
 #, c-format
 msgid "<b>%d new e-mail.</b>"
 msgid_plural "<b>%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:997
 #, c-format
 msgid "The browser command \"%s\" is invalid."
 msgstr "Kommandot för webbläsaren \"%s\" är ogiltigt."
 
-#: ../pidgin/gtknotify.c:999
-#: ../pidgin/gtknotify.c:1011
-#: ../pidgin/gtknotify.c:1024
-#: ../pidgin/gtknotify.c:1152
 msgid "Unable to open URL"
 msgstr "Kan inte öppna URL"
 
-#: ../pidgin/gtknotify.c:1009
-#: ../pidgin/gtknotify.c:1022
 #, c-format
 msgid "Error launching \"%s\": %s"
 msgstr "Fel vid körning av \"%s\": %s"
 
-#: ../pidgin/gtknotify.c:1153
-msgid "The 'Manual' browser command has been chosen, but no command has been set."
+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:265
 msgid "The following plugins will be unloaded."
 msgstr "De följande modulerna kommer avladdas."
 
-#: ../pidgin/gtkplugin.c:284
 msgid "Multiple plugins will be unloaded."
 msgstr "Multibla moduler kommer bli avladdade."
 
-#: ../pidgin/gtkplugin.c:288
 msgid "Unload Plugins"
 msgstr "Avladda insticksmoduler"
 
-#: ../pidgin/gtkplugin.c:400
+msgid "Could not unload plugin"
+msgstr "Kunde inte stoppa insticksmodulen"
+
+msgid ""
+"The plugin could not be unloaded now, but will be disabled at the next "
+"startup."
+msgstr ""
+"Instickmodulen kunde inte stoppas, men den kommer att vara inaktiverad "
+"nästan uppstart."
+
 #, c-format
 msgid ""
 "%s%s<span weight=\"bold\">Written by:</span>\t%s\n"
@@ -15752,7 +11442,6 @@
 "<span weight=\"bold\">Hemsida::</span>\t\t%s\n"
 "<span weight=\"bold\">Filnamn::</span>\t\t%s"
 
-#: ../pidgin/gtkplugin.c:410
 #, c-format
 msgid ""
 "%s\n"
@@ -15763,395 +11452,317 @@
 "<span foreground=\"#ff0000\" weight=\"bold\">Fel: %s\n"
 "Sök efter en uppdatering för modulen på dess hemsida.</span>"
 
-#: ../pidgin/gtkplugin.c:536
 msgid "Configure Pl_ugin"
 msgstr "Konfigurera Insticksmod_uler"
 
-#: ../pidgin/gtkplugin.c:599
 msgid "<b>Plugin Details</b>"
 msgstr "<b>Detaljer för modul</b>"
 
-#: ../pidgin/gtkpounce.c:157
 msgid "Select a file"
 msgstr "Välj en fil"
 
 #. Create the "Pounce on Whom" frame.
-#: ../pidgin/gtkpounce.c:539
 msgid "Pounce on Whom"
 msgstr "Attackera vem"
 
-#: ../pidgin/gtkpounce.c:566
 msgid "_Buddy name:"
 msgstr "K_ompisnamn:"
 
-#: ../pidgin/gtkpounce.c:600
 msgid "Si_gns on"
 msgstr "_Ansluter"
 
-#: ../pidgin/gtkpounce.c:602
 msgid "Signs o_ff"
 msgstr "_Kopplar ifrån"
 
-#: ../pidgin/gtkpounce.c:604
 msgid "Goes a_way"
 msgstr "Blir _frånvarande"
 
-#: ../pidgin/gtkpounce.c:606
 msgid "Ret_urns from away"
 msgstr "_Återvänder från frånvaro"
 
-#: ../pidgin/gtkpounce.c:608
 msgid "Becomes _idle"
 msgstr "Blir _inaktiv"
 
-#: ../pidgin/gtkpounce.c:610
 msgid "Is no longer i_dle"
 msgstr "_Är inte längre inaktiv"
 
-#: ../pidgin/gtkpounce.c:612
 msgid "Starts _typing"
 msgstr "Börjar _skriva"
 
-#: ../pidgin/gtkpounce.c:614
 msgid "P_auses while typing"
 msgstr "Pa_usar under skrivning"
 
-#: ../pidgin/gtkpounce.c:616
 msgid "Stops t_yping"
 msgstr "Slutar s_kriva"
 
-#: ../pidgin/gtkpounce.c:618
 msgid "Sends a _message"
 msgstr "Skickar ett _meddelande"
 
-#: ../pidgin/gtkpounce.c:661
 msgid "Ope_n an IM window"
 msgstr "_Öppna ett snabbmeddelandefönster"
 
-#: ../pidgin/gtkpounce.c:663
 msgid "_Pop up a notification"
 msgstr "Visa en _rapport"
 
-#: ../pidgin/gtkpounce.c:665
 msgid "Send a _message"
 msgstr "Skicka ett _meddelande"
 
-#: ../pidgin/gtkpounce.c:667
 msgid "E_xecute a command"
 msgstr "_Kör ett kommando"
 
-#: ../pidgin/gtkpounce.c:669
 msgid "P_lay a sound"
 msgstr "Spela upp ett _ljud"
 
-#: ../pidgin/gtkpounce.c:675
 msgid "Brows_e..."
 msgstr "_Bläddra..."
 
-#: ../pidgin/gtkpounce.c:677
 msgid "Br_owse..."
 msgstr "B_läddra..."
 
-#: ../pidgin/gtkpounce.c:678
 msgid "Pre_view"
 msgstr "_Förhandsgranska"
 
-#: ../pidgin/gtkpounce.c:810
 msgid "P_ounce only when my status is not Available"
 msgstr "A_ttackera enbart då min status är frånvarande"
 
-#: ../pidgin/gtkpounce.c:815
 msgid "_Recurring"
 msgstr "Åte_rkommande"
 
-#: ../pidgin/gtkpounce.c:1258
 msgid "Pounce Target"
 msgstr "Attackera mål"
 
-#: ../pidgin/gtkprefs.c:386
-#: ../pidgin/pixmaps/emotes/default/24/default.theme.in.h:1
 msgid "Default"
 msgstr "Förval"
 
-#: ../pidgin/gtkprefs.c:517
 msgid "Smiley theme failed to unpack."
 msgstr "Smiley temat kunde inte packas upp."
 
-#: ../pidgin/gtkprefs.c:644
 msgid "Install Theme"
 msgstr "Installera tema"
 
-#: ../pidgin/gtkprefs.c:697
-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:732
+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."
+
 msgid "Icon"
 msgstr "Ikon"
 
-#: ../pidgin/gtkprefs.c:894
 msgid "System Tray Icon"
 msgstr "Systempanelikon"
 
-#: ../pidgin/gtkprefs.c:895
 msgid "_Show system tray icon:"
 msgstr "Vi_sa systempanelsikon:"
 
-#: ../pidgin/gtkprefs.c:899
 msgid "On unread messages"
 msgstr "Vid olästa meddeladen"
 
-#: ../pidgin/gtkprefs.c:904
 msgid "Conversation Window Hiding"
 msgstr "Dölj konversationsfönster"
 
-#: ../pidgin/gtkprefs.c:905
 msgid "_Hide new IM conversations:"
 msgstr "_Dölj nya IM konversationer:"
 
-#: ../pidgin/gtkprefs.c:908
-#: ../pidgin/gtkprefs.c:2006
 msgid "When away"
 msgstr "Vid frånvaro"
 
 #. All the tab options!
-#: ../pidgin/gtkprefs.c:916
 msgid "Tabs"
 msgstr "Flikar"
 
-#: ../pidgin/gtkprefs.c:918
 msgid "Show IMs and chats in _tabbed windows"
 msgstr "Visa snabbmeddelanden och chattar i _flikfönster."
 
-#: ../pidgin/gtkprefs.c:932
 msgid "Show close b_utton on tabs"
 msgstr "_Visa stängningsknapp på flikar"
 
-#: ../pidgin/gtkprefs.c:935
 msgid "_Placement:"
 msgstr "_Placering:"
 
-#: ../pidgin/gtkprefs.c:937
 msgid "Top"
 msgstr "Överst"
 
-#: ../pidgin/gtkprefs.c:938
 msgid "Bottom"
 msgstr "Nederst"
 
-#: ../pidgin/gtkprefs.c:939
 msgid "Left"
 msgstr "Vänster"
 
-#: ../pidgin/gtkprefs.c:940
 msgid "Right"
 msgstr "Höger"
 
-#: ../pidgin/gtkprefs.c:942
 msgid "Left Vertical"
 msgstr "Vertikalt till vänster"
 
-#: ../pidgin/gtkprefs.c:943
 msgid "Right Vertical"
 msgstr "Vertikalt till höger"
 
-#: ../pidgin/gtkprefs.c:950
 msgid "N_ew conversations:"
 msgstr "_Nya konversationer:"
 
-#: ../pidgin/gtkprefs.c:996
 msgid "Show _formatting on incoming messages"
 msgstr "Visa _formaterade inkommande meddelanden"
 
-#: ../pidgin/gtkprefs.c:998
 msgid "Close IMs immediately when the tab is closed"
 msgstr "Stäng snabbmeddelanden direkt då fliken stängs"
 
-#: ../pidgin/gtkprefs.c:1001
 msgid "Show _detailed information"
 msgstr "Visa _detaljerad information"
 
-#: ../pidgin/gtkprefs.c:1003
 msgid "Enable buddy ic_on animation"
 msgstr "Aktivera _animering av kompisikoner"
 
-#: ../pidgin/gtkprefs.c:1010
 msgid "_Notify buddies that you are typing to them"
 msgstr "_Meddela kompisar att du skriver till dem"
 
-#: ../pidgin/gtkprefs.c:1013
 msgid "Highlight _misspelled words"
 msgstr "_Markera felstavade ord"
 
-#: ../pidgin/gtkprefs.c:1017
 msgid "Use smooth-scrolling"
 msgstr "Använd mjuk rullning"
 
-#: ../pidgin/gtkprefs.c:1020
 msgid "F_lash window when IMs are received"
 msgstr "B_linka med fönstret när meddelanden tagits emot"
 
-#: ../pidgin/gtkprefs.c:1022
 msgid "Minimi_ze new conversation windows"
 msgstr "_Minimera nya konversationsfönstret"
 
-#: ../pidgin/gtkprefs.c:1026
 msgid "Font"
 msgstr "Typsnitt"
 
-#: ../pidgin/gtkprefs.c:1028
 msgid "Use document font from _theme"
 msgstr "Använde dokumenttypsnitt från _tema"
 
-#: ../pidgin/gtkprefs.c:1030
 msgid "Use font from _theme"
 msgstr "Använde typsnitt från _tema"
 
-#: ../pidgin/gtkprefs.c:1032
 msgid "Conversation _font:"
 msgstr "Konversations_typsnitt:"
 
-#: ../pidgin/gtkprefs.c:1046
 msgid "Default Formatting"
 msgstr "Förvald Formatering"
 
-#: ../pidgin/gtkprefs.c:1065
-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:1125
+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."
+
 msgid "Cannot start proxy configuration program."
 msgstr "Kan inte starta konfigurationsprogrammet för proxy."
 
-#: ../pidgin/gtkprefs.c:1144
+msgid "Cannot start browser configuration program."
+msgstr "Kan inte starta konfigurationsprogrammet för webbläsaren"
+
 msgid "ST_UN server:"
 msgstr "ST_UN-server:"
 
-#: ../pidgin/gtkprefs.c:1156
 msgid "<span style=\"italic\">Example: stunserver.org</span>"
 msgstr "<span style=\"italic\">Exempel: stunserver.org</span>"
 
-#: ../pidgin/gtkprefs.c:1160
 msgid "_Autodetect IP address"
 msgstr "Känn av IP-adress _automatiskt"
 
-#: ../pidgin/gtkprefs.c:1169
 msgid "Public _IP:"
 msgstr "Publik _IP-adress:"
 
-#: ../pidgin/gtkprefs.c:1200
 msgid "Ports"
 msgstr "Portar"
 
-#: ../pidgin/gtkprefs.c:1203
 msgid "_Manually specify range of ports to listen on"
 msgstr "Ange _manuellt vilken portserie som ska användas"
 
-#: ../pidgin/gtkprefs.c:1206
 msgid "_Start port:"
 msgstr "_Startport:"
 
-#: ../pidgin/gtkprefs.c:1213
 msgid "_End port:"
 msgstr "_Slutport:"
 
-#: ../pidgin/gtkprefs.c:1220
-msgid "Proxy Server"
-msgstr "Proxyserver"
-
-#: ../pidgin/gtkprefs.c:1229
+msgid "Proxy Server &amp; Browser"
+msgstr "Proxyserver &amp; Webbläsare"
+
 msgid "<b>Proxy configuration program was not found.</b>"
 msgstr "<b>Konfigurationsprogrammet för proxy hittades inte.</b>"
 
-#: ../pidgin/gtkprefs.c:1234
-msgid ""
-"Proxy preferences are configured in\n"
-"GNOME Control Center: Desktop Preferences"
-msgstr ""
-"Proxy-inställningarna konfigureras i\n"
-"GNOMEs kontrollpanel: Skrivbordsinställningar"
-
-#: ../pidgin/gtkprefs.c:1241
+msgid "<b>Browser configuration program was not found.</b>"
+msgstr "<b>Konfigurationsprogrammet för Webbläsaren hittades inte.</b>"
+
+msgid ""
+"Proxy & Browser preferences are configured\n"
+"in GNOME Preferences"
+msgstr ""
+"Proxy- & Webbläsar-inställningarna konfigureras i\n"
+"GNOMEs inställningar"
+
 msgid "Configure _Proxy"
 msgstr "Konfigurera _Proxy"
 
-#: ../pidgin/gtkprefs.c:1249
+msgid "Configure _Browser"
+msgstr "Konfigurera _Webbläsare"
+
+msgid "Proxy Server"
+msgstr "Proxyserver"
+
 msgid "No proxy"
 msgstr "Ingen proxy"
 
-#: ../pidgin/gtkprefs.c:1305
 msgid "_User:"
 msgstr "_Användare:"
 
-#: ../pidgin/gtkprefs.c:1384
 msgid "Seamonkey"
 msgstr "Seamonkey"
 
-#: ../pidgin/gtkprefs.c:1385
 msgid "Opera"
 msgstr "Opera"
 
-#: ../pidgin/gtkprefs.c:1386
 msgid "Netscape"
 msgstr "Netscape"
 
-#: ../pidgin/gtkprefs.c:1387
 msgid "Mozilla"
 msgstr "Mozilla"
 
-#: ../pidgin/gtkprefs.c:1388
 msgid "Konqueror"
 msgstr "Konqueror"
 
-#: ../pidgin/gtkprefs.c:1389
 msgid "GNOME Default"
 msgstr "GNOMEs standardval"
 
-#: ../pidgin/gtkprefs.c:1390
 msgid "Galeon"
 msgstr "Galeon"
 
-#: ../pidgin/gtkprefs.c:1391
 msgid "Firefox"
 msgstr "Firefox"
 
-#: ../pidgin/gtkprefs.c:1392
 msgid "Firebird"
 msgstr "Firebird"
 
-#: ../pidgin/gtkprefs.c:1393
 msgid "Epiphany"
 msgstr "Epiphany"
 
-#: ../pidgin/gtkprefs.c:1402
 msgid "Manual"
 msgstr "Manuell"
 
-#: ../pidgin/gtkprefs.c:1455
 msgid "Browser Selection"
 msgstr "Val av webbläsare"
 
-#: ../pidgin/gtkprefs.c:1459
 msgid "_Browser:"
 msgstr "Webb_läsare:"
 
-#: ../pidgin/gtkprefs.c:1467
 msgid "_Open link in:"
 msgstr "_Öppna länk i:"
 
-#: ../pidgin/gtkprefs.c:1469
 msgid "Browser default"
 msgstr "Förvald webbläsare"
 
-#: ../pidgin/gtkprefs.c:1470
 msgid "Existing window"
 msgstr "Befintligt fönster"
 
-#: ../pidgin/gtkprefs.c:1472
 msgid "New tab"
 msgstr "Ny flik"
 
-#: ../pidgin/gtkprefs.c:1486
 #, c-format
 msgid ""
 "_Manual:\n"
@@ -16160,69 +11771,54 @@
 "_Manuell:\n"
 "(%s för URL)"
 
-#: ../pidgin/gtkprefs.c:1527
 msgid "Log _format:"
 msgstr "Logg _format:"
 
-#: ../pidgin/gtkprefs.c:1532
 msgid "Log all _instant messages"
 msgstr "_Logga alla snabbmeddelanden"
 
-#: ../pidgin/gtkprefs.c:1534
 msgid "Log all c_hats"
 msgstr "Logga alla _chattar"
 
-#: ../pidgin/gtkprefs.c:1536
 msgid "Log all _status changes to system log"
 msgstr "Logga alla _statusförändringar till systemloggen"
 
-#: ../pidgin/gtkprefs.c:1686
 msgid "Sound Selection"
 msgstr "Ljudval"
 
-#: ../pidgin/gtkprefs.c:1696
 #, c-format
 msgid "Quietest"
 msgstr "Tystast"
 
-#: ../pidgin/gtkprefs.c:1698
 #, c-format
 msgid "Quieter"
 msgstr "Tystare"
 
-#: ../pidgin/gtkprefs.c:1700
 #, c-format
 msgid "Quiet"
 msgstr "Tyst"
 
-#: ../pidgin/gtkprefs.c:1704
 #, c-format
 msgid "Loud"
 msgstr "Högt"
 
-#: ../pidgin/gtkprefs.c:1706
 #, c-format
 msgid "Louder"
 msgstr "Högre"
 
-#: ../pidgin/gtkprefs.c:1708
 #, c-format
 msgid "Loudest"
 msgstr "Högst"
 
-#: ../pidgin/gtkprefs.c:1774
 msgid "_Method:"
 msgstr "_Metod:"
 
-#: ../pidgin/gtkprefs.c:1776
 msgid "Console beep"
 msgstr "Konsolpip"
 
-#: ../pidgin/gtkprefs.c:1783
 msgid "No sounds"
 msgstr "Inga ljud"
 
-#: ../pidgin/gtkprefs.c:1791
 #, c-format
 msgid ""
 "Sound c_ommand:\n"
@@ -16231,331 +11827,270 @@
 "Ljud_kommando:\n"
 "(%s för filnamn)"
 
-#: ../pidgin/gtkprefs.c:1818
 msgid "Sounds when conversation has _focus"
 msgstr "Ljud när konversationsfönstret har _fokus"
 
-#: ../pidgin/gtkprefs.c:1820
 msgid "Enable sounds:"
 msgstr "Aktivera ljud:"
 
-#: ../pidgin/gtkprefs.c:1831
 msgid "Volume:"
 msgstr "Volum:"
 
-#: ../pidgin/gtkprefs.c:1911
 msgid "Play"
 msgstr "Spela upp"
 
-#: ../pidgin/gtkprefs.c:1989
 msgid "_Report idle time:"
 msgstr "_Rapportera inaktivitetstid:"
 
-#: ../pidgin/gtkprefs.c:1994
 msgid "Based on keyboard or mouse use"
 msgstr "Baserat på tangetbord eller musanvändning"
 
-#: ../pidgin/gtkprefs.c:2003
 msgid "_Auto-reply:"
 msgstr "_Automatiskt svar:"
 
-#: ../pidgin/gtkprefs.c:2007
 msgid "When both away and idle"
 msgstr "Vid både frånvaro och inaktivitet"
 
 #. Auto-away stuff
-#: ../pidgin/gtkprefs.c:2013
 msgid "Auto-away"
 msgstr "Automatisk frånvaro"
 
-#: ../pidgin/gtkprefs.c:2015
 msgid "Change status when _idle"
 msgstr "Ändra status vid _inaktivitet"
 
-#: ../pidgin/gtkprefs.c:2019
 msgid "_Minutes before becoming idle:"
 msgstr "_Minuter innan du räknas som inaktiv:"
 
-#: ../pidgin/gtkprefs.c:2027
 msgid "Change _status to:"
 msgstr "Ändra _status till:"
 
 #. Signon status stuff
-#: ../pidgin/gtkprefs.c:2048
 msgid "Status at Startup"
 msgstr "Status vid uppstart"
 
-#: ../pidgin/gtkprefs.c:2050
 msgid "Use status from last _exit at startup"
 msgstr "A_nvänd samma status som vid senaste avslutet"
 
-#: ../pidgin/gtkprefs.c:2056
 msgid "Status to a_pply at startup:"
 msgstr "Status att använda vid u_ppstart:"
 
-#: ../pidgin/gtkprefs.c:2095
 msgid "Interface"
 msgstr "Gränssnitt"
 
-#: ../pidgin/gtkprefs.c:2097
 msgid "Smiley Themes"
 msgstr "Smileyteman"
 
-#: ../pidgin/gtkprefs.c:2104
 msgid "Browser"
 msgstr "Webbläsare"
 
-#: ../pidgin/gtkprefs.c:2108
 msgid "Status / Idle"
 msgstr "Status / Inaktiv"
 
-#: ../pidgin/gtkprivacy.c:80
 msgid "Allow all users to contact me"
 msgstr "Tillåt alla användare att kontakta mig"
 
-#: ../pidgin/gtkprivacy.c:81
 msgid "Allow only the users on my buddy list"
 msgstr "Tillåt endast användarna i min kompislista"
 
-#: ../pidgin/gtkprivacy.c:82
 msgid "Allow only the users below"
 msgstr "Tillåt endast användarna nedan"
 
-#: ../pidgin/gtkprivacy.c:83
 msgid "Block all users"
 msgstr "Blockera alla användare"
 
-#: ../pidgin/gtkprivacy.c:84
 msgid "Block only the users below"
 msgstr "Blockera endast användarna nedan"
 
-#: ../pidgin/gtkprivacy.c:370
 msgid "Privacy"
 msgstr "Spärrlista"
 
-#: ../pidgin/gtkprivacy.c:382
 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:394
 msgid "Set privacy for:"
 msgstr "Ställ in spärrlista för:"
 
-#: ../pidgin/gtkprivacy.c:557
-#: ../pidgin/gtkprivacy.c:574
 msgid "Permit User"
 msgstr "Tillåt användare"
 
-#: ../pidgin/gtkprivacy.c:558
 msgid "Type a user you permit to contact you."
 msgstr "Ange en användare du tillåter att kontakta dig."
 
-#: ../pidgin/gtkprivacy.c:559
 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:562
-#: ../pidgin/gtkprivacy.c:578
 msgid "_Permit"
 msgstr "_Tillåt"
 
-#: ../pidgin/gtkprivacy.c:568
 #, c-format
 msgid "Allow %s to contact you?"
 msgstr "Tillåt %s att kontakta dig?"
 
-#: ../pidgin/gtkprivacy.c:570
 #, 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:599
-#: ../pidgin/gtkprivacy.c:613
 msgid "Block User"
 msgstr "Blockera användare"
 
-#: ../pidgin/gtkprivacy.c:600
 msgid "Type a user to block."
 msgstr "Ange en användare som ska blockeras."
 
-#: ../pidgin/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."
 
-#: ../pidgin/gtkprivacy.c:609
 #, c-format
 msgid "Block %s?"
 msgstr "Blockera %s?"
 
-#: ../pidgin/gtkprivacy.c:611
 #, 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:272
 msgid "Apply"
 msgstr "Verkställ"
 
-#: ../pidgin/gtkrequest.c:1507
 msgid "That file already exists"
 msgstr "Filen finns redan."
 
-#: ../pidgin/gtkrequest.c:1508
 msgid "Would you like to overwrite it?"
 msgstr "Vill du skriva över den?"
 
-#: ../pidgin/gtkrequest.c:1511
 msgid "Overwrite"
 msgstr "Skriv över"
 
-#: ../pidgin/gtkrequest.c:1512
 msgid "Choose New Name"
 msgstr "Välj nytt namn"
 
-#: ../pidgin/gtkrequest.c:1650
-#: ../pidgin/gtkrequest.c:1664
 msgid "Select Folder..."
 msgstr "Välj katalog..."
 
-# "Rumslista" istället?
 #. Create the window.
-#: ../pidgin/gtkroomlist.c:375
 msgid "Room List"
-msgstr "Rumlista"
+msgstr "Rumslista"
 
 #. list button
-#: ../pidgin/gtkroomlist.c:443
 msgid "_Get List"
 msgstr "_Hämta lista"
 
 #. add button
-#: ../pidgin/gtkroomlist.c:451
 msgid "_Add Chat"
 msgstr "_Lägg till chatt"
 
-#: ../pidgin/gtksavedstatuses.c:337
 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?"
+msgstr ""
+"Är du säker på att du vill ta bort den valda sparade statusinställningen?"
 
 #. Use button
-#: ../pidgin/gtksavedstatuses.c:620
-#: ../pidgin/gtksavedstatuses.c:1266
 msgid "_Use"
 msgstr "_Använd"
 
-#: ../pidgin/gtksavedstatuses.c:780
 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:970
 msgid "Different"
 msgstr "Skillnad"
 
-#: ../pidgin/gtksavedstatuses.c:1159
 msgid "_Title:"
 msgstr "_Titel"
 
-#: ../pidgin/gtksavedstatuses.c:1178
-#: ../pidgin/gtksavedstatuses.c:1498
 msgid "_Status:"
 msgstr "_Status:"
 
 #. Different status message expander
-#: ../pidgin/gtksavedstatuses.c:1210
 msgid "Use a _different status for some accounts"
 msgstr "Använd en _annan status för vissa konton"
 
 #. Save & Use button
-#: ../pidgin/gtksavedstatuses.c:1274
 msgid "Sa_ve & Use"
 msgstr "Spara & An_vänd"
 
-#: ../pidgin/gtksavedstatuses.c:1481
 #, c-format
 msgid "Status for %s"
 msgstr "Status för %s"
 
-#: ../pidgin/gtkstatusbox.c:664
 msgid "Waiting for network connection"
 msgstr "Väntar på nätverksanslutning."
 
-#: ../pidgin/gtkutils.c:633
+msgid "New status..."
+msgstr "Nytt statusmeddelande..."
+
+msgid "Saved statuses..."
+msgstr "Sparade statusameddelanden..."
+
 msgid "Google Talk"
 msgstr "Google Talk"
 
-#: ../pidgin/gtkutils.c:1400
-#: ../pidgin/gtkutils.c:1423
 #, 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:1403
-#: ../pidgin/gtkutils.c:1425
 msgid "Failed to load image"
 msgstr "Kunde inte läsa in bilden"
 
-#: ../pidgin/gtkutils.c:1499
 #, c-format
 msgid "Cannot send folder %s."
 msgstr "Kan inte skicka mappen %s."
 
-#: ../pidgin/gtkutils.c:1500
-#, 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:1534
-#: ../pidgin/gtkutils.c:1546
-#: ../pidgin/gtkutils.c:1553
+#, 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"
+
 msgid "You have dragged an image"
 msgstr "Du har dragit och släppt en bild"
 
-#: ../pidgin/gtkutils.c:1535
-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:1541
-#: ../pidgin/gtkutils.c:1561
+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."
+
 msgid "Set as buddy icon"
 msgstr "Använd som kompisikon"
 
-#: ../pidgin/gtkutils.c:1542
-#: ../pidgin/gtkutils.c:1562
 msgid "Send image file"
 msgstr "Skicka bildfil"
 
-#: ../pidgin/gtkutils.c:1543
-#: ../pidgin/gtkutils.c:1562
 msgid "Insert in message"
 msgstr "Infoga i meddelandet"
 
-#: ../pidgin/gtkutils.c:1547
 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:1554
-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:1555
-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"
+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."
+
+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:1614
 msgid "Cannot send launcher"
 msgstr "Kan inte skicka startare"
 
-#: ../pidgin/gtkutils.c:1614
-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:2349
+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."
+
 #, c-format
 msgid ""
 "<b>File:</b> %s\n"
@@ -16566,110 +12101,83 @@
 "<b>Filstorlek:</b> %s\n"
 "<b>Bildstorlek:</b> %dx%d"
 
-#: ../pidgin/gtkutils.c:2645
 #, 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:2647
 msgid "Icon Error"
 msgstr "Ikonfel"
 
-#: ../pidgin/gtkutils.c:2648
 msgid "Could not set icon"
 msgstr "Kunde inte ange ikon"
 
-#: ../pidgin/gtkutils.c:2748
 #, c-format
 msgid "Failed to open file '%s': %s"
 msgstr "Kunde inte öppna filen '%s': %s"
 
-#: ../pidgin/gtkutils.c:2797
-#, 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
+#, 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."
+
 msgid "Save File"
 msgstr "Spara fil"
 
-#: ../pidgin/gtkwhiteboard.c:861
 msgid "Select color"
 msgstr "Välj färg"
 
-#: ../pidgin/pidginstock.c:87
 msgid "_Alias"
 msgstr "_Alias"
 
-#: ../pidgin/pidginstock.c:89
 msgid "Close _tabs"
 msgstr "Stäng _flik"
 
-#: ../pidgin/pidginstock.c:91
 msgid "_Get Info"
 msgstr "Hämta _info"
 
-#: ../pidgin/pidginstock.c:92
 msgid "_Invite"
 msgstr "Bjud _in"
 
-#: ../pidgin/pidginstock.c:93
 msgid "_Modify"
 msgstr "_Ändra"
 
-#: ../pidgin/pidginstock.c:94
 msgid "_Open Mail"
 msgstr "_Öppna brev"
 
-#: ../pidgin/pixmaps/emotes/default/24/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:450
 msgid "Display Statistics"
 msgstr "Visa statestik"
 
-#: ../pidgin/plugins/cap/cap.c:462
-#: ../pidgin/plugins/cap/cap.c:465
 msgid "Response Probability:"
 msgstr "Trolighet för svar:"
 
-#: ../pidgin/plugins/cap/cap.c:811
 msgid "Statistics Configuration"
 msgstr "Statestikkonfigurering"
 
 #. msg_difference spinner
-#: ../pidgin/plugins/cap/cap.c:814
 msgid "Maximum response timeout:"
 msgstr "Maximal svarsväntetid:"
 
-#: ../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 "minuter"
 
 #. last_seen spinner
-#: ../pidgin/plugins/cap/cap.c:821
 msgid "Maximum last-seen difference:"
 msgstr "Maximal senast sedd-skillnad:"
 
 #. threshold spinner
-#: ../pidgin/plugins/cap/cap.c:828
 msgid "Threshold:"
 msgstr "Tröskel:"
 
@@ -16679,55 +12187,51 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/cap/cap.c:936
 msgid "Contact Availability Prediction"
 msgstr "Förutspå kontakters tillgänglighet"
 
 #. *< name
 #. *< version
-#: ../pidgin/plugins/cap/cap.c:938
 msgid "Contact Availability Prediction plugin."
 msgstr "Modul för förutspå kontaktens tillgänglighet"
 
 #. *  summary
-#: ../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."
-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 ""
+"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."
+
 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 ""
+"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"
+
 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..."
 
@@ -16737,87 +12241,76 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/contact_priority.c:188
 msgid "Contact Priority"
 msgstr "Kontaktprioritet"
 
 #. *< name
 #. *< version
 #. *< summary
-#: ../pidgin/plugins/contact_priority.c:191
-msgid "Allows for controlling the values associated with different buddy states."
-msgstr "Ger möjlighet att kontrollera värdena associerade med olika kompisstatusar."
+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:193
-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 ""
+"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."
+
 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:245
 #, c-format
 msgid "Select Color for %s"
 msgstr "Välj färg för %s"
 
-#: ../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 ""
+"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\"."
+
 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"
 
@@ -16827,37 +12320,34 @@
 #. *< 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"
+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"
 
@@ -16867,19 +12357,16 @@
 #. *< 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"
@@ -16895,75 +12382,60 @@
 "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:301
 msgid "Group:"
 msgstr "Grupp:"
 
 #. "New Person" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:576
-#: ../pidgin/plugins/gevolution/assoc-buddy.c:467
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:248
 msgid "New Person"
 msgstr "Ny person"
 
 #. "Select Buddy" button
-#: ../pidgin/plugins/gevolution/add_buddy_dialog.c:593
 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."
+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."
 
@@ -16973,7 +12445,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gevolution/gevolution.c:527
 msgid "Evolution Integration"
 msgstr "Integrering med Evolution"
 
@@ -16981,37 +12452,28 @@
 #. *< 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:262
 msgid "Please enter the person's information below."
 msgstr "Ange personens information nedan."
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:266
 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:286
 msgid "Account type:"
 msgstr "Kontotyp:"
 
 #. Optional Information section
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:309
 msgid "Optional information:"
 msgstr "Frivillig information:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:344
 msgid "First name:"
 msgstr "Förnamn:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:356
 msgid "Last name:"
 msgstr "Efternamn:"
 
-#: ../pidgin/plugins/gevolution/new_person_dialog.c:376
 msgid "E-mail:"
 msgstr "E-postadress:"
 
@@ -17021,7 +12483,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/gtk-signals-test.c:160
 msgid "GTK Signals Test"
 msgstr "GTK Signaltest"
 
@@ -17029,12 +12490,9 @@
 #. *< 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/gtkbuddynote.c:36
 #, c-format
 msgid ""
 "\n"
@@ -17043,7 +12501,6 @@
 "\n"
 "<b>Kompiskommentar</b>: %s"
 
-#: ../pidgin/plugins/history.c:195
 msgid "History"
 msgstr "Historik"
 
@@ -17053,7 +12510,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/iconaway.c:82
 msgid "Iconify on Away"
 msgstr "Ikonifiera vid frånvarande"
 
@@ -17061,80 +12517,65 @@
 #. *< 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
+msgstr ""
+"Gör din kompislista och dina konversationer till en ikon när du är "
+"frånvarande."
+
 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
+msgstr ""
+"Lägger till en liten ruta till kompislistan som visar om du fått ny e-post."
+
 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:682
 msgid "_IM windows"
 msgstr "_Snabbmeddelandefönster"
 
-#: ../pidgin/plugins/markerline.c:254
-#: ../pidgin/plugins/notify.c:689
 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 ""
+"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."
+
 msgid "Music messaging session confirmed."
 msgstr "Music messaging session bekräftad."
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:430
 msgid "Music Messaging"
 msgstr "Music Messaging"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:431
 msgid "There was a conflict in running the command:"
 msgstr "Det var en konflikt i körning av kommandot:"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:539
 msgid "Error Running Editor"
 msgstr "Fel vid körning av editor"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:540
 msgid "The following error has occurred:"
 msgstr "Följande fel har inträffat:"
 
 #. Configuration frame
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:639
 msgid "Music Messaging Configuration"
 msgstr "Music Messaging konfiguration"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:643
 msgid "Score Editor Path"
 msgstr "Sökväg för redigerare av notblad"
 
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:644
 msgid "_Apply"
 msgstr "_Aktivera"
 
@@ -17146,85 +12587,72 @@
 #. *< id
 #. *< name
 #. *< version
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:685
 msgid "Music Messaging Plugin for collaborative composition."
 msgstr "Music Messaging-modul för gemensam komponering."
 
 #. *  summary
-#: ../pidgin/plugins/musicmessaging/musicmessaging.c:687
-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."
+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:678
 msgid "Notify For"
 msgstr "Rapportera i"
 
-#: ../pidgin/plugins/notify.c:697
 msgid "\t_Only when someone says your screen name"
 msgstr "\tBara då någ_on nämner ditt skärmnamn"
 
-#: ../pidgin/plugins/notify.c:707
 msgid "_Focused windows"
 msgstr "_Fokuserade fönster"
 
 #. ---------- "Notification Methods" ----------
-#: ../pidgin/plugins/notify.c:715
 msgid "Notification Methods"
 msgstr "Rapporteringsmetod"
 
 # Lägg märke till att det står "prepend".
-#: ../pidgin/plugins/notify.c:722
 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:741
 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:750
 msgid "Insert count of new message into _X property"
 msgstr "Lägg till meddelanderäknare i _X"
 
 #. Urgent method button
-#: ../pidgin/plugins/notify.c:758
 msgid "Set window manager \"_URGENT\" hint"
 msgstr "Sätt fönsterhanterarens \"_URGENT\"-ledtråd"
 
 #. Raise window method button
-#: ../pidgin/plugins/notify.c:767
 msgid "R_aise conversation window"
 msgstr "_Fokusera konversationsfönstret"
 
 #. ---------- "Notification Removals" ----------
-#: ../pidgin/plugins/notify.c:775
 msgid "Notification Removal"
 msgstr "Ta bort rapportering"
 
 #. Remove on focus button
-#: ../pidgin/plugins/notify.c:780
 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:787
 msgid "Remove when conversation window _receives click"
 msgstr "Ta bort när konversationsfönstret blir _klickat"
 
 #. Remove on type button
-#: ../pidgin/plugins/notify.c:795
 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:803
 msgid "Remove when a _message gets sent"
 msgstr "Ta bort när ett _meddelande skickas"
 
 #. Remove on conversation switch button
-#: ../pidgin/plugins/notify.c:812
 msgid "Remove on switch to conversation ta_b"
 msgstr "Ta _bort vid byte till konversationsflik"
 
@@ -17234,7 +12662,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/notify.c:907
 msgid "Message Notification"
 msgstr "Meddelanderapportering"
 
@@ -17242,8 +12669,6 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/notify.c:910
-#: ../pidgin/plugins/notify.c:912
 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."
 
@@ -17253,19 +12678,16 @@
 #. *< 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"
@@ -17275,55 +12697,44 @@
 "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
+"- Den sänder ett meddelande till personerna på din kompislista direkt när du "
+"loggar in"
+
 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:69
 msgid "Conversation Entry"
 msgstr "Konversationsinlägg"
 
-#: ../pidgin/plugins/pidginrc.c:70
 msgid "Request Dialog"
 msgstr "Förfrågningsdialog"
 
-#: ../pidgin/plugins/pidginrc.c:71
 msgid "Notify Dialog"
 msgstr "Rapporteringsdialog"
 
-#: ../pidgin/plugins/pidginrc.c:247
 msgid "Select Color"
 msgstr "Välj färg"
 
-#: ../pidgin/plugins/pidginrc.c:294
 #, c-format
 msgid "Select Interface Font"
 msgstr "Välj typsnitt för gränssnittet"
 
-#: ../pidgin/plugins/pidginrc.c:297
 #, c-format
 msgid "Select Font for %s"
 msgstr "Välj typsnitt för %s"
 
-#: ../pidgin/plugins/pidginrc.c:365
 msgid "GTK+ Interface Font"
 msgstr "GTK+ Gränssnittstypsnitt"
 
-#: ../pidgin/plugins/pidginrc.c:385
 msgid "GTK+ Text Shortcut Theme"
 msgstr "GTK+ Textgenvägstema"
 
@@ -17347,65 +12758,58 @@
 #. widget_bool_widgets[i]);
 #. }
 #.
-#: ../pidgin/plugins/pidginrc.c:422
 msgid "Interface colors"
 msgstr "Gränssnittsfärger"
 
 # Osäker: Finns smidigare lösning?
-#: ../pidgin/plugins/pidginrc.c:446
 msgid "Widget Sizes"
 msgstr "Storlek på grafiska element"
 
-#: ../pidgin/plugins/pidginrc.c:467
 msgid "Fonts"
 msgstr "Typsnitt"
 
-#: ../pidgin/plugins/pidginrc.c:491
 msgid "Gtkrc File Tools"
 msgstr "Gtkrc filverktyg"
 
-#: ../pidgin/plugins/pidginrc.c:496
 #, c-format
 msgid "Write settings to %s%sgtkrc-2.0"
 msgstr "Skriv inställningar till %s%sgtkrc-2.0"
 
-#: ../pidgin/plugins/pidginrc.c:505
 msgid "Re-read gtkrc files"
 msgstr "Läs om gtkrc-filer"
 
-#: ../pidgin/plugins/pidginrc.c:543
 msgid "Pidgin GTK+ Theme Control"
 msgstr "Pidgin GTK+ temakontroll"
 
-#: ../pidgin/plugins/pidginrc.c:545
-#: ../pidgin/plugins/pidginrc.c:546
 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
+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."
+
+#, 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>"
+
 #, 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"
 
@@ -17415,85 +12819,70 @@
 #. *< 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 ""
+"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."
+
 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
+msgstr ""
+"_Exakt skriftlägeskäbslighet (avmarkera för automatisk skriftlägesavkänning)"
+
 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:2372
 msgid "Text replacement"
 msgstr "Textersättning"
 
-#: ../pidgin/plugins/spellchk.c:2374
-#: ../pidgin/plugins/spellchk.c:2375
 msgid "Replaces text in outgoing messages according to user-defined rules."
 msgstr "Ersätter text i utgående meddelanden enligt dina egna regler."
 
@@ -17503,8 +12892,6 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/ticker/ticker.c:74
-#: ../pidgin/plugins/ticker/ticker.c:356
 msgid "Buddy Ticker"
 msgstr "Kompistickare"
 
@@ -17512,12 +12899,9 @@
 #. *< version
 #. *  summary
 #. *  description
-#: ../pidgin/plugins/ticker/ticker.c:359
-#: ../pidgin/plugins/ticker/ticker.c:361
 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"
 
@@ -17527,50 +12911,38 @@
 #. *< 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
 #, c-format
 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:"
 
@@ -17580,60 +12952,49 @@
 #. *< 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:175
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:598
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:645
+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."
+
 msgid "Opacity:"
 msgstr "Ogenomskinlighet:"
 
 #. IM Convo trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:562
 msgid "IM Conversation Windows"
 msgstr "Snabbmeddelandefönster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:563
 msgid "_IM window transparency"
 msgstr "_Genomskinlighet för snabbmeddelandefönster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:577
 msgid "_Show slider bar in IM window"
 msgstr "_Visa \"slider bar\" i snabbmeddelandefönster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:584
 msgid "Remove IM window transparency on focus"
 msgstr "Ta bort genomskinlighet för fokuserade snabbmeddelandefönster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:587
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:635
 msgid "Always on top"
 msgstr "Alltid överst"
 
 #. Buddy List trans options
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:619
 msgid "Buddy List Window"
 msgstr "Kompislistefönster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:620
 msgid "_Buddy List window transparency"
 msgstr "Genomskinlighet för _kompislistefönster"
 
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:633
 msgid "Remove Buddy List window transparency on focus"
 msgstr "Ta bort genomskinligheten på kompislistefönstret när det får fokus"
 
@@ -17643,73 +13004,64 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:693
 msgid "Transparency"
 msgstr "Genomskinlighet"
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:696
 msgid "Variable Transparency for the buddy list and conversations."
 msgstr "Variabel genomskinlighet på kompislistan och konversationer."
 
 #. *  description
-#: ../pidgin/plugins/win32/transparency/win2ktrans.c:698
-msgid ""
-"This plugin enables variable alpha transparency on conversation windows and the buddy list.\n"
+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"
+"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:303
 msgid "GTK+ Runtime Version"
 msgstr "GTK+ Runtime-version"
 
 #. Autostart
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:311
 msgid "Startup"
 msgstr "Uppstart"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:312
 #, c-format
 msgid "_Start %s on Windows startup"
 msgstr "_Starta %s när Windows startar"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:327
 msgid "_Dockable Buddy List"
 msgstr "_Dockningsbar kompislista"
 
 #. Blist On Top
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:331
 msgid "_Keep Buddy List window on top:"
 msgstr "_Håll kompislistefönstret överst:"
 
 #. XXX: Did this ever work?
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:336
 msgid "Only when docked"
 msgstr "Endast om dockad"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:341
 msgid "_Flash window when chat messages are received"
 msgstr "Blinka med _fönstret när chattmeddelanden tas emot"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:371
 msgid "Windows Pidgin Options"
 msgstr "Inställningar för Pidgin i Windows"
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:373
 msgid "Options specific to Pidgin for Windows."
 msgstr "Inställningar specifika för Pidgin i Windows."
 
-#: ../pidgin/plugins/win32/winprefs/winprefs.c:374
-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:670
+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."
+
 msgid "<font color='#777777'>Logged out.</font>"
 msgstr "<font color='#777777'>Loggade ut.</font>"
 
@@ -17719,84 +13071,30 @@
 #. *< dependencies
 #. *< priority
 #. *< id
-#: ../pidgin/plugins/xmppconsole.c:749
-#: ../pidgin/plugins/xmppconsole.c:844
-#: ../pidgin/plugins/xmppconsole.c:863
 msgid "XMPP Console"
 msgstr "XMPP Konsoll"
 
-#: ../pidgin/plugins/xmppconsole.c:756
 msgid "Account: "
 msgstr "Konto: "
 
-#: ../pidgin/plugins/xmppconsole.c:783
 msgid "<font color='#777777'>Not connected to XMPP</font>"
 msgstr "<font color='#777777'>Inte ansluten till XMPP</font>"
 
-#: ../pidgin/plugins/xmppconsole.c:793
 msgid "Insert an <iq/> stanza."
 msgstr "Infoga en <iq/> strof."
 
-#: ../pidgin/plugins/xmppconsole.c:802
 msgid "Insert a <presence/> stanza."
 msgstr "Infoga en <presence/> strof."
 
-#: ../pidgin/plugins/xmppconsole.c:811
 msgid "Insert a <message/> stanza."
 msgstr "Infoga en <message/> strof."
 
 #. *< name
 #. *< version
 #. *  summary
-#: ../pidgin/plugins/xmppconsole.c:866
 msgid "Send and receive raw XMPP stanzas."
 msgstr "Skicka och ta emot råa XMPP strofer."
 
 #. *  description
-#: ../pidgin/plugins/xmppconsole.c:868
 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."
-
-#~ msgid "Sort by status"
-#~ msgstr "Sortera efter status"
-#~ msgid "Sort alphabetically"
-#~ msgstr "Sortera alfabetiskt"
-#~ msgid "Sort by log size"
-#~ msgstr "Sortera efter loggstorlek"
-#~ msgid "Has you"
-#~ msgstr "Har dig"
-#~ msgid "MSN Protocol Plugin"
-#~ msgstr "Insticksmodul för MSN-Protokollet"
-#~ msgid "Add Buddy _Pounce"
-#~ msgstr "Lägg till kom_pisattack"
-#~ msgid "Add a _Buddy"
-#~ msgstr "_Lägg till kompis"
-#~ msgid "Add a C_hat"
-#~ msgstr "Lägg till c_hatt"
-#~ msgid "/Accounts/Add\\/Edit"
-#~ msgstr "/Verktyg/Lägg till\\/Redigera"
-#~ msgid "_Send To"
-#~ msgstr "_Skicka till"
-#~ msgid "_Smiley"
-#~ msgstr "_Smiley"
-#~ msgid "nudged"
-#~ msgstr "vibbad"
-#~ msgid "You have just sent a Nudge!"
-#~ msgstr "Du har just sänt en vibb!"
-#~ msgid "%s just sent you a Buzz!"
-#~ msgstr "%s skickade just en vibb!"
-#~ msgid "You have just sent a Buzz!"
-#~ msgstr "Du har just sänt en vibb!"
-#~ msgid "buzzed"
-#~ msgstr "surrad"
-#~ msgid "Attention! %s %s."
-#~ msgstr "Lystring! %s %s."
-#~ msgid "Attention!"
-#~ msgstr "Lystring!"
-#~ msgid "Attention! You have been %s."
-#~ msgstr "Lystring! Du har blivit %s."
-#~ msgid "Conversation History"
-#~ msgstr "Konversationshistorik"
-#~ msgid "Log Viewer"
-#~ msgstr "Loggvisare"
-