From c3d5c8cca2d10bf68229a46992e5b940ad6e0a8b Mon Sep 17 00:00:00 2001
From: Benjamin Richter <br@waldteufel-online.net>
Date: Mon, 7 Sep 2009 20:23:35 +0200
Subject: Make fuzzyclock code more concise.

Also use % formatting instead of string replace.
Translation files updated accordingly.
---
 po/sv.po | 3427 +++++++++++++++++++++++++++++++++-----------------------------
 1 file changed, 1818 insertions(+), 1609 deletions(-)

(limited to 'po/sv.po')

diff --git a/po/sv.po b/po/sv.po
index 8ca450b2d..d14c2f2b4 100644
--- a/po/sv.po
+++ b/po/sv.po
@@ -5,17 +5,12 @@
 # Oscar Hellström <oscar@oscarh.net>, 2005.
 # Daniel Nylander <po@danielnylander.se>, 2007, 2009.
 #
-#. app_name (string)
-#. replaces_id (uint)
-#. event_id (string)
-#. app_icon (string)
-#: ../src/notify.py:530
 msgid ""
 msgstr ""
 "Project-Id-Version: gajim\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2009-03-01 14:33+0100\n"
-"PO-Revision-Date: 2009-02-26 10:45+0100\n"
+"POT-Creation-Date: 2009-08-19 20:36+0200\n"
+"PO-Revision-Date: 2009-08-20 00:05+0200\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
@@ -98,6 +93,10 @@ msgid "<b>Please select a server</b>"
 msgstr "<b>Välj en server</b>"
 
 #: ../data/glade/account_creation_wizard_window.glade.h:7
+msgid "@"
+msgstr ""
+
+#: ../data/glade/account_creation_wizard_window.glade.h:8
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
 "SHA1 fingerprint of the certificate:\n"
@@ -105,53 +104,58 @@ msgstr ""
 "Lägg till detta certifikat till listan över pålitliga certifikat.\n"
 "SHA1-fingeravtryck för certifikatet:\n"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:10
+#: ../data/glade/account_creation_wizard_window.glade.h:11
+#, fuzzy
+msgid "Anon_ymous authentication"
+msgstr "Använd autentiser_ing för proxyserver"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:12
 msgid "Connect when I press Finish"
 msgstr "Anslut när jag trycker på Färdigställ"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:11
+#: ../data/glade/account_creation_wizard_window.glade.h:13
 msgid "Gajim: Account Creation Wizard"
 msgstr "Gajim: Kontoskaparen"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:12
+#: ../data/glade/account_creation_wizard_window.glade.h:14
 msgid "I already have an account I want to _use"
 msgstr "Jag har redan ett konto som _jag vill använda"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:13
+#: ../data/glade/account_creation_wizard_window.glade.h:15
 msgid "I want to _register for a new account"
 msgstr "Jag vill _registrera ett nytt konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:14
+#: ../data/glade/account_creation_wizard_window.glade.h:16
 #: ../data/glade/account_modification_window.glade.h:20
-#: ../data/glade/accounts_window.glade.h:24
+#: ../data/glade/accounts_window.glade.h:25
 msgid "If checked, Gajim will remember the password for this account"
 msgstr "Om kryssad kommer Gajim att komma ihåg lösenordet för detta konto"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:15
+#: ../data/glade/account_creation_wizard_window.glade.h:17
 #: ../data/glade/account_modification_window.glade.h:26
 msgid "Manage..."
 msgstr "Hantera..."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:16
+#: ../data/glade/account_creation_wizard_window.glade.h:18
 msgid "Prox_y:"
 msgstr "Prox_yserver:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:17
+#: ../data/glade/account_creation_wizard_window.glade.h:19
 #: ../data/glade/account_modification_window.glade.h:40
-#: ../data/glade/accounts_window.glade.h:45
+#: ../data/glade/accounts_window.glade.h:46
 msgid "Save pass_word"
 msgstr "Spara lösen_ord"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:18
+#: ../data/glade/account_creation_wizard_window.glade.h:20
 msgid "Set my profile when I connect"
 msgstr "Ställ in min profil när jag ansluter"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:19
+#: ../data/glade/account_creation_wizard_window.glade.h:21
 #: ../data/glade/account_modification_window.glade.h:45
 msgid "Use custom hostname/port"
 msgstr "Använd anpassat värdnamn/port"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:20
+#: ../data/glade/account_creation_wizard_window.glade.h:22
 msgid ""
 "You need to have an account in order to connect\n"
 "to the Jabber network."
@@ -159,42 +163,39 @@ msgstr ""
 "Du behöver ha ett konto för att kunna ansluta till\n"
 "Jabber-nätverket."
 
-#: ../data/glade/account_creation_wizard_window.glade.h:22
-msgid "Your JID:"
-msgstr "Ditt JID:"
-
-#: ../data/glade/account_creation_wizard_window.glade.h:23
+#: ../data/glade/account_creation_wizard_window.glade.h:24
 #: ../data/glade/roster_window.glade.h:15
 msgid "_Advanced"
 msgstr "_Avancerat"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:24
+#: ../data/glade/account_creation_wizard_window.glade.h:25
 msgid "_Finish"
 msgstr "F_ärdigställ"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:25
+#: ../data/glade/account_creation_wizard_window.glade.h:26
 msgid "_Hostname:"
 msgstr "_Värdnamn:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:26
+#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_modification_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:58
+msgid "_Jabber ID:"
+msgstr "_Jabber-ID:"
+
+#: ../data/glade/account_creation_wizard_window.glade.h:28
 #: ../data/glade/account_modification_window.glade.h:50
-#: ../data/glade/accounts_window.glade.h:59
+#: ../data/glade/accounts_window.glade.h:60
 msgid "_Password:"
 msgstr "_Lösenord:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:27
+#: ../data/glade/account_creation_wizard_window.glade.h:29
 msgid "_Port:"
 msgstr "_Port:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:28
+#: ../data/glade/account_creation_wizard_window.glade.h:30
 msgid "_Server:"
 msgstr "_Server:"
 
-#: ../data/glade/account_creation_wizard_window.glade.h:29
-#: ../data/glade/manage_proxies_window.glade.h:16
-msgid "_Username:"
-msgstr "_Användarnamn:"
-
 #: ../data/glade/account_modification_window.glade.h:1
 #: ../data/glade/accounts_window.glade.h:1
 #: ../data/glade/preferences_window.glade.h:11
@@ -226,17 +227,17 @@ msgid "Administration operations"
 msgstr "Administrationsåtgärder"
 
 #: ../data/glade/account_modification_window.glade.h:7
-#: ../data/glade/accounts_window.glade.h:9
+#: ../data/glade/accounts_window.glade.h:10
 msgid "Auto-reconnect when connection is lost"
 msgstr "Återanslut automatiskt när anslutningen förloras"
 
 #: ../data/glade/account_modification_window.glade.h:8
-#: ../data/glade/accounts_window.glade.h:10
+#: ../data/glade/accounts_window.glade.h:11
 msgid "C_onnect on Gajim startup"
 msgstr "A_nslut vid start av Gajim"
 
 #: ../data/glade/account_modification_window.glade.h:9
-#: ../data/glade/accounts_window.glade.h:11
+#: ../data/glade/accounts_window.glade.h:12
 msgid "Chan_ge Password"
 msgstr "_Byt lösenord"
 
@@ -253,23 +254,23 @@ msgstr ""
 "kommer TLS att inaktiveras"
 
 #: ../data/glade/account_modification_window.glade.h:11
-#: ../data/glade/accounts_window.glade.h:13
+#: ../data/glade/accounts_window.glade.h:14
 msgid "Choose _Key..."
 msgstr "Välj nyc_kel..."
 
 #: ../data/glade/account_modification_window.glade.h:12
-#: ../data/glade/accounts_window.glade.h:14
+#: ../data/glade/accounts_window.glade.h:15
 msgid "Click to change account's password"
 msgstr "Klicka för att byta kontots lösenord"
 
 #: ../data/glade/account_modification_window.glade.h:13
-#: ../data/glade/accounts_window.glade.h:15
+#: ../data/glade/accounts_window.glade.h:16
 msgid "Click to request authorization to all contacts of another account"
 msgstr ""
 "Klicka för att begära auktorisation till alla kontakter för annat konto"
 
 #: ../data/glade/account_modification_window.glade.h:14
-#: ../data/glade/accounts_window.glade.h:17
+#: ../data/glade/accounts_window.glade.h:18
 msgid "Connection"
 msgstr "Anslutning"
 
@@ -279,10 +280,10 @@ msgstr "Redigera personlig information..."
 
 #. No configured account
 #: ../data/glade/account_modification_window.glade.h:16
-#: ../data/glade/accounts_window.glade.h:20
-#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1140
-#: ../src/common/helpers.py:1152 ../src/notify.py:526 ../src/notify.py:544
-#: ../src/notify.py:580 ../src/notify.py:592
+#: ../data/glade/accounts_window.glade.h:21
+#: ../data/glade/roster_window.glade.h:5 ../src/common/helpers.py:1212
+#: ../src/common/helpers.py:1224 ../src/notify.py:547 ../src/notify.py:568
+#: ../src/notify.py:607 ../src/notify.py:619
 msgid "Gajim"
 msgstr "Gajim"
 
@@ -290,10 +291,10 @@ msgstr "Gajim"
 #. FIXME: Ugly workaround. Maybe we haven't been in any group (defaults to General)
 #. General group cannot be changed
 #: ../data/glade/account_modification_window.glade.h:17
-#: ../data/glade/accounts_window.glade.h:21
+#: ../data/glade/accounts_window.glade.h:22
 #: ../data/glade/preferences_window.glade.h:50 ../src/common/contacts.py:98
-#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2644
-#: ../src/roster_window.py:5194
+#: ../src/dialogs.py:103 ../src/dialogs.py:111 ../src/roster_window.py:2719
+#: ../src/roster_window.py:5277
 msgid "General"
 msgstr "Allmänt"
 
@@ -302,7 +303,7 @@ msgid "Hostname: "
 msgstr "Värdnamn: "
 
 #: ../data/glade/account_modification_window.glade.h:19
-#: ../data/glade/accounts_window.glade.h:22
+#: ../data/glade/accounts_window.glade.h:23
 msgid ""
 "If checked, Gajim will also broadcast some more IPs except from just your "
 "IP, so file transfer has higher chances of working."
@@ -311,7 +312,7 @@ msgstr ""
 "för att öka chanserna att filöverföringar ska fungera som de ska."
 
 #: ../data/glade/account_modification_window.glade.h:21
-#: ../data/glade/accounts_window.glade.h:25
+#: ../data/glade/accounts_window.glade.h:26
 msgid ""
 "If checked, Gajim will send keep-alive packets to prevent connection timeout "
 "which results in disconnection"
@@ -328,7 +329,7 @@ msgstr ""
 "rättigheter enbart för dig och din administratör"
 
 #: ../data/glade/account_modification_window.glade.h:23
-#: ../data/glade/accounts_window.glade.h:26
+#: ../data/glade/accounts_window.glade.h:27
 msgid ""
 "If checked, Gajim, when launched, will automatically connect to jabber using "
 "this account"
@@ -337,7 +338,7 @@ msgstr ""
 "detta konto"
 
 #: ../data/glade/account_modification_window.glade.h:24
-#: ../data/glade/accounts_window.glade.h:27
+#: ../data/glade/accounts_window.glade.h:28
 msgid ""
 "If checked, any change to the global status (handled by the combobox at the "
 "bottom of the roster window) will change the status of this account "
@@ -348,13 +349,13 @@ msgstr ""
 "för detta konto"
 
 #: ../data/glade/account_modification_window.glade.h:25
-#: ../data/glade/accounts_window.glade.h:30
+#: ../data/glade/accounts_window.glade.h:31
 msgid "Information about you, as stored in the server"
 msgstr "Information om dig, som den är sparad på servern"
 
 #: ../data/glade/account_modification_window.glade.h:27
-#: ../data/glade/accounts_window.glade.h:34 ../src/config.py:1564
-#: ../src/config.py:2067
+#: ../data/glade/accounts_window.glade.h:35 ../src/config.py:1547
+#: ../src/config.py:2092
 msgid "No key selected"
 msgstr "Ingen nyckel vald"
 
@@ -364,18 +365,19 @@ msgstr "Ingen nyckel vald"
 #. useauth_checkbutton.set_active(False)
 #. self.on_useauth_checkbutton_toggled(useauth_checkbutton)
 #: ../data/glade/account_modification_window.glade.h:29
-#: ../data/glade/accounts_window.glade.h:36
-#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1115
-#: ../src/config.py:1204 ../src/config.py:1472 ../src/config.py:1477
-#: ../src/config.py:1975 ../src/config.py:2053 ../src/config.py:2066
-#: ../src/config.py:3167 ../src/config.py:3235 ../src/dialogs.py:291
-#: ../src/dialogs.py:293 ../src/dialogs.py:519 ../src/roster_window.py:2713
-#: ../src/roster_window.py:2719 ../src/roster_window.py:2724
+#: ../data/glade/accounts_window.glade.h:37
+#: ../data/glade/change_mood_dialog.glade.h:3 ../src/config.py:1103
+#: ../src/config.py:1191 ../src/config.py:1452 ../src/config.py:1457
+#: ../src/config.py:1998 ../src/config.py:2078 ../src/config.py:2091
+#: ../src/config.py:3227 ../src/config.py:3300 ../src/dialogs.py:293
+#: ../src/dialogs.py:295 ../src/dialogs.py:498 ../src/dialogs.py:511
+#: ../src/roster_window.py:2789 ../src/roster_window.py:2795
+#: ../src/roster_window.py:2800
 msgid "None"
 msgstr "Ingen"
 
 #: ../data/glade/account_modification_window.glade.h:30
-#: ../data/glade/accounts_window.glade.h:37
+#: ../data/glade/accounts_window.glade.h:38
 #: ../data/glade/profile_window.glade.h:36
 msgid "Personal Information"
 msgstr "Personlig information"
@@ -385,12 +387,12 @@ msgid "Port: "
 msgstr "Port: "
 
 #: ../data/glade/account_modification_window.glade.h:32
-#: ../data/glade/accounts_window.glade.h:38
+#: ../data/glade/accounts_window.glade.h:39
 msgid "Priori_ty:"
 msgstr "Priori_tet:"
 
 #: ../data/glade/account_modification_window.glade.h:33
-#: ../data/glade/accounts_window.glade.h:39
+#: ../data/glade/accounts_window.glade.h:40
 msgid ""
 "Priority is used in Jabber to determine who gets the events from the jabber "
 "server when two or more clients are connected using the same account; The "
@@ -401,7 +403,7 @@ msgstr ""
 "Klienten med den högsta prioriteten får händelserna"
 
 #: ../data/glade/account_modification_window.glade.h:34
-#: ../data/glade/accounts_window.glade.h:40
+#: ../data/glade/accounts_window.glade.h:41
 msgid "Priority will change automatically according to your status."
 msgstr "Prioritet kommer att ändras automatiskt beroende på din status."
 
@@ -410,12 +412,12 @@ msgid "Proxy:"
 msgstr "Proxyserver:"
 
 #: ../data/glade/account_modification_window.glade.h:36
-#: ../data/glade/accounts_window.glade.h:42
+#: ../data/glade/accounts_window.glade.h:43
 msgid "Resour_ce:"
 msgstr "Resur_s:"
 
 #: ../data/glade/account_modification_window.glade.h:37
-#: ../data/glade/accounts_window.glade.h:43
+#: ../data/glade/accounts_window.glade.h:44
 msgid ""
 "Resource is sent to the Jabber server in order to separate the same JID in "
 "two or more parts depending on the number of the clients connected in the "
@@ -434,7 +436,7 @@ msgid "Save _passphrase (insecure)"
 msgstr "Spara _lösenfras (osäkert)"
 
 #: ../data/glade/account_modification_window.glade.h:39
-#: ../data/glade/accounts_window.glade.h:44
+#: ../data/glade/accounts_window.glade.h:45
 msgid "Save conversation _logs for all contacts"
 msgstr "Spara konversations_loggar för alla kontakter"
 
@@ -443,13 +445,12 @@ msgid "Send keep-alive packets"
 msgstr "Skicka keep-alive-paket"
 
 #: ../data/glade/account_modification_window.glade.h:42
-#: ../data/glade/accounts_window.glade.h:47
+#: ../data/glade/accounts_window.glade.h:48
 msgid "Synch_ronize account status with global status"
 msgstr "Synk_ronisera kontostatus med global status"
 
 #: ../data/glade/account_modification_window.glade.h:43
-#: ../data/glade/accounts_window.glade.h:49
-#: ../data/glade/synchronise_contacts_dialog.glade.h:2
+#: ../data/glade/accounts_window.glade.h:50
 #: ../data/glade/synchronise_select_account_dialog.glade.h:2
 msgid "Synchronise contacts"
 msgstr "Synkronisera kontakter"
@@ -459,7 +460,7 @@ msgid "Use _SSL (legacy)"
 msgstr "Använd _SSL (äldre)"
 
 #: ../data/glade/account_modification_window.glade.h:46
-#: ../data/glade/accounts_window.glade.h:53
+#: ../data/glade/accounts_window.glade.h:54
 msgid "Use file transfer proxies"
 msgstr "Använd proxyservrar för filöverföringar"
 
@@ -467,13 +468,8 @@ msgstr "Använd proxyservrar för filöverföringar"
 msgid "_Adjust to status"
 msgstr "_Justera efter status"
 
-#: ../data/glade/account_modification_window.glade.h:48
-#: ../data/glade/accounts_window.glade.h:57
-msgid "_Jabber ID:"
-msgstr "_Jabber-ID:"
-
 #: ../data/glade/account_modification_window.glade.h:49
-#: ../data/glade/manage_proxies_window.glade.h:14
+#: ../data/glade/manage_proxies_window.glade.h:13
 msgid "_Name:"
 msgstr "_Namn:"
 
@@ -489,7 +485,12 @@ msgstr "Justera _efter status"
 msgid "Accounts"
 msgstr "Konton"
 
-#: ../data/glade/accounts_window.glade.h:12
+#: ../data/glade/accounts_window.glade.h:9
+#, fuzzy
+msgid "Anonymous authentication"
+msgstr "Använd autentiser_ing för proxyserver"
+
+#: ../data/glade/accounts_window.glade.h:13
 msgid ""
 "Check this so Gajim will ask you before sending your password over an "
 "insecure connection."
@@ -497,26 +498,26 @@ msgstr ""
 "Kryssa för denna så att Gajim frågar dig innan ditt lösenord skickas över en "
 "osäker anslutning."
 
-#: ../data/glade/accounts_window.glade.h:16
+#: ../data/glade/accounts_window.glade.h:17
 msgid "Co_nnect on Gajim startup"
 msgstr "A_nslut vid start av Gajim"
 
-#: ../data/glade/accounts_window.glade.h:18
+#: ../data/glade/accounts_window.glade.h:19
 #: ../data/glade/zeroconf_information_window.glade.h:2
 msgid "E-Mail:"
 msgstr "E-post:"
 
-#: ../data/glade/accounts_window.glade.h:19
+#: ../data/glade/accounts_window.glade.h:20
 #: ../data/glade/zeroconf_information_window.glade.h:3
 msgid "First Name:"
 msgstr "Förnamn:"
 
-#: ../data/glade/accounts_window.glade.h:23
+#: ../data/glade/accounts_window.glade.h:24
 msgid "If checked, Gajim will get the password from a GPG agent like seahorse"
 msgstr ""
 "Om kryssad kommer Gajim att få lösenordet från en GPG-agent, t.ex. Seahorse"
 
-#: ../data/glade/accounts_window.glade.h:28
+#: ../data/glade/accounts_window.glade.h:29
 msgid ""
 "If the default port that is used for incoming messages is unfitting for your "
 "setup you can select another one here.\n"
@@ -526,84 +527,85 @@ msgstr ""
 "konfiguration så kan du välja en annan här.\n"
 "Du kan dock överväga att ändra möjliga brandväggsregler."
 
-#: ../data/glade/accounts_window.glade.h:31
-#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/dialogs.py:675
+#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/zeroconf_information_window.glade.h:4 ../src/config.py:1571
+#: ../src/dialogs.py:784
 msgid "Jabber ID:"
 msgstr "Jabber-ID:"
 
-#: ../data/glade/accounts_window.glade.h:32
+#: ../data/glade/accounts_window.glade.h:33
 #: ../data/glade/zeroconf_information_window.glade.h:5
 msgid "Last Name:"
 msgstr "Efternamn:"
 
-#: ../data/glade/accounts_window.glade.h:33
+#: ../data/glade/accounts_window.glade.h:34
 msgid "Mer_ge accounts"
 msgstr "Sa_mmanfoga konton"
 
 #. Rename
-#: ../data/glade/accounts_window.glade.h:41 ../src/roster_window.py:5145
+#: ../data/glade/accounts_window.glade.h:42 ../src/roster_window.py:5228
 msgid "Re_name"
 msgstr "Byt _namn"
 
-#: ../data/glade/accounts_window.glade.h:46
+#: ../data/glade/accounts_window.glade.h:47
 msgid "Send _keep-alive packets"
 msgstr "Skicka _keep-alive-paket"
 
-#: ../data/glade/accounts_window.glade.h:48
+#: ../data/glade/accounts_window.glade.h:49
 msgid "Synchroni_ze account status with global status"
 msgstr "Synk_ronisera kontostatus med global status"
 
-#: ../data/glade/accounts_window.glade.h:50
+#: ../data/glade/accounts_window.glade.h:51
 msgid "Use G_PG Agent"
 msgstr "Använd G_PG-agent"
 
-#: ../data/glade/accounts_window.glade.h:51
+#: ../data/glade/accounts_window.glade.h:52
 msgid "Use cust_om hostname/port"
 msgstr "Använd anpassa_t värdnamn/port"
 
-#: ../data/glade/accounts_window.glade.h:52
+#: ../data/glade/accounts_window.glade.h:53
 msgid "Use cust_om port:"
 msgstr "Använd anpassad p_ort:"
 
-#: ../data/glade/accounts_window.glade.h:54
+#: ../data/glade/accounts_window.glade.h:55
 msgid "_Edit Personal Information..."
 msgstr "R_edigera personlig information..."
 
-#: ../data/glade/accounts_window.glade.h:55
+#: ../data/glade/accounts_window.glade.h:56
 msgid "_Enable"
 msgstr "_Aktivera"
 
-#: ../data/glade/accounts_window.glade.h:56
+#: ../data/glade/accounts_window.glade.h:57
 msgid "_Hostname: "
 msgstr "_Värdnamn: "
 
-#: ../data/glade/accounts_window.glade.h:58
+#: ../data/glade/accounts_window.glade.h:59
 msgid "_Manage..."
 msgstr "_Hantera..."
 
-#: ../data/glade/accounts_window.glade.h:60
+#: ../data/glade/accounts_window.glade.h:61
 msgid "_Port: "
 msgstr "_Port: "
 
-#: ../data/glade/accounts_window.glade.h:61
+#: ../data/glade/accounts_window.glade.h:62
 msgid "_Warn before using an insecure connection"
 msgstr "_Varna innan en osäker anslutning används"
 
-#: ../data/glade/accounts_window.glade.h:62
+#: ../data/glade/accounts_window.glade.h:63
 msgid "_use HTTP__PROXY environment variable"
 msgstr "_Använd miljövariabeln HTTP__PROXY"
 
-#: ../data/glade/accounts_window.glade.h:63
+#: ../data/glade/accounts_window.glade.h:64
 msgid "gtk-add"
 msgstr "Lägg till"
 
-#: ../data/glade/accounts_window.glade.h:64
+#: ../data/glade/accounts_window.glade.h:65
 #: ../data/glade/features_window.glade.h:4
 #: ../data/glade/manage_sounds_window.glade.h:1
 msgid "gtk-close"
 msgstr "Stäng"
 
-#: ../data/glade/accounts_window.glade.h:65
+#: ../data/glade/accounts_window.glade.h:66
 msgid "gtk-remove"
 msgstr "Ta bort"
 
@@ -794,7 +796,7 @@ msgid "All statuses"
 msgstr "Alla statusar"
 
 #: ../data/glade/advanced_notifications_window.glade.h:8
-#: ../src/common/commands.py:101 ../src/common/helpers.py:215
+#: ../src/common/commands.py:101 ../src/common/helpers.py:214
 msgid "Away"
 msgstr "Frånvarande"
 
@@ -811,7 +813,7 @@ msgid "Have "
 msgstr "Har "
 
 #: ../data/glade/advanced_notifications_window.glade.h:12
-#: ../src/common/helpers.py:225
+#: ../src/common/helpers.py:224
 msgid "Invisible"
 msgstr "Osynlig"
 
@@ -820,7 +822,7 @@ msgid "Launch a command"
 msgstr "Kör ett kommando"
 
 #: ../data/glade/advanced_notifications_window.glade.h:14
-#: ../src/common/helpers.py:198
+#: ../src/common/helpers.py:197
 msgid "Not Available"
 msgstr "Inte tillgänglig"
 
@@ -941,7 +943,7 @@ msgstr "Senast ändrad:"
 msgid "New entry received"
 msgstr ""
 
-#: ../data/glade/atom_entry_window.glade.h:5
+#: ../data/glade/atom_entry_window.glade.h:5 ../src/atom_window.py:114
 msgid "You have received new entry:"
 msgstr ""
 
@@ -985,11 +987,19 @@ msgstr "Ange nytt lösenord:"
 msgid "<b>Type your new status message</b>"
 msgstr "<b>Ange ditt nya statusmeddelande</b>"
 
-#: ../data/glade/change_status_message_dialog.glade.h:2
+#: ../data/glade/change_status_message_dialog.glade.h:2 ../src/tooltips.py:601
+msgid "Activity:"
+msgstr "Aktivitet:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:3 ../src/tooltips.py:586
+msgid "Mood:"
+msgstr "Humör:"
+
+#: ../data/glade/change_status_message_dialog.glade.h:4
 msgid "Preset messages:"
 msgstr "Förvalda meddelanden:"
 
-#: ../data/glade/change_status_message_dialog.glade.h:3
+#: ../data/glade/change_status_message_dialog.glade.h:5
 msgid "Save as Preset..."
 msgstr "Spara som förval..."
 
@@ -1049,11 +1059,11 @@ msgstr "_Lägg till i kontaktlista"
 
 #: ../data/glade/chat_control_popup_menu.glade.h:6
 #: ../data/glade/gc_control_popup_menu.glade.h:6
-#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/gc_occupants_menu.glade.h:8
 #: ../data/glade/roster_contact_context_menu.glade.h:17
 #: ../data/glade/roster_window.glade.h:21
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5841
+#: ../src/roster_window.py:5924
 msgid "_History"
 msgstr "_Historik"
 
@@ -1199,7 +1209,7 @@ msgstr ""
 "Kontaktrad\n"
 "Chattbanner"
 
-#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:749
+#: ../data/glade/gajim_themes_window.glade.h:6 ../src/chat_control.py:770
 msgid "Bold"
 msgstr "Fet"
 
@@ -1219,11 +1229,11 @@ msgstr "Gajims temaanpassare"
 msgid "Gone"
 msgstr "Borta"
 
-#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:152
+#: ../data/glade/gajim_themes_window.glade.h:11 ../src/common/pep.py:153
 msgid "Inactive"
 msgstr "Inaktiv"
 
-#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:750
+#: ../data/glade/gajim_themes_window.glade.h:12 ../src/chat_control.py:771
 msgid "Italic"
 msgstr "Kursiv"
 
@@ -1271,7 +1281,7 @@ msgstr "Byt _ämne..."
 msgid "Configure _Room..."
 msgstr "Konfigurera _rum..."
 
-#: ../data/glade/gc_control_popup_menu.glade.h:4
+#: ../data/glade/gc_control_popup_menu.glade.h:4 ../src/disco.py:1624
 msgid "_Bookmark"
 msgstr "_Bokmärk"
 
@@ -1303,23 +1313,37 @@ msgstr "_Admin"
 msgid "_Ban"
 msgstr "_Bannlys"
 
-#: ../data/glade/gc_occupants_menu.glade.h:8
+#: ../data/glade/gc_occupants_menu.glade.h:7
+#: ../data/glade/roster_contact_context_menu.glade.h:15
+#: ../src/roster_window.py:5256 ../src/roster_window.py:5733
+#: ../src/roster_window.py:5862
+msgid "_Block"
+msgstr "_Blockera"
+
+#: ../data/glade/gc_occupants_menu.glade.h:9
 msgid "_Kick"
 msgstr "Sparka _ut"
 
-#: ../data/glade/gc_occupants_menu.glade.h:9
+#: ../data/glade/gc_occupants_menu.glade.h:10
 msgid "_Member"
 msgstr "_Medlem"
 
-#: ../data/glade/gc_occupants_menu.glade.h:10
+#: ../data/glade/gc_occupants_menu.glade.h:11
 msgid "_Owner"
 msgstr "_Ägare"
 
-#: ../data/glade/gc_occupants_menu.glade.h:11
+#: ../data/glade/gc_occupants_menu.glade.h:12
 msgid "_Send Private Message"
 msgstr "_Skicka privat meddelande"
 
-#: ../data/glade/gc_occupants_menu.glade.h:12
+#: ../data/glade/gc_occupants_menu.glade.h:13
+#: ../data/glade/roster_contact_context_menu.glade.h:22
+#: ../src/roster_window.py:5250 ../src/roster_window.py:5727
+#: ../src/roster_window.py:5859
+msgid "_Unblock"
+msgstr "A_vblockera"
+
+#: ../data/glade/gc_occupants_menu.glade.h:14
 msgid "_Voice"
 msgstr "_Röst"
 
@@ -1327,13 +1351,13 @@ msgstr "_Röst"
 msgid "Create new post"
 msgstr "Skapa ny post"
 
-#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:240
+#: ../data/glade/groups_post_window.glade.h:2 ../src/common/helpers.py:239
 msgid "From"
 msgstr "Från"
 
 #. holds subject
-#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:170
-#: ../src/history_manager.py:201
+#: ../data/glade/groups_post_window.glade.h:3 ../src/history_manager.py:195
+#: ../src/history_manager.py:226
 msgid "Subject"
 msgstr "Ämne"
 
@@ -1355,7 +1379,8 @@ msgstr ""
 msgid "<big><b>Welcome to Gajim History Logs Manager</b></big>"
 msgstr "<big><b>Välkommen till Gajims hanterare för historikloggar</b></big>"
 
-#: ../data/glade/history_manager.glade.h:4
+#: ../data/glade/history_manager.glade.h:4 ../src/dialogs.py:2808
+#: ../src/dialogs.py:2908
 msgid "Delete"
 msgstr "Ta bort"
 
@@ -1408,7 +1433,7 @@ msgstr "Sök:"
 msgid "_Log conversation history"
 msgstr "_Logga konversationshistorik"
 
-#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1697
+#: ../data/glade/join_groupchat_window.glade.h:1 ../src/dialogs.py:1932
 msgid "Join Group Chat"
 msgstr "Gå in i gruppchatt"
 
@@ -1435,8 +1460,8 @@ msgstr "Senaste:"
 msgid "Room:"
 msgstr "Rum:"
 
-#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1199
-#: ../src/disco.py:1619
+#: ../data/glade/join_groupchat_window.glade.h:7 ../src/disco.py:1201
+#: ../src/disco.py:1628
 msgid "_Join"
 msgstr "_Gå in i"
 
@@ -1464,7 +1489,7 @@ msgstr "Minimera när du gått in automatiskt"
 msgid "Print status:"
 msgstr "Skriv ut status:"
 
-#: ../data/glade/manage_bookmarks_window.glade.h:9
+#: ../data/glade/manage_bookmarks_window.glade.h:9 ../src/config.py:1561
 msgid "Server:"
 msgstr "Server:"
 
@@ -1493,10 +1518,6 @@ msgid "<b>Settings</b>"
 msgstr "<b>Inställningar</b>"
 
 #: ../data/glade/manage_proxies_window.glade.h:3
-msgid "B_OSH Port:"
-msgstr "B_OSH-port:"
-
-#: ../data/glade/manage_proxies_window.glade.h:4
 msgid ""
 "HTTP Connect\n"
 "SOCKS5\n"
@@ -1506,38 +1527,42 @@ msgstr ""
 "SOCKS5\n"
 "BOSH"
 
-#: ../data/glade/manage_proxies_window.glade.h:7
+#: ../data/glade/manage_proxies_window.glade.h:6
 msgid "Manage Proxy Profiles"
 msgstr "Hantera proxyprofiler"
 
-#: ../data/glade/manage_proxies_window.glade.h:8
+#: ../data/glade/manage_proxies_window.glade.h:7
 msgid "Pass_word:"
 msgstr "Lösen_ord:"
 
-#: ../data/glade/manage_proxies_window.glade.h:9
+#: ../data/glade/manage_proxies_window.glade.h:8
 msgid "Proxy _Host:"
 msgstr "Proxyser_ver:"
 
-#: ../data/glade/manage_proxies_window.glade.h:10
+#: ../data/glade/manage_proxies_window.glade.h:9
 msgid "Proxy _Port:"
 msgstr "Proxyserverns _port:"
 
-#: ../data/glade/manage_proxies_window.glade.h:11
+#: ../data/glade/manage_proxies_window.glade.h:10
 msgid "Use HTTP prox_y"
 msgstr "Använd HTTP-prox_y"
 
-#: ../data/glade/manage_proxies_window.glade.h:12
+#: ../data/glade/manage_proxies_window.glade.h:11
 msgid "Use proxy auth_entication"
 msgstr "Använd autentiser_ing för proxyserver"
 
-#: ../data/glade/manage_proxies_window.glade.h:13
+#: ../data/glade/manage_proxies_window.glade.h:12
 msgid "_BOSH URL:"
 msgstr "_BOSH URL:"
 
-#: ../data/glade/manage_proxies_window.glade.h:15
+#: ../data/glade/manage_proxies_window.glade.h:14
 msgid "_Type:"
 msgstr "_Typ:"
 
+#: ../data/glade/manage_proxies_window.glade.h:15
+msgid "_Username:"
+msgstr "_Användarnamn:"
+
 #: ../data/glade/message_window.glade.h:1
 msgid "Add this contact to roster (Ctrl+D)"
 msgstr "Lägg till denna kontakt till kontaktlistan (Ctrl+D)"
@@ -1585,7 +1610,7 @@ msgstr "Visa kontaktens profil (Ctrl+I)"
 #. Make sure the character after "_" is not M/m (conflicts with Alt+M that is supposed to show the Emoticon Selector)
 #: ../data/glade/message_window.glade.h:13
 #: ../data/glade/xml_console_window.glade.h:11
-#: ../src/filetransfers_window.py:261
+#: ../src/filetransfers_window.py:260
 msgid "_Send"
 msgstr "_Skicka"
 
@@ -1998,7 +2023,7 @@ msgstr ""
 msgid "Sort contacts by status"
 msgstr "Sortera kontakter efter status"
 
-#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:387
+#: ../data/glade/preferences_window.glade.h:89 ../src/config.py:388
 msgid "Status"
 msgstr "Status"
 
@@ -2174,7 +2199,7 @@ msgstr "JabberID"
 msgid "Order:"
 msgstr "Ordning:"
 
-#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:2571
+#: ../data/glade/privacy_list_window.glade.h:11 ../src/dialogs.py:3035
 msgid "Privacy List"
 msgstr "Integritetslista"
 
@@ -2318,7 +2343,7 @@ msgid "<b>Prefix:</b>"
 msgstr "<b>Titel:</b>"
 
 #: ../data/glade/profile_window.glade.h:25
-#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:328
+#: ../data/glade/vcard_information_window.glade.h:30 ../src/vcard.py:327
 msgid "<b>Role:</b>"
 msgstr "<b>Roll:</b>"
 
@@ -2378,8 +2403,8 @@ msgstr "Ta bort kontot från Gajim och från _servern"
 
 #. Remove group
 #. Remove
-#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5182
-#: ../src/roster_window.py:5660 ../src/roster_window.py:5789
+#: ../data/glade/remove_account_window.glade.h:4 ../src/roster_window.py:5265
+#: ../src/roster_window.py:5743 ../src/roster_window.py:5872
 msgid "_Remove"
 msgstr "Ta _bort"
 
@@ -2401,14 +2426,14 @@ msgstr "Redigera _grupper..."
 
 #. Execute Command
 #: ../data/glade/roster_contact_context_menu.glade.h:5
-#: ../src/roster_window.py:5732
+#: ../src/roster_window.py:5815
 msgid "Execute Command..."
 msgstr "Kör kommando..."
 
 #. Invite to
 #. Invite to Groupchat
 #: ../data/glade/roster_contact_context_menu.glade.h:6
-#: ../src/roster_window.py:5100 ../src/roster_window.py:5613
+#: ../src/roster_window.py:5183 ../src/roster_window.py:5696
 msgid "In_vite to"
 msgstr "Bjud _in till"
 
@@ -2418,7 +2443,7 @@ msgstr "Ta _bort"
 
 #. Send Custom Status
 #: ../data/glade/roster_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5110 ../src/roster_window.py:5698
+#: ../src/roster_window.py:5193 ../src/roster_window.py:5781
 msgid "Send Cus_tom Status"
 msgstr "Skicka a_npassad status"
 
@@ -2443,12 +2468,6 @@ msgstr "Starta _chatt"
 msgid "_Allow him/her to see my status"
 msgstr "_Tillåt henne/honom att se min status"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:15
-#: ../src/roster_window.py:5173 ../src/roster_window.py:5650
-#: ../src/roster_window.py:5779
-msgid "_Block"
-msgstr "_Blockera"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:16
 msgid "_Forbid him/her to see my status"
 msgstr "_Förbjud henne/honom att se min status"
@@ -2470,16 +2489,34 @@ msgstr "Byt _namn..."
 msgid "_Subscription"
 msgstr "_Prenumeration"
 
-#: ../data/glade/roster_contact_context_menu.glade.h:22
-#: ../src/roster_window.py:5167 ../src/roster_window.py:5644
-#: ../src/roster_window.py:5776
-msgid "_Unblock"
-msgstr "A_vblockera"
-
 #: ../data/glade/roster_contact_context_menu.glade.h:23
 msgid "_Unignore"
 msgstr "A_vignorera"
 
+#: ../data/glade/roster_item_exchange_window.glade.h:1
+msgid ""
+"<b>someone@somewhere.com</b> would like you to <b>add</b> some contacts in "
+"your roster."
+msgstr ""
+
+#: ../data/glade/roster_item_exchange_window.glade.h:2
+msgid "Message Body <currently unused, so it's hidden by default>"
+msgstr ""
+
+#: ../data/glade/roster_item_exchange_window.glade.h:3
+msgid "Roster Item Exchange"
+msgstr ""
+
+#: ../data/glade/roster_item_exchange_window.glade.h:4
+#, fuzzy
+msgid "gtk-cancel"
+msgstr "Stäng"
+
+#: ../data/glade/roster_item_exchange_window.glade.h:5
+#, fuzzy
+msgid "gtk-ok"
+msgstr "Stäng"
+
 #: ../data/glade/roster_window.glade.h:1
 msgid "Add _Contact..."
 msgstr "Lägg till _kontakt..."
@@ -2517,7 +2554,8 @@ msgid "Show _Offline Contacts"
 msgstr "Visa frånkopplade _kontakter"
 
 #: ../data/glade/roster_window.glade.h:12
-msgid "Show _roster"
+#: ../data/glade/systray_context_menu.glade.h:4
+msgid "Show _Roster"
 msgstr "Visa _kontaktlista"
 
 #: ../data/glade/roster_window.glade.h:13
@@ -2534,7 +2572,7 @@ msgstr "_Åtgärder"
 msgid "_Contents"
 msgstr "_Innehåll"
 
-#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1353
+#: ../data/glade/roster_window.glade.h:18 ../src/disco.py:1357
 msgid "_Edit"
 msgstr "R_edigera"
 
@@ -2575,11 +2613,11 @@ msgid "_Add contact"
 msgstr "_Lägg till kontakt"
 
 #. Information
-#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5801
+#: ../data/glade/search_window.glade.h:4 ../src/roster_window.py:5884
 msgid "_Information"
 msgstr "_Information"
 
-#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1211
+#: ../data/glade/search_window.glade.h:5 ../src/disco.py:1213
 msgid "_Search"
 msgstr "_Sök"
 
@@ -2667,11 +2705,6 @@ msgstr "Prenumerationsbegäran"
 msgid "_Deny"
 msgstr "_Neka"
 
-#: ../data/glade/synchronise_contacts_dialog.glade.h:1
-#, fuzzy
-msgid "Select the account with which to synchronise"
-msgstr "Välj kontot med vilket du vill synkronisera"
-
 #: ../data/glade/synchronise_select_account_dialog.glade.h:1
 msgid "Select the account with which you want to synchronise"
 msgstr "Välj kontot med vilket du vill synkronisera"
@@ -2696,10 +2729,6 @@ msgstr "Skicka ett _meddelande"
 msgid "Show All Pending _Events"
 msgstr "Visa alla väntande _händelser"
 
-#: ../data/glade/systray_context_menu.glade.h:4
-msgid "Show _Roster"
-msgstr "Visa _kontaktlista"
-
 #: ../data/glade/systray_context_menu.glade.h:5
 msgid "Sta_tus"
 msgstr "Sta_tus"
@@ -2809,13 +2838,13 @@ msgstr "Tilldela Open_PGP-nyckel"
 
 #. Edit Groups
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:3
-#: ../src/roster_window.py:5633
+#: ../src/roster_window.py:5716
 msgid "Edit _Groups"
 msgstr "Redigera _grupper"
 
 #. Rename
 #: ../data/glade/zeroconf_contact_context_menu.glade.h:8
-#: ../src/roster_window.py:5759
+#: ../src/roster_window.py:5842
 msgid "_Rename"
 msgstr "Byt _namn"
 
@@ -2839,25 +2868,25 @@ msgstr "Resurs:"
 msgid "Status:"
 msgstr "Status:"
 
-#: ../src/adhoc_commands.py:264
+#: ../src/adhoc_commands.py:268
 msgid "Cancel confirmation"
 msgstr "Avbryt bekräftelse"
 
-#: ../src/adhoc_commands.py:265
+#: ../src/adhoc_commands.py:269
 msgid ""
 "You are in process of executing command. Do you really want to cancel it?"
 msgstr "Du håller på att köra ett kommando. Vill du verkligen avbryta det?"
 
-#: ../src/adhoc_commands.py:304
-msgid "Service changed the session identifier."
+#: ../src/adhoc_commands.py:301 ../src/adhoc_commands.py:324
+msgid "Service sent malformed data"
 msgstr ""
 
-#: ../src/adhoc_commands.py:317
-msgid "Service sent malformed data"
+#: ../src/adhoc_commands.py:310
+msgid "Service changed the session identifier."
 msgstr ""
 
 #. when stanza doesn't have error description
-#: ../src/adhoc_commands.py:398
+#: ../src/adhoc_commands.py:405
 msgid "Service returned an error."
 msgstr "Tjänsten returnerade ett fel."
 
@@ -2882,7 +2911,7 @@ msgstr "Heltal"
 msgid "Text"
 msgstr "Text"
 
-#: ../src/advanced.py:102 ../src/chat_control.py:769
+#: ../src/advanced.py:102 ../src/chat_control.py:790
 msgid "Color"
 msgstr "Färg"
 
@@ -2907,171 +2936,196 @@ msgstr "(Ingen)"
 msgid "Hidden"
 msgstr "Dold"
 
+#: ../src/atom_window.py:110
+#, python-format
+msgid "You have received new entries (and %(count)d not displayed):"
+msgstr ""
+
 #. the next script, executed in the "po" directory,
 #. generates the following list.
 #. #!/bin/sh
 #. LANG=$(for i in *.po; do j=${i/.po/}; echo -n "_('"$j"')":" '"$j"', " ; done)
 #. echo "{_('en'):'en'",$LANG"}"
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "English"
 msgstr "engelska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Belarusian"
 msgstr "vitryska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Bulgarian"
 msgstr "bulgariska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Breton"
 msgstr "bretonska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Czech"
 msgstr "tjeckiska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "German"
 msgstr "tyska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Greek"
 msgstr "grekiska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "British"
 msgstr "brittiska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Esperanto"
 msgstr "esperanto"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Spanish"
 msgstr "spanska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Basque"
 msgstr "baskiska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "French"
 msgstr "franska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Croatian"
 msgstr "kroatiska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Italian"
 msgstr "italienska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Norwegian (b)"
 msgstr "norska (bokmål)"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Dutch"
 msgstr "nederländska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Norwegian"
 msgstr "norska (nynorsk)"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Polish"
 msgstr "polska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Portuguese"
 msgstr "portugisiska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Brazilian Portuguese"
 msgstr "brasiliansk portugisiska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Russian"
 msgstr "ryska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Serbian"
 msgstr "serbiska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Slovak"
 msgstr "slovakiska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Swedish"
 msgstr "svenska"
 
-#: ../src/chat_control.py:67
+#: ../src/chat_control.py:65
 msgid "Chinese (Ch)"
 msgstr "kinesiska"
 
-#: ../src/chat_control.py:345
+#: ../src/chat_control.py:361
 msgid "Spelling language"
 msgstr "Stavningsspråk"
 
 #. we are not connected
-#: ../src/chat_control.py:368 ../src/chat_control.py:556
+#: ../src/chat_control.py:389 ../src/chat_control.py:577
 msgid "A connection is not available"
 msgstr "En anslutning är inte tillgänglig"
 
-#: ../src/chat_control.py:369 ../src/chat_control.py:557
+#: ../src/chat_control.py:390 ../src/chat_control.py:578
 msgid "Your message can not be sent until you are connected."
 msgstr "Ditt meddelande kan inte skickas förrän du är ansluten."
 
-#: ../src/chat_control.py:751
+#: ../src/chat_control.py:772
 msgid "Underline"
 msgstr "Understruken"
 
-#: ../src/chat_control.py:752
+#: ../src/chat_control.py:773
 msgid "Strike"
 msgstr "Genomstruken"
 
-#: ../src/chat_control.py:775
+#: ../src/chat_control.py:796
 msgid "Font"
 msgstr "Typsnitt"
 
-#: ../src/chat_control.py:784
+#: ../src/chat_control.py:805
 msgid "Clear formating"
 msgstr "Ingen formatering"
 
-#: ../src/chat_control.py:1220 ../src/chat_control.py:1623
+#: ../src/chat_control.py:877
+msgid "Really send file?"
+msgstr "Verkligen skicka filen?"
+
+#: ../src/chat_control.py:878
+#, python-format
+msgid "If you send a file to %s, he/she will know your real Jabber ID."
+msgstr ""
+"Om du skickar en fil till %s så kommer han/hon att få veta ditt riktiga "
+"Jabber-ID."
+
+#: ../src/chat_control.py:1268 ../src/chat_control.py:1656
 msgid "GPG encryption enabled"
 msgstr "GPG-kryptering aktiverad"
 
 #. Add to roster
 #. add_to_roster_menuitem
-#: ../src/chat_control.py:1250 ../src/chat_control.py:2125
-#: ../src/common/contacts.py:113 ../src/common/helpers.py:56
-#: ../src/common/helpers.py:227 ../src/conversation_textview.py:858
-#: ../src/dialogs.py:900 ../src/dialogs.py:1648 ../src/gajim.py:999
-#: ../src/gajim.py:1731 ../src/normal_control.py:483
-#: ../src/roster_window.py:910 ../src/roster_window.py:1541
-#: ../src/roster_window.py:1543 ../src/roster_window.py:1894
-#: ../src/roster_window.py:3083 ../src/roster_window.py:3109
-#: ../src/roster_window.py:5294 ../src/roster_window.py:5479
+#: ../src/chat_control.py:1297 ../src/chat_control.py:2156
+#: ../src/common/contacts.py:113 ../src/common/helpers.py:55
+#: ../src/common/helpers.py:226 ../src/conversation_textview.py:882
+#: ../src/dialogs.py:1009 ../src/dialogs.py:1858 ../src/dialogs.py:1883
+#: ../src/gajim.py:981 ../src/gajim.py:1719 ../src/roster_window.py:933
+#: ../src/roster_window.py:1565 ../src/roster_window.py:1567
+#: ../src/roster_window.py:1918 ../src/roster_window.py:3156
+#: ../src/roster_window.py:3182 ../src/roster_window.py:5377
+#: ../src/roster_window.py:5562
 msgid "Not in Roster"
 msgstr "Inte i kontaktlista"
 
-#: ../src/chat_control.py:1382 ../src/tooltips.py:627
+#: ../src/chat_control.py:1310
+#, fuzzy
+msgid "This contact does not support file transfer."
+msgstr "En lista över aktiva, färdigställda och stoppade filöverföringar"
+
+#: ../src/chat_control.py:1313
+msgid "You need to know the real JID of the contact to send him or her a file."
+msgstr ""
+
+#: ../src/chat_control.py:1420 ../src/tooltips.py:626
 msgid "Unknown Artist"
 msgstr "Okänd artist"
 
-#: ../src/chat_control.py:1384 ../src/tooltips.py:632
+#: ../src/chat_control.py:1422 ../src/tooltips.py:631
 msgid "Unknown Title"
 msgstr "Okänd titel"
 
-#: ../src/chat_control.py:1386 ../src/tooltips.py:637
+#: ../src/chat_control.py:1424 ../src/tooltips.py:636
 msgid "Unknown Source"
 msgstr "Okänd källa"
 
-#: ../src/chat_control.py:1390 ../src/tooltips.py:639
+#: ../src/chat_control.py:1427 ../src/tooltips.py:638
 #, python-format
 msgid ""
 "<b>\"%(title)s\"</b> by <i>%(artist)s</i>\n"
@@ -3080,26 +3134,17 @@ msgstr ""
 "<b>\"%(title)s\"</b> av <i>%(artist)s</i>\n"
 "från <i>%(source)s</i>"
 
-#: ../src/chat_control.py:1395
-#, python-format
-msgid ""
-"%(title)s by %(artist)s\n"
-"from %(source)s"
-msgstr ""
-"%(title)s av %(artist)s\n"
-"från %(source)s"
-
-#: ../src/chat_control.py:1518
+#: ../src/chat_control.py:1551
 #, python-format
 msgid "%(nickname)s from group chat %(room_name)s"
 msgstr "%(nickname)s från gruppchatten %(room_name)s"
 
 #. No key assigned nor a key is used by remote contact
-#: ../src/chat_control.py:1603 ../src/dialogs.py:3912
+#: ../src/chat_control.py:1636 ../src/dialogs.py:4380
 msgid "No GPG key assigned"
 msgstr "Ingen GPG-nyckel tilldelad"
 
-#: ../src/chat_control.py:1604
+#: ../src/chat_control.py:1637
 msgid ""
 "No GPG key is assigned to this contact. So you cannot encrypt messages with "
 "GPG."
@@ -3107,50 +3152,50 @@ msgstr ""
 "Ingen GPG-nyckel har tilldelats denna kontakt. Därför kan du inte kryptera "
 "meddelanden med GPG."
 
-#: ../src/chat_control.py:1613
+#: ../src/chat_control.py:1646
 msgid "GPG encryption disabled"
 msgstr "GPG-kryptering inaktiverad"
 
-#: ../src/chat_control.py:1639
+#: ../src/chat_control.py:1672
 msgid "Session WILL be logged"
 msgstr "Sessionen KOMMER att loggas"
 
-#: ../src/chat_control.py:1641
+#: ../src/chat_control.py:1674
 msgid "Session WILL NOT be logged"
 msgstr "Sessionen KOMMER INTE att loggas"
 
 #. encryption %s active
-#: ../src/chat_control.py:1655
+#: ../src/chat_control.py:1688
 msgid "is"
 msgstr "är"
 
-#: ../src/chat_control.py:1655
+#: ../src/chat_control.py:1688
 msgid "is NOT"
 msgstr "är INTE"
 
 #. chat session %s be logged
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1690
 msgid "will"
 msgstr "kommer"
 
-#: ../src/chat_control.py:1657
+#: ../src/chat_control.py:1690
 msgid "will NOT"
 msgstr "kommer INTE"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1661
+#: ../src/chat_control.py:1694
 msgid "and authenticated"
 msgstr "och autentiserad"
 
 #. About encrypted chat session
-#: ../src/chat_control.py:1665
+#: ../src/chat_control.py:1698
 msgid "and NOT authenticated"
 msgstr "och INTE autentiserad"
 
 #. status will become 'is' or 'is not', authentificaed will become
 #. 'and authentificated' or 'and not authentificated', logged will become
 #. 'will' or 'will not'
-#: ../src/chat_control.py:1671
+#: ../src/chat_control.py:1704
 #, python-format
 msgid ""
 "%(type)s encryption %(status)s active %(authenticated)s.\n"
@@ -3159,26 +3204,26 @@ msgstr ""
 "%(type)s-kryptering %(status)s aktiv %(authenticated)s.\n"
 "Din chattsession %(logged)s att loggas."
 
-#: ../src/chat_control.py:1719
+#: ../src/chat_control.py:1752
 msgid "Command not supported for zeroconf account."
 msgstr "Kommandot stöds inte för zeroconf-konto."
 
-#: ../src/chat_control.py:1730 ../src/groupchat_control.py:1657
+#: ../src/chat_control.py:1763 ../src/groupchat_control.py:1725
 #, python-format
 msgid "Commands: %s"
 msgstr "Kommandon: %s"
 
-#: ../src/chat_control.py:1733 ../src/groupchat_control.py:1671
+#: ../src/chat_control.py:1766 ../src/groupchat_control.py:1738
 #, python-format
 msgid "Usage: /%s, clears the text window."
 msgstr "Användning: /%s, tömmer textfönstret."
 
-#: ../src/chat_control.py:1736 ../src/groupchat_control.py:1676
+#: ../src/chat_control.py:1769 ../src/groupchat_control.py:1743
 #, python-format
 msgid "Usage: /%s, hide the chat buttons."
 msgstr "Användning: /%s, döljer chattknapparna."
 
-#: ../src/chat_control.py:1739 ../src/groupchat_control.py:1692
+#: ../src/chat_control.py:1772 ../src/groupchat_control.py:1758
 #, python-format
 msgid ""
 "Usage: /%(command)s <action>, sends action to the current group chat. Use "
@@ -3187,38 +3232,38 @@ msgstr ""
 "Användning: /%(command)s <åtgärd>, skickar åtgärd till aktuell gruppchatt. "
 "Använd tredje person. (t.ex. /%(command)s exploderar.)"
 
-#: ../src/chat_control.py:1744
+#: ../src/chat_control.py:1777
 #, python-format
 msgid "Usage: /%s, sends a ping to the contact"
 msgstr "Användning: /%s, skickar en ping till kontakten"
 
-#: ../src/chat_control.py:1747
+#: ../src/chat_control.py:1780
 #, python-format
 msgid "Usage: /%s, send the message to the contact"
 msgstr "Användning: /%s, skickar meddelandet till kontakten"
 
-#: ../src/chat_control.py:1750 ../src/groupchat_control.py:1715
+#: ../src/chat_control.py:1783 ../src/groupchat_control.py:1787
 #, python-format
 msgid "No help info for /%s"
 msgstr "Ingen hjälp för /%s"
 
-#: ../src/chat_control.py:1883
+#: ../src/chat_control.py:1914
 msgid "Session negotiation cancelled"
 msgstr "Sessionsförhandlingen avbröts"
 
-#: ../src/chat_control.py:1890
+#: ../src/chat_control.py:1921
 msgid "This session is encrypted"
 msgstr "Denna session är krypterad"
 
-#: ../src/chat_control.py:1893
+#: ../src/chat_control.py:1924
 msgid " and WILL be logged"
 msgstr " och KOMMER att loggas"
 
-#: ../src/chat_control.py:1895
+#: ../src/chat_control.py:1926
 msgid " and WILL NOT be logged"
 msgstr " och KOMMER INTE att loggas"
 
-#: ../src/chat_control.py:1900
+#: ../src/chat_control.py:1931
 msgid ""
 "Remote contact's identity not verified. Click the shield button for more "
 "details."
@@ -3226,25 +3271,25 @@ msgstr ""
 "Fjärrkontaktens identitet har inte verifierats. Klicka på sköldknappen för "
 "mer information."
 
-#: ../src/chat_control.py:1902
+#: ../src/chat_control.py:1933
 msgid "E2E encryption disabled"
 msgstr "E2E-kryptering inaktiverad"
 
-#: ../src/chat_control.py:1936 ../src/chat_control.py:1949
+#: ../src/chat_control.py:1967 ../src/chat_control.py:1980
 msgid "The following message was NOT encrypted"
 msgstr "Följande meddelande var INTE krypterat"
 
-#: ../src/chat_control.py:1942
+#: ../src/chat_control.py:1973
 msgid "The following message was encrypted"
 msgstr "Följande meddelande var krypterat"
 
 #. %s is being replaced in the code with JID
-#: ../src/chat_control.py:2313
+#: ../src/chat_control.py:2354
 #, python-format
 msgid "You just received a new message from \"%s\""
 msgstr "Du tog just emot ett meddelande från \"%s\""
 
-#: ../src/chat_control.py:2314
+#: ../src/chat_control.py:2355
 msgid ""
 "If you close this tab and you have history disabled, this message will be "
 "lost."
@@ -3252,15 +3297,15 @@ msgstr ""
 "Om du stänger den här fliken och har historik inaktiverad så kommer "
 "meddelandet att förloras."
 
-#: ../src/chat_control.py:2462 ../src/common/connection_handlers.py:1961
-#: ../src/common/connection_handlers.py:2007
-#: ../src/common/connection_handlers.py:2195
-#: ../src/common/connection_handlers.py:2328 ../src/common/connection.py:1344
-#: ../src/gajim.py:177
+#: ../src/chat_control.py:2510 ../src/common/connection_handlers.py:2072
+#: ../src/common/connection_handlers.py:2118
+#: ../src/common/connection_handlers.py:2313
+#: ../src/common/connection_handlers.py:2451 ../src/common/connection.py:1371
+#: ../src/gajim.py:154 ../src/session.py:125
 msgid "Database Error"
 msgstr "Databasfel"
 
-#: ../src/chat_control.py:2463
+#: ../src/chat_control.py:2511
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it or remove it (all "
@@ -3269,7 +3314,7 @@ msgstr ""
 "Databasfilen (%s) kan inte läsas. Försök att reparera den eller ta bort den "
 "(all historik kommer att förloras)."
 
-#: ../src/chat_control.py:2699
+#: ../src/chat_control.py:2741
 #, python-format
 msgid "%(name)s is now %(status)s"
 msgstr "%(name)s är nu %(status)s"
@@ -3278,23 +3323,23 @@ msgstr "%(name)s är nu %(status)s"
 msgid "creating logs database"
 msgstr "skapar loggdatabas"
 
-#: ../src/common/check_paths.py:111 ../src/common/check_paths.py:122
-#: ../src/common/check_paths.py:129
+#: ../src/common/check_paths.py:127 ../src/common/check_paths.py:138
+#: ../src/common/check_paths.py:145
 #, python-format
 msgid "%s is a file but it should be a directory"
 msgstr "%s är en fil men den borde vara en katalog"
 
-#: ../src/common/check_paths.py:112 ../src/common/check_paths.py:123
-#: ../src/common/check_paths.py:130 ../src/common/check_paths.py:138
+#: ../src/common/check_paths.py:128 ../src/common/check_paths.py:139
+#: ../src/common/check_paths.py:146 ../src/common/check_paths.py:154
 msgid "Gajim will now exit"
 msgstr "Gajim kommer nu att avslutas"
 
-#: ../src/common/check_paths.py:137
+#: ../src/common/check_paths.py:153
 #, python-format
 msgid "%s is a directory but should be a file"
 msgstr "%s är en katalog men den borde vara en fil"
 
-#: ../src/common/check_paths.py:153
+#: ../src/common/check_paths.py:169
 #, python-format
 msgid "creating %s directory"
 msgstr "skapar katalogen %s"
@@ -3358,9 +3403,9 @@ msgstr "Välj de gruppchattar som du vill lämna"
 
 #. Make special context menu if group is Groupchats
 #: ../src/common/commands.py:205 ../src/common/contacts.py:94
-#: ../src/common/helpers.py:56 ../src/roster_window.py:784
-#: ../src/roster_window.py:1545 ../src/roster_window.py:1547
-#: ../src/roster_window.py:5070
+#: ../src/common/helpers.py:55 ../src/roster_window.py:807
+#: ../src/roster_window.py:1569 ../src/roster_window.py:1571
+#: ../src/roster_window.py:5153
 msgid "Groupchats"
 msgstr "Gruppchattar"
 
@@ -3376,68 +3421,68 @@ msgstr "Vidarebefordra olästa meddelanden"
 msgid "All unread messages have been forwarded."
 msgstr "Alla olästa meddelanden har vidarebefordrats."
 
-#: ../src/common/config.py:82
+#: ../src/common/config.py:76
 msgid "Play sound when user is busy"
 msgstr "Spela upp ljud när användaren är upptagen"
 
-#: ../src/common/config.py:83
+#: ../src/common/config.py:77
 msgid "Use D-Bus and Notification-Daemon to show notifications"
 msgstr "Använd D-Bus och Notification-Daemon för att visa meddelanden"
 
-#: ../src/common/config.py:85
+#: ../src/common/config.py:79
 msgid "Show only online and free for chat contacts in roster."
 msgstr ""
 "Visa endast kontakter som är anslutna och lediga för chatt i kontaktlistan."
 
-#: ../src/common/config.py:88
+#: ../src/common/config.py:82
 msgid "Time in minutes, after which your status changes to away."
 msgstr "Tid i minuter efter vilken din status ändras till frånvarande."
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:83
 msgid "$S (Away as a result of being idle more than $T min)"
 msgstr "$S (Frånvarande på grund av overksam i mer än $T min)"
 
-#: ../src/common/config.py:89
+#: ../src/common/config.py:83
 msgid "$S will be replaced by current status message, $T by autoaway time."
 msgstr ""
 
-#: ../src/common/config.py:91
+#: ../src/common/config.py:85
 msgid "Time in minutes, after which your status changes to not available."
 msgstr "Tid i minuter efter vilken din status ändras till inte tillgänglig."
 
-#: ../src/common/config.py:92
+#: ../src/common/config.py:86
 msgid "$S (Not available as a result of being idle more than $T min)"
 msgstr "$S (Inte tillgänglig på grund av overksam i mer än $T min)"
 
-#: ../src/common/config.py:92
+#: ../src/common/config.py:86
 msgid "$S will be replaced by current status message, $T by autoxa time."
 msgstr ""
 
-#: ../src/common/config.py:102
+#: ../src/common/config.py:89
 msgid "When to show systray icon. Can be 'never', 'on_event', 'always'."
 msgstr ""
 
-#: ../src/common/config.py:112
+#: ../src/common/config.py:99
 msgid ""
 "List (space separated) of rows (accounts and groups) that are collapsed."
 msgstr ""
 
 #. sorted alphanum
-#: ../src/common/config.py:113 ../src/common/config.py:464
-#: ../src/common/optparser.py:221 ../src/common/optparser.py:439
-#: ../src/common/optparser.py:473 ../src/gajim.py:3263
+#: ../src/common/config.py:100 ../src/common/config.py:469
+#: ../src/common/optparser.py:230 ../src/common/optparser.py:448
+#: ../src/common/optparser.py:482 ../src/gajim.py:3300
 msgid "default"
 msgstr "standard"
 
-#: ../src/common/config.py:117
+#: ../src/common/config.py:104
 msgid "Enable link-local/zeroconf messaging"
 msgstr "Aktivera link-local-/zeroconf-meddelanden"
 
-#: ../src/common/config.py:120
+#: ../src/common/config.py:107
 msgid "Language used by speller"
 msgstr "Språk som används för stavningskontroll"
 
-#: ../src/common/config.py:121
+#: ../src/common/config.py:108
 msgid ""
 "'always' - print time for every message.\n"
 "'sometimes' - print time every print_ichat_every_foo_minutes minute.\n"
@@ -3447,32 +3492,32 @@ msgstr ""
 "\"ibland\" - skriv ut tid var print_ichat_every_foo_minutes minut.\n"
 "\"aldrig\" - skriv aldrig ut tid."
 
-#: ../src/common/config.py:122
+#: ../src/common/config.py:109
 msgid ""
 "Print time in chats using Fuzzy Clock. Value of fuzziness from 1 to 4, or 0 "
 "to disable fuzzyclock. 1 is the most precise clock, 4 the least precise one. "
 "This is used only if print_time is 'sometimes'."
 msgstr ""
 
-#: ../src/common/config.py:125
+#: ../src/common/config.py:112
 msgid "Treat * / _ pairs as possible formatting characters."
 msgstr "Behandla par av * / _ som möjliga formateringstecken."
 
-#: ../src/common/config.py:126
+#: ../src/common/config.py:113
 msgid ""
 "If True, do not remove */_ . So *abc* will be bold but with * * not removed."
 msgstr ""
 "Om sant så tas inte */_ bort. Så *abc* blir i fet stil men * * / / _ _ tas "
 "inte bort."
 
-#: ../src/common/config.py:129
+#: ../src/common/config.py:116
 msgid ""
 "Uses ReStructured text markup to send HTML, plus ascii formatting if "
 "selected. For syntax, see http://docutils.sourceforge.net/docs/ref/rst/"
 "restructuredtext.html (If you want to use this, install docutils)"
 msgstr ""
 
-#: ../src/common/config.py:138
+#: ../src/common/config.py:125
 msgid ""
 "Character to add after nickname when using nick completion (tab) in group "
 "chat."
@@ -3480,7 +3525,7 @@ msgstr ""
 "Tecken att lägga till efter smeknamnet när smeknamnskomplettering används "
 "(tabb) i gruppchatt."
 
-#: ../src/common/config.py:139
+#: ../src/common/config.py:126
 msgid ""
 "Character to propose to add after desired nickname when desired nickname is "
 "used by someone else in group chat."
@@ -3488,7 +3533,7 @@ msgstr ""
 "Tecken att föreslå för att läggas till efter önskat smeknamn när önskat "
 "smeknamn används av någon annan i gruppchatten."
 
-#: ../src/common/config.py:167
+#: ../src/common/config.py:154
 msgid ""
 "This option let you customize timestamp that is printed in conversation. For "
 "exemple \"[%H:%M] \" will show \"[hour:minute] \". See python doc on "
@@ -3499,19 +3544,19 @@ msgstr ""
 "\". Läs python-manualen för strftime för fullständig dokumentation: http://"
 "docs.python.org/lib/module-time.html"
 
-#: ../src/common/config.py:168
+#: ../src/common/config.py:155
 msgid "Characters that are printed before the nickname in conversations"
 msgstr "Tecken som skrivs ut före smeknamnet i konversationer"
 
-#: ../src/common/config.py:169
+#: ../src/common/config.py:156
 msgid "Characters that are printed after the nickname in conversations"
 msgstr "Tecken som skrivs ut efter smeknamnet i konversationer"
 
-#: ../src/common/config.py:173
+#: ../src/common/config.py:160
 msgid "Add * and [n] in roster title?"
 msgstr "Lägg till * och [n] i kontaktlistans titel?"
 
-#: ../src/common/config.py:174
+#: ../src/common/config.py:161
 msgid ""
 "How many lines to remember from previous conversation when a chat tab/window "
 "is reopened."
@@ -3519,13 +3564,13 @@ msgstr ""
 "Hur många rader som skall kommas ihåg från tidigare konversation när en "
 "chattflik/chattfönster öppnas igen."
 
-#: ../src/common/config.py:175
+#: ../src/common/config.py:162
 msgid "How many minutes should last lines from previous conversation last."
 msgstr ""
 "Hur många minuter skall de sista raderna från tidigare konversation finnas "
 "kvar."
 
-#: ../src/common/config.py:176
+#: ../src/common/config.py:163
 msgid ""
 "Send message on Ctrl+Enter and with Enter make new line (Mirabilis ICQ "
 "Client default behaviour)."
@@ -3533,11 +3578,11 @@ msgstr ""
 "Skicka meddelande med Ctrl+Enter och gör radbrytning med Enter (ICQ-klienten "
 "Mirabilis standardbeteende)."
 
-#: ../src/common/config.py:178
+#: ../src/common/config.py:165
 msgid "How many lines to store for Ctrl+KeyUP."
 msgstr "Hur många rader skall sparas för Ctrl+KeyUP."
 
-#: ../src/common/config.py:181
+#: ../src/common/config.py:168
 #, python-format
 msgid ""
 "Either custom url with %s in it where %s is the word/phrase or 'WIKTIONARY' "
@@ -3546,11 +3591,11 @@ msgstr ""
 "Antingen en anpassad url med %s, där %s är ordet/frasen eller \"WIKTIONARY\" "
 "vilket betyder att wiktionary skall användas."
 
-#: ../src/common/config.py:184
+#: ../src/common/config.py:171
 msgid "If checked, Gajim can be controlled remotely using gajim-remote."
 msgstr "Om kryssad så kan Gajim fjärrstyras med gajim-remote."
 
-#: ../src/common/config.py:185
+#: ../src/common/config.py:172
 #, fuzzy
 msgid ""
 "If True, listen to D-Bus signals from NetworkManager and change the status "
@@ -3562,28 +3607,28 @@ msgstr ""
 "för konton (om de nu inte har listen_to_network_manager satt till False och "
 "dem synkar med global status) baserat på om nätverkets status."
 
-#: ../src/common/config.py:186
+#: ../src/common/config.py:173
 msgid ""
 "Sent chat state notifications. Can be one of all, composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:187
+#: ../src/common/config.py:174
 msgid ""
 "Displayed chat state notifications in chat windows. Can be one of all, "
 "composing_only, disabled."
 msgstr ""
 
-#: ../src/common/config.py:189
+#: ../src/common/config.py:176
 msgid ""
 "When not printing time for every message (print_time==sometimes), print it "
 "every x minutes."
 msgstr ""
 
-#: ../src/common/config.py:190
+#: ../src/common/config.py:177
 msgid "Ask before closing a group chat tab/window."
 msgstr "Fråga innan gruppchattflik eller -fönster stängs."
 
-#: ../src/common/config.py:191
+#: ../src/common/config.py:178
 #, fuzzy
 msgid ""
 "Always ask before closing group chat tab/window in this space separated list "
@@ -3592,7 +3637,7 @@ msgstr ""
 "Fråga alltid innan guppchattab/-förster i denna kommaseparerade lista med "
 "rum (jid) stängs."
 
-#: ../src/common/config.py:192
+#: ../src/common/config.py:179
 #, fuzzy
 msgid ""
 "Never ask before closing group chat tab/window in this space separated list "
@@ -3601,7 +3646,13 @@ msgstr ""
 "Fråga aldrig innan guppchattab/-förster i denna kommaseparerade lista med "
 "rum (jid) stängs."
 
-#: ../src/common/config.py:195
+#: ../src/common/config.py:180
+msgid ""
+"Ask before closing tabbed chat window if there are control that can loose "
+"data (chat, private chat, groupchat that will not be minimized)"
+msgstr ""
+
+#: ../src/common/config.py:183
 #, fuzzy
 msgid ""
 "Comma separated list of hosts that we send, in addition of local interfaces, "
@@ -3610,29 +3661,29 @@ msgstr ""
 "Åtsidosätter vilket värdnamn vi skickar vid filöverföring, t.ex. vid NAT och "
 "port forwarding."
 
-#: ../src/common/config.py:197
+#: ../src/common/config.py:185
 msgid "IEC standard says KiB = 1024 bytes, KB = 1000 bytes."
 msgstr "IEC-standarden säger: KiB = 1024 byte, KB = 1000 byte."
 
-#: ../src/common/config.py:199
+#: ../src/common/config.py:187
 #, fuzzy
 msgid "Notify of events in the system trayicon."
 msgstr "Notifiera om händelser in systemets statusikon."
 
-#: ../src/common/config.py:205
+#: ../src/common/config.py:193
 msgid "Show tab when only one conversation?"
 msgstr "Visa flik när endast en konversation är aktiv?"
 
-#: ../src/common/config.py:206
+#: ../src/common/config.py:194
 #, fuzzy
 msgid "Show tabbed notebook border in chat windows?"
 msgstr "Visa flikkant om endast en konversation är aktiv?"
 
-#: ../src/common/config.py:207
+#: ../src/common/config.py:195
 msgid "Show close button in tab?"
 msgstr "Visa stängningsknapp i flik?"
 
-#: ../src/common/config.py:208
+#: ../src/common/config.py:196
 msgid ""
 "A list of modp groups to use in a Diffie-Hellman, highest preference first, "
 "separated by commas. Valid groups are 1, 2, 5, 14, 15, 16, 17 and 18. Higher "
@@ -3640,18 +3691,18 @@ msgid ""
 "session."
 msgstr ""
 
-#: ../src/common/config.py:217
+#: ../src/common/config.py:205
 #, fuzzy
 msgid "Preview new messages in notification popup?"
 msgstr "Chattstatusmeddelanden:"
 
-#: ../src/common/config.py:222
+#: ../src/common/config.py:210
 #, fuzzy
 msgid ""
 "A semicolon-separated list of words that will be highlighted in group chats."
 msgstr "En semikolonseparerad lista av ord som blir upplysta i gruppchatt."
 
-#: ../src/common/config.py:223
+#: ../src/common/config.py:211
 msgid ""
 "If True, quits Gajim when X button of Window Manager is clicked. This "
 "setting is taken into account only if trayicon is used."
@@ -3659,13 +3710,13 @@ msgstr ""
 "Om sant så avslutas Gajim när fönsterhanterarens X-knapp klickas. Denna "
 "inställning behandlas endast när aktivitetsfältsikonen används."
 
-#: ../src/common/config.py:224
+#: ../src/common/config.py:212
 #, fuzzy
 msgid ""
 "If True, Gajim will check if it's the default jabber client on each startup."
 msgstr "Om True registreras Gajim för xmpp:// vid varje uppstart."
 
-#: ../src/common/config.py:225
+#: ../src/common/config.py:213
 msgid ""
 "If True, Gajim will display an icon on each tab containing unread messages. "
 "Depending on the theme, this icon may be animated."
@@ -3673,7 +3724,7 @@ msgstr ""
 "Om sant kommer Gajim att visa en ikon på varje flik som innehåller olästa "
 "meddelanden. Beroende på temat så kan denna ikon vara animerad."
 
-#: ../src/common/config.py:226
+#: ../src/common/config.py:214
 #, fuzzy
 msgid ""
 "If True, Gajim will display the status message, if not empty, for every "
@@ -3682,11 +3733,11 @@ msgstr ""
 "Om True kommer Gajim att visa statusmeddelande, om inte tomt, för varje "
 "kontakt under dess namn i registerfönstret"
 
-#: ../src/common/config.py:231
+#: ../src/common/config.py:219
 msgid "Define the position of the avatar in roster. Can be left or right"
 msgstr ""
 
-#: ../src/common/config.py:232
+#: ../src/common/config.py:220
 msgid ""
 "If True, Gajim will ask for avatar each contact that did not have an avatar "
 "last time or has one cached that is too old."
@@ -3695,7 +3746,7 @@ msgstr ""
 "avatar senaste gången, eller som har en mellanlagrad avatar som är för "
 "gammal."
 
-#: ../src/common/config.py:233
+#: ../src/common/config.py:221
 #, fuzzy
 msgid ""
 "If False, Gajim will no longer print status line in chats when a contact "
@@ -3704,7 +3755,7 @@ msgstr ""
 "Om False kommer du inte längre att se en statusrad i chattfönstret när en "
 "kontakt byter hans eller hennes status och/eller statusmeddelande."
 
-#: ../src/common/config.py:234
+#: ../src/common/config.py:222
 msgid ""
 "can be \"none\", \"all\" or \"in_and_out\". If \"none\", Gajim will no "
 "longer print status line in groupchats when a member changes his or her "
@@ -3713,28 +3764,28 @@ msgid ""
 "group chat."
 msgstr ""
 
-#: ../src/common/config.py:236
+#: ../src/common/config.py:224
 msgid "Background color of contacts when they just signed in."
 msgstr "Bakgrundsfärg på kontakter när de precis loggat in."
 
-#: ../src/common/config.py:237
+#: ../src/common/config.py:225
 msgid "Background color of contacts when they just signed out."
 msgstr "Bakgrundsfärg på kontakter när de precis loggat ut."
 
-#: ../src/common/config.py:239
+#: ../src/common/config.py:227
 msgid ""
 "If True, restored messages will use a smaller font than the default one."
 msgstr ""
 
-#: ../src/common/config.py:240
+#: ../src/common/config.py:228
 msgid "Don't show avatar for the transport itself."
 msgstr "Visa inte avatar för själva transporten."
 
-#: ../src/common/config.py:241
+#: ../src/common/config.py:229
 msgid "Don't show roster in the system taskbar."
 msgstr "Visa inte kontaktlista i systemets fönsterlista."
 
-#: ../src/common/config.py:242
+#: ../src/common/config.py:230
 msgid ""
 "If True and installed GTK+ and PyGTK versions are at least 2.8, make the "
 "window flash (the default behaviour in most Window Managers) when holding "
@@ -3744,7 +3795,7 @@ msgstr ""
 "fönstret att blinka (standardbeteendet i de flesta fönsterhanterare) när det "
 "finns väntande händelser."
 
-#: ../src/common/config.py:244
+#: ../src/common/config.py:232
 #, fuzzy
 msgid ""
 "Jabberd1.4 does not like sha info when one join a password protected group "
@@ -3756,7 +3807,7 @@ msgstr ""
 "SHA-info i gruppchattnärvaroinformation"
 
 #. always, never, peracct, pertype should not be translated
-#: ../src/common/config.py:247
+#: ../src/common/config.py:235
 #, fuzzy
 msgid ""
 "Controls the window where new messages are placed.\n"
@@ -3776,33 +3827,33 @@ msgstr ""
 "visas i ett specifikt fönster. OBS: Gajim måste startas om för att denna "
 "inställning skall börja gälla."
 
-#: ../src/common/config.py:248
+#: ../src/common/config.py:236
 #, fuzzy
 msgid "If False, you will no longer see the avatar in the chat window."
 msgstr "Of False kommer du inte längre att se avatarer i chattfönstret"
 
-#: ../src/common/config.py:249
+#: ../src/common/config.py:237
 #, fuzzy
 msgid "If True, pressing the escape key closes a tab/window."
 msgstr "Om True kommer escape att stänga en tabb eller ett fönster"
 
-#: ../src/common/config.py:250
+#: ../src/common/config.py:238
 msgid "Hides the buttons in chat windows."
 msgstr "Döljer knapparna i chattfönster."
 
-#: ../src/common/config.py:251
+#: ../src/common/config.py:239
 msgid "Hides the banner in a group chat window"
 msgstr "Döljer bannern i ett gruppchattfönster"
 
-#: ../src/common/config.py:252
+#: ../src/common/config.py:240
 msgid "Hides the banner in two persons chat window"
 msgstr "Döljer bannern i chattfönster för två personer"
 
-#: ../src/common/config.py:253
+#: ../src/common/config.py:241
 msgid "Hides the group chat occupants list in group chat window."
 msgstr "Döljer deltagarlistan i gruppchattfönster."
 
-#: ../src/common/config.py:254
+#: ../src/common/config.py:242
 msgid ""
 "In a chat, show the nickname at the beginning of a line only when it's not "
 "the same person talking than in previous message."
@@ -3810,16 +3861,16 @@ msgstr ""
 "Visa endast smeknamnet, i en chatt, vid början av en rad om det inte är "
 "samma person som pratar som i förra meddelandet."
 
-#: ../src/common/config.py:255
+#: ../src/common/config.py:243
 msgid "Indentation when using merge consecutive nickname."
 msgstr ""
 
-#: ../src/common/config.py:256
+#: ../src/common/config.py:244
 #, fuzzy
 msgid "Smooth scroll message in conversation window"
 msgstr "Skicka meddelande och stäng fönster"
 
-#: ../src/common/config.py:257
+#: ../src/common/config.py:245
 #, fuzzy
 msgid ""
 "List of colors, separated by \":\", that will be used to color nicknames in "
@@ -3827,146 +3878,166 @@ msgid ""
 msgstr ""
 "Lista på färger som kommer användas för att färga smeknamnet i gruppchattar.<"
 
-#: ../src/common/config.py:258
+#: ../src/common/config.py:246
 msgid "Ctrl-Tab go to next composing tab when none is unread."
 msgstr "Ctrl+Tabb går till nästa skrivflik när ingen är oläst."
 
-#: ../src/common/config.py:259
+#: ../src/common/config.py:247
 msgid ""
 "Should we show the confirm metacontacts creation dialog or not? Empty string "
 "means we never show the dialog."
 msgstr ""
 
-#: ../src/common/config.py:260
+#: ../src/common/config.py:248
 msgid ""
 "If True, you will be able to set a negative priority to your account in "
 "account modification window. BE CAREFUL, when you are logged in with a "
 "negative priority, you will NOT receive any message from your server."
 msgstr ""
 
-#: ../src/common/config.py:261
+#: ../src/common/config.py:249
 msgid ""
 "If True, Gajim will use Gnome Keyring (if available) to store account "
 "passwords."
 msgstr ""
 
-#: ../src/common/config.py:262
+#: ../src/common/config.py:250
+msgid ""
+"If True, Gajim will use KDE Wallet (if kwalletcli is available) to store "
+"account passwords."
+msgstr ""
+
+#: ../src/common/config.py:251
 msgid ""
 "If True, Gajim will show number of online and total contacts in account and "
 "group rows."
 msgstr ""
 
-#: ../src/common/config.py:263
+#: ../src/common/config.py:252
 msgid ""
 "Can be empty, 'chat' or 'normal'. If not empty, treat all incoming messages "
 "as if they were of this type"
 msgstr ""
 
-#: ../src/common/config.py:264
+#: ../src/common/config.py:253
 msgid ""
 "If True, Gajim will scroll and select the contact who sent you the last "
 "message, if chat window is not already opened."
 msgstr ""
 
-#: ../src/common/config.py:265
+#: ../src/common/config.py:254
 msgid ""
 "If True, Gajim will convert string between $$ and $$ to an image using dvips "
 "and convert before insterting it in chat window."
 msgstr ""
 
-#: ../src/common/config.py:266
+#: ../src/common/config.py:255
 msgid "Time of inactivity needed before the change status window closes down."
 msgstr ""
 
-#: ../src/common/config.py:267
+#: ../src/common/config.py:256
 msgid ""
 "Maximum number of lines that are printed in conversations. Oldest lines are "
 "cleared."
 msgstr ""
 
-#: ../src/common/config.py:268
+#: ../src/common/config.py:257
 msgid ""
 "If True, notification windows from notification-daemon will be attached to "
 "systray icon."
 msgstr ""
 
-#: ../src/common/config.py:269
+#: ../src/common/config.py:258
 msgid "Choose interval between 2 checks of idleness."
 msgstr ""
 
-#: ../src/common/config.py:270
+#: ../src/common/config.py:259
 msgid ""
 "Change the value to change the size of latex formulas displayed. The higher "
 "is larger."
 msgstr ""
 
-#: ../src/common/config.py:271
+#: ../src/common/config.py:260
 msgid ""
 "Valid uri schemes. Only schemes in this list will be accepted as \"real\" "
-"uri. (mailto and xmpp are handled seperately)"
+"uri. (mailto and xmpp are handled separately)"
 msgstr ""
 
-#: ../src/common/config.py:282
+#: ../src/common/config.py:261
+msgid ""
+"Ask offline status message to all offline contacts when connection to an "
+"accoutn is established. WARNING: This causes a lot of requests to be sent!"
+msgstr ""
+
+#: ../src/common/config.py:273
 msgid ""
 "Priority will change automatically according to your status. Priorities are "
 "defined in autopriority_* options."
 msgstr ""
 
-#: ../src/common/config.py:290
+#: ../src/common/config.py:281
 msgid ""
 "Status used to autoconnect as. Can be online, chat, away, xa, dnd, "
 "invisible. NOTE: this option is used only if restore_last_status is disabled"
 msgstr ""
 
-#: ../src/common/config.py:291
+#: ../src/common/config.py:282
 msgid "If enabled, restore the last status that was used."
 msgstr ""
 
-#: ../src/common/config.py:296
+#: ../src/common/config.py:287
 msgid ""
 "If disabled, don't sign presences with GPG key, even if GPG is configured."
 msgstr ""
 
-#: ../src/common/config.py:298
+#: ../src/common/config.py:289
 msgid "Enable ESessions encryption for this account."
 msgstr "Aktivera ESessions-kryptering för detta konto."
 
-#: ../src/common/config.py:299
+#: ../src/common/config.py:290
 msgid "Should Gajim automatically start an encrypted session when possible?"
 msgstr "Ska Gajim automatiskt starta en krypterad session när det är möjligt?"
 
-#: ../src/common/config.py:300
+#: ../src/common/config.py:291
 msgid ""
 "Ordered list (space separated) of connection type to try. Can contain tls, "
 "ssl or plain"
 msgstr ""
 
-#: ../src/common/config.py:301
+#: ../src/common/config.py:292
 msgid ""
 "Show a warning dialog before sending password on an plaintext connection."
 msgstr ""
 "Visa en varningsdialog innan lösenord skickas i klartext över en anslutning."
 
-#: ../src/common/config.py:302
+#: ../src/common/config.py:293
 msgid "Show a warning dialog before using standard SSL library."
 msgstr "Visa en varningsdialog innan standard-SSL-biblioteket används."
 
-#: ../src/common/config.py:304
+#: ../src/common/config.py:295
 msgid "Space separated list of ssl errors to ignore."
 msgstr ""
 
-#: ../src/common/config.py:316
+#: ../src/common/config.py:304
+msgid "Whitespace sent after inactivity"
+msgstr ""
+
+#: ../src/common/config.py:305
+msgid "XMPP ping sent after inactivity"
+msgstr ""
+
+#: ../src/common/config.py:309
 msgid ""
-"How many seconds to wait for the answer of keepalive packet before we try to "
-"reconnect."
+"How many seconds to wait for the answer of ping alive packet before we try "
+"to reconnect."
 msgstr ""
 
 #. yes, no, ask
-#: ../src/common/config.py:320
+#: ../src/common/config.py:313
 msgid "Jabberd2 workaround"
 msgstr "Temporär lösning för Jabberd2"
 
-#: ../src/common/config.py:324
+#: ../src/common/config.py:317
 msgid ""
 "If checked, Gajim will use your IP and proxies defined in "
 "file_transfer_proxies option for file transfer."
@@ -3974,25 +4045,25 @@ msgstr ""
 "Om kryssad så kommer Gajim att använda ditt IP och proxyservrar definerade i "
 "alternativet file_transfer_proxies för filöverföringar."
 
-#: ../src/common/config.py:338
+#: ../src/common/config.py:331
 msgid "Answer to receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:339
+#: ../src/common/config.py:332
 msgid "Sent receipt requests"
 msgstr ""
 
-#: ../src/common/config.py:347
+#: ../src/common/config.py:340
 msgid ""
 "When negotiating an encrypted session, should Gajim assume you want your "
 "messages to be logged?"
 msgstr ""
 
-#: ../src/common/config.py:405
+#: ../src/common/config.py:403
 msgid "Is OpenPGP enabled for this contact?"
 msgstr "Är OpenPGP aktiverat för denna kontakt?"
 
-#: ../src/common/config.py:406
+#: ../src/common/config.py:404
 msgid ""
 "Should Gajim automatically start an encrypted session with this contact when "
 "possible?"
@@ -4000,101 +4071,101 @@ msgstr ""
 "Ska Gajim automatiskt starta en krypterad session med denna kontakt om "
 "möjligt?"
 
-#: ../src/common/config.py:407 ../src/common/config.py:410
+#: ../src/common/config.py:405 ../src/common/config.py:408
 msgid "Language for which we want to check misspelled words"
 msgstr "Språket för vilket vi vill leta efter felstavade ord"
 
-#: ../src/common/config.py:416
+#: ../src/common/config.py:414
 msgid "all or space separated status"
 msgstr "alla eller mellanslagsseparerad status"
 
-#: ../src/common/config.py:417
+#: ../src/common/config.py:415
 msgid "'yes', 'no', or 'both'"
 msgstr "\"yes\", \"no\" eller \"both\""
 
-#: ../src/common/config.py:418 ../src/common/config.py:420
-#: ../src/common/config.py:421 ../src/common/config.py:424
-#: ../src/common/config.py:425
+#: ../src/common/config.py:416 ../src/common/config.py:418
+#: ../src/common/config.py:419 ../src/common/config.py:422
+#: ../src/common/config.py:423
 msgid "'yes', 'no' or ''"
 msgstr "\"yes\", \"no\" eller \"\""
 
-#: ../src/common/config.py:431 ../src/common/pep.py:159
+#: ../src/common/config.py:429 ../src/common/pep.py:160
 msgid "Sleeping"
 msgstr "Sover"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:430
 msgid "Back soon"
 msgstr "Snart tillbaka"
 
-#: ../src/common/config.py:432
+#: ../src/common/config.py:430
 msgid "Back in some minutes."
 msgstr "Tillbaka om några minuter."
 
-#: ../src/common/config.py:433 ../src/common/pep.py:129
+#: ../src/common/config.py:431 ../src/common/pep.py:130
 msgid "Eating"
 msgstr "Äter"
 
-#: ../src/common/config.py:433
+#: ../src/common/config.py:431
 msgid "I'm eating, so leave me a message."
 msgstr "Jag äter, lämna ett meddelande."
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:432
 msgid "Movie"
 msgstr "Film"
 
-#: ../src/common/config.py:434
+#: ../src/common/config.py:432
 msgid "I'm watching a movie."
 msgstr "Jag tittar på film."
 
-#: ../src/common/config.py:435 ../src/common/pep.py:188
+#: ../src/common/config.py:433 ../src/common/pep.py:189
 msgid "Working"
 msgstr "Arbetar"
 
-#: ../src/common/config.py:435
+#: ../src/common/config.py:433
 msgid "I'm working."
 msgstr "Jag arbetar."
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:434
 msgid "Phone"
 msgstr "Telefon"
 
-#: ../src/common/config.py:436
+#: ../src/common/config.py:434
 msgid "I'm on the phone."
 msgstr "Jag pratar i telefon."
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:435
 msgid "Out"
 msgstr "Ute"
 
-#: ../src/common/config.py:437
+#: ../src/common/config.py:435
 msgid "I'm out enjoying life."
 msgstr "Jag är ute och njuter av livet."
 
-#: ../src/common/config.py:441
+#: ../src/common/config.py:446
 msgid "I'm available."
 msgstr "Jag är tillgänglig."
 
-#: ../src/common/config.py:442
+#: ../src/common/config.py:447
 msgid "I'm free for chat."
 msgstr "Jag är ledig för chatt."
 
-#: ../src/common/config.py:443 ../src/config.py:1404
+#: ../src/common/config.py:448 ../src/config.py:1384
 msgid "Be right back."
 msgstr "Strax tillbaka."
 
-#: ../src/common/config.py:444
+#: ../src/common/config.py:449
 msgid "I'm not available."
 msgstr "Jag är inte tillgänglig."
 
-#: ../src/common/config.py:445
+#: ../src/common/config.py:450
 msgid "Do not disturb."
 msgstr "Stör inte."
 
-#: ../src/common/config.py:446 ../src/common/config.py:447
+#: ../src/common/config.py:451 ../src/common/config.py:452
 msgid "Bye!"
 msgstr "Hejdå!"
 
-#: ../src/common/config.py:457
+#: ../src/common/config.py:462
 #, fuzzy
 msgid ""
 "Sound to play when a group chat message contains one of the words in "
@@ -4103,59 +4174,59 @@ msgstr ""
 "Ljud att spela när MUC-meddelande innehåller ett av orden i "
 "muc_highlight_words, eller när MUC-meddelande innehåller ditt smeknamn."
 
-#: ../src/common/config.py:458
+#: ../src/common/config.py:463
 msgid "Sound to play when any MUC message arrives."
 msgstr "Ljud att spela upp när ett MUC-meddelande anländer."
 
-#: ../src/common/config.py:467 ../src/common/optparser.py:235
+#: ../src/common/config.py:472 ../src/common/optparser.py:244
 msgid "green"
 msgstr "green"
 
-#: ../src/common/config.py:471 ../src/common/optparser.py:221
+#: ../src/common/config.py:476 ../src/common/optparser.py:230
 msgid "grocery"
 msgstr "grocery"
 
-#: ../src/common/config.py:475
+#: ../src/common/config.py:480
 msgid "human"
 msgstr "human"
 
-#: ../src/common/config.py:479
+#: ../src/common/config.py:484
 msgid "marine"
 msgstr "marine"
 
-#: ../src/common/connection_handlers.py:74
+#: ../src/common/connection_handlers.py:75
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:48
 msgid "Unable to load idle module"
 msgstr "Kunde inte läsa in idle-modul"
 
-#: ../src/common/connection_handlers.py:236
+#: ../src/common/connection_handlers.py:243
 #: ../src/common/zeroconf/connection_handlers_zeroconf.py:90
 msgid "Wrong host"
 msgstr "Fel värd"
 
-#: ../src/common/connection_handlers.py:237
+#: ../src/common/connection_handlers.py:244
 msgid "Invalid local address? :-O"
 msgstr "Ogiltig lokal adress? :-O"
 
-#: ../src/common/connection_handlers.py:670
+#: ../src/common/connection_handlers.py:677
 #, python-format
 msgid "Registration information for transport %s has not arrived in time"
 msgstr "Registreringsinformation för transporten %s har inte kommit fram i tid"
 
-#: ../src/common/connection_handlers.py:677
+#: ../src/common/connection_handlers.py:684
 msgid "Registration succeeded"
 msgstr "Registreringen lyckades"
 
-#: ../src/common/connection_handlers.py:678
+#: ../src/common/connection_handlers.py:685
 #, python-format
 msgid "Registration with agent %s succeeded"
 msgstr "Registrering med agenten %s lyckades"
 
-#: ../src/common/connection_handlers.py:680
+#: ../src/common/connection_handlers.py:687
 msgid "Registration failed"
 msgstr "Registreringen misslyckades"
 
-#: ../src/common/connection_handlers.py:680
+#: ../src/common/connection_handlers.py:687
 #, python-format
 msgid ""
 "Registration with agent %(agent)s failed with error %(error)s: %(error_msg)s"
@@ -4163,39 +4234,39 @@ msgstr ""
 "Registrering med agenten %(agent)s misslyckades med fel %(error)s: %"
 "(error_msg)s"
 
-#: ../src/common/connection_handlers.py:968
-#: ../src/common/connection_handlers.py:1959
-#: ../src/common/connection_handlers.py:2005
-#: ../src/common/connection_handlers.py:2193
-#: ../src/common/connection_handlers.py:2326 ../src/common/connection.py:1342
-#: ../src/gajim.py:400
+#: ../src/common/connection_handlers.py:987
+#: ../src/common/connection_handlers.py:2070
+#: ../src/common/connection_handlers.py:2116
+#: ../src/common/connection_handlers.py:2311
+#: ../src/common/connection_handlers.py:2449 ../src/common/connection.py:1369
+#: ../src/gajim.py:368
 msgid "Disk Write Error"
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1175 ../src/common/connection.py:917
+#: ../src/common/connection_handlers.py:1208 ../src/common/connection.py:938
 msgid "Invisibility not supported"
 msgstr "Osynlighet stöds inte"
 
-#: ../src/common/connection_handlers.py:1176 ../src/common/connection.py:918
+#: ../src/common/connection_handlers.py:1209 ../src/common/connection.py:939
 #, python-format
 msgid "Account %s doesn't support invisibility."
 msgstr "Kontot %s saknar stöd för osynlighet."
 
-#: ../src/common/connection_handlers.py:1787 ../src/common/connection.py:1157
-#: ../src/config.py:1829 ../src/config.py:1837 ../src/config.py:1880
-#: ../src/config.py:3105 ../src/dataforms_widget.py:603 ../src/dialogs.py:2357
+#: ../src/common/connection_handlers.py:1891 ../src/common/connection.py:1184
+#: ../src/config.py:1835 ../src/config.py:1844 ../src/config.py:1903
+#: ../src/config.py:3191 ../src/dataforms_widget.py:537 ../src/dialogs.py:2591
 msgid "Invalid Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/common/connection_handlers.py:1788
+#: ../src/common/connection_handlers.py:1892
 msgid "A message from a non-valid JID arrived, it has been ignored."
 msgstr ""
 
-#: ../src/common/connection_handlers.py:1962
-#: ../src/common/connection_handlers.py:2008
-#: ../src/common/connection_handlers.py:2196
-#: ../src/common/connection_handlers.py:2329 ../src/common/connection.py:1345
-#: ../src/gajim.py:178
+#: ../src/common/connection_handlers.py:2073
+#: ../src/common/connection_handlers.py:2119
+#: ../src/common/connection_handlers.py:2314
+#: ../src/common/connection_handlers.py:2452 ../src/common/connection.py:1372
+#: ../src/gajim.py:155 ../src/session.py:126
 #, python-format
 msgid ""
 "The database file (%s) cannot be read. Try to repair it (see http://trac."
@@ -4205,80 +4276,79 @@ msgstr ""
 "gajim.org/wiki/DatabaseBackup) eller ta bort den (alla historik kommer att "
 "förloras)."
 
-#: ../src/common/connection_handlers.py:2080
+#: ../src/common/connection_handlers.py:2198
 #, python-format
 msgid "Nickname not allowed: %s"
 msgstr "Smeknamnet tillåts inte: %s"
 
 #. we are banned
 #. group chat does not exist
-#. user may close the window before we are here
-#: ../src/common/connection_handlers.py:2155
-#: ../src/common/connection_handlers.py:2158
-#: ../src/common/connection_handlers.py:2161
-#: ../src/common/connection_handlers.py:2164
-#: ../src/common/connection_handlers.py:2168 ../src/gajim.py:548
+#: ../src/common/connection_handlers.py:2273
+#: ../src/common/connection_handlers.py:2276
+#: ../src/common/connection_handlers.py:2279
+#: ../src/common/connection_handlers.py:2282
+#: ../src/common/connection_handlers.py:2286 ../src/gajim.py:511
 msgid "Unable to join group chat"
 msgstr "Kunde inte gå in i gruppchatt"
 
-#: ../src/common/connection_handlers.py:2156
+#: ../src/common/connection_handlers.py:2274
 #, python-format
 msgid "You are banned from group chat %s."
 msgstr "Du är bannlyst från gruppchatten %s."
 
-#: ../src/common/connection_handlers.py:2159
+#: ../src/common/connection_handlers.py:2277
 #, python-format
 msgid "Group chat %s does not exist."
 msgstr "Gruppchatten %s finns inte."
 
-#: ../src/common/connection_handlers.py:2162
+#: ../src/common/connection_handlers.py:2280
 #, fuzzy
 msgid "Group chat creation is restricted."
 msgstr "Möjligheten att skapa rum är begränsad."
 
-#: ../src/common/connection_handlers.py:2165
+#: ../src/common/connection_handlers.py:2283
 #, fuzzy, python-format
 msgid "Your registered nickname must be used in group chat %s."
 msgstr "Ditt registrerade smeknamn måste användas."
 
-#: ../src/common/connection_handlers.py:2169
+#: ../src/common/connection_handlers.py:2287
 #, python-format
 msgid "You are not in the members list in groupchat %s."
 msgstr "Du är inte med i medlemslistan i gruppchatten %s."
 
 #. Room has been destroyed. see
 #. http://www.xmpp.org/extensions/xep-0045.html#destroyroom
-#: ../src/common/connection_handlers.py:2211
+#: ../src/common/connection_handlers.py:2329
 #, fuzzy
 msgid "Room has been destroyed"
 msgstr "Auktorisering har tagits bort"
 
-#: ../src/common/connection_handlers.py:2218
+#: ../src/common/connection_handlers.py:2337
 #, python-format
 msgid "You can join this room instead: %s"
 msgstr "Du kan gå in i detta rum istället: %s"
 
-#: ../src/common/connection_handlers.py:2245
+#: ../src/common/connection_handlers.py:2367
 msgid "I would like to add you to my roster."
 msgstr "Jag skulle vilja lägga till dig i min kontaktlista."
 
 #. BE CAREFUL: no con.updateRosterItem() in a callback
-#: ../src/common/connection_handlers.py:2266
+#: ../src/common/connection_handlers.py:2388
 #, python-format
 msgid "we are now subscribed to %s"
 msgstr "vi prenumererar nu på %s"
 
-#: ../src/common/connection_handlers.py:2268
+#: ../src/common/connection_handlers.py:2390
 #, python-format
 msgid "unsubscribe request from %s"
 msgstr "avprenumerationsförfrågan från %s"
 
-#: ../src/common/connection_handlers.py:2270
+#: ../src/common/connection_handlers.py:2392
 #, python-format
 msgid "we are now unsubscribed from %s"
 msgstr "vi prenumererar inte längre på %s"
 
-#: ../src/common/connection_handlers.py:2453
+#: ../src/common/connection_handlers.py:2580
 #, python-format
 msgid ""
 "JID %s is not RFC compliant. It will not be added to your roster. Use roster "
@@ -4289,15 +4359,15 @@ msgstr ""
 "org/  för att ta bort det"
 
 #. We didn't set a passphrase
-#: ../src/common/connection_handlers.py:2478
-#: ../src/common/zeroconf/connection_zeroconf.py:173
+#: ../src/common/connection_handlers.py:2614
+#: ../src/common/zeroconf/connection_zeroconf.py:175
 msgid "OpenPGP passphrase was not given"
 msgstr "Lösenordsfras för OpenPGP angavs inte"
 
 #. %s is the account name here
-#: ../src/common/connection_handlers.py:2480
-#: ../src/common/zeroconf/connection_zeroconf.py:175
-#: ../src/roster_window.py:1935
+#: ../src/common/connection_handlers.py:2616
+#: ../src/common/zeroconf/connection_zeroconf.py:177
+#: ../src/roster_window.py:1962
 #, python-format
 msgid "You will be connected to %s without OpenPGP."
 msgstr "Du kommer ansluta till %s utan OpenPGP."
@@ -4430,79 +4500,79 @@ msgstr "Nyckelanvändning inkluderar inte certifikatsignering"
 msgid "Application verification failure"
 msgstr ""
 
-#: ../src/common/connection.py:271
-#: ../src/common/zeroconf/connection_zeroconf.py:215
+#: ../src/common/connection.py:281
+#: ../src/common/zeroconf/connection_zeroconf.py:217
 #, python-format
 msgid "Connection with account \"%s\" has been lost"
 msgstr "Anslutningen med konto \"%s\" har brutits"
 
-#: ../src/common/connection.py:272
+#: ../src/common/connection.py:282
 msgid "Reconnect manually."
 msgstr "Återanslut manuellt."
 
-#: ../src/common/connection.py:283
+#: ../src/common/connection.py:293
 #, python-format
 msgid "Server %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Servern %(name)s svarade felaktigt på en registreringsbegäran: %(error)s"
 
-#: ../src/common/connection.py:317
+#: ../src/common/connection.py:327
 #, python-format
 msgid "Server %s provided a different registration form"
 msgstr "Servern %s tillhandahöll ett annat registreringsformulär"
 
-#: ../src/common/connection.py:330
+#: ../src/common/connection.py:340
 #, python-format
 msgid "Unknown SSL error: %d"
 msgstr "Okänt SSL-fel: %d"
 
 #. wrong answer
-#: ../src/common/connection.py:345
+#: ../src/common/connection.py:355
 msgid "Invalid answer"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/common/connection.py:346
+#: ../src/common/connection.py:356
 #, python-format
 msgid "Transport %(name)s answered wrongly to register request: %(error)s"
 msgstr ""
 "Transporten %(name)s svarade felaktigt på en registreringsbegäran: %(error)s"
 
-#: ../src/common/connection.py:629 ../src/common/connection.py:755
-#: ../src/common/connection.py:1478
-#: ../src/common/zeroconf/connection_zeroconf.py:249
+#: ../src/common/connection.py:639 ../src/common/connection.py:768
+#: ../src/common/connection.py:1524
+#: ../src/common/zeroconf/connection_zeroconf.py:251
 #, python-format
 msgid "Could not connect to \"%s\""
 msgstr "Kunde inte ansluta till \"%s\""
 
-#: ../src/common/connection.py:630 ../src/gajim.py:1094
+#: ../src/common/connection.py:640 ../src/gajim.py:1076
 msgid "Check your connection or try again later."
 msgstr "Kontrollera din anslutning eller försök igen senare."
 
-#: ../src/common/connection.py:635
+#: ../src/common/connection.py:645
 #, fuzzy, python-format
 msgid "Server replied: %s"
 msgstr "Sparad i: %s"
 
-#: ../src/common/connection.py:648
+#: ../src/common/connection.py:658
 msgid "Connection to proxy failed"
 msgstr "Anslutning till proxyservern misslyckades"
 
-#: ../src/common/connection.py:679 ../src/common/connection.py:735
+#: ../src/common/connection.py:689 ../src/common/connection.py:748
 #, python-format
 msgid "Could not connect to account %s"
 msgstr "Kunde inte ansluta till kontot %s"
 
-#: ../src/common/connection.py:680 ../src/common/connection.py:736
+#: ../src/common/connection.py:690 ../src/common/connection.py:749
 #, python-format
 msgid "Connection with account %s has been lost. Retry connecting."
 msgstr "Anslutningen med kontot \"%s\" har förlorats. Försök att ansluta igen."
 
-#: ../src/common/connection.py:702
+#: ../src/common/connection.py:715
 #, python-format
 msgid "The authenticity of the %s certificate could be invalid."
 msgstr ""
 
-#: ../src/common/connection.py:705
+#: ../src/common/connection.py:718
 #, python-format
 msgid ""
 "\n"
@@ -4511,7 +4581,7 @@ msgstr ""
 "\n"
 "SSL-fel: <b>%s</b>"
 
-#: ../src/common/connection.py:707
+#: ../src/common/connection.py:720
 #, python-format
 msgid ""
 "\n"
@@ -4520,55 +4590,55 @@ msgstr ""
 "\n"
 "Okänt SSL-fel: %d"
 
-#: ../src/common/connection.py:756
+#: ../src/common/connection.py:769
 msgid "Check your connection or try again later"
 msgstr "Kontrollera din anslutning eller försök igen senare"
 
-#: ../src/common/connection.py:781
+#: ../src/common/connection.py:797
 #, python-format
 msgid "Authentication failed with \"%s\""
 msgstr "Autentisering mot \"%s\" misslyckades"
 
-#: ../src/common/connection.py:783
+#: ../src/common/connection.py:799
 msgid "Please check your login and password for correctness."
 msgstr "Kontrollera ditt inloggningsnamn och lösenord."
 
-#: ../src/common/connection.py:844
+#: ../src/common/connection.py:865
 #, fuzzy
 msgid "Error while removing privacy list"
 msgstr "problem vid sändning %s ( %s )"
 
-#: ../src/common/connection.py:845
+#: ../src/common/connection.py:866
 #, python-format
 msgid ""
 "Privacy list %s has not been removed. It is maybe active in one of your "
 "connected resources. Deactivate it and try again."
 msgstr ""
 
-#: ../src/common/connection.py:1158 ../src/dialogs.py:2358
+#: ../src/common/connection.py:1185 ../src/dialogs.py:2592
 #, fuzzy, python-format
 msgid "It is not possible to send a message to %s, this JID is not valid."
 msgstr "Det är inte möjligt att skicka tomma filer"
 
-#: ../src/common/connection.py:1180
-#: ../src/common/zeroconf/connection_zeroconf.py:389
+#: ../src/common/connection.py:1207
+#: ../src/common/zeroconf/connection_zeroconf.py:391
 msgid "Neither the remote presence is signed, nor a key was assigned."
 msgstr ""
 
-#: ../src/common/connection.py:1182
-#: ../src/common/zeroconf/connection_zeroconf.py:391
+#: ../src/common/connection.py:1209
+#: ../src/common/zeroconf/connection_zeroconf.py:393
 #, python-format
 msgid "The contact's key (%s) does not match the key assigned in Gajim."
 msgstr ""
 
 #. we're not english
 #. one in locale and one en
-#: ../src/common/connection.py:1230
+#: ../src/common/connection.py:1257
 msgid "[This message is *encrypted* (See :XEP:`27`]"
 msgstr "[Detta meddelande är *krypterat* (Se :XEP:`27`]"
 
-#: ../src/common/connection.py:1332
-#: ../src/common/zeroconf/connection_zeroconf.py:468
+#: ../src/common/connection.py:1359
+#: ../src/common/zeroconf/connection_zeroconf.py:470
 #, python-format
 msgid ""
 "Subject: %(subject)s\n"
@@ -4577,20 +4647,30 @@ msgstr ""
 "Ämne: %(subject)s\n"
 "%(message)s"
 
-#: ../src/common/connection.py:1511 ../src/common/connection.py:1532
+#: ../src/common/connection.py:1386
+#, python-format
+msgid "Sent contact: \"%s\" (%s)"
+msgstr ""
+
+#: ../src/common/connection.py:1389
+#, fuzzy
+msgid "Sent contacts:"
+msgstr "Bjud in _kontakter"
+
+#: ../src/common/connection.py:1557 ../src/common/connection.py:1578
 msgid "Not fetched because of invisible status"
 msgstr "Inte hämtad på grund av osynlig status"
 
-#: ../src/common/contacts.py:92 ../src/common/helpers.py:56
-#: ../src/gajim.py:999
+#: ../src/common/contacts.py:92 ../src/common/helpers.py:55
+#: ../src/gajim.py:981
 msgid "Observers"
 msgstr "Observerande"
 
 #: ../src/common/contacts.py:96 ../src/common/contacts.py:348
-#: ../src/common/helpers.py:56 ../src/disco.py:117 ../src/disco.py:118
-#: ../src/disco.py:1350 ../src/gajim.py:812 ../src/roster_window.py:814
-#: ../src/roster_window.py:1468 ../src/roster_window.py:1537
-#: ../src/roster_window.py:1539 ../src/roster_window.py:1688
+#: ../src/common/helpers.py:55 ../src/disco.py:119 ../src/disco.py:120
+#: ../src/disco.py:1354 ../src/gajim.py:790 ../src/roster_window.py:837
+#: ../src/roster_window.py:1492 ../src/roster_window.py:1561
+#: ../src/roster_window.py:1563 ../src/roster_window.py:1707
 msgid "Transports"
 msgstr "Transporter"
 
@@ -4599,11 +4679,11 @@ msgid "Not in roster"
 msgstr "Inte i kontaktlista"
 
 #. only say that to non Windows users
-#: ../src/common/dbus_support.py:49
+#: ../src/common/dbus_support.py:43
 msgid "D-Bus python bindings are missing in this computer"
 msgstr "D-Bus python-bindningar saknas på den här datorn"
 
-#: ../src/common/dbus_support.py:50
+#: ../src/common/dbus_support.py:44
 msgid "D-Bus capabilities of Gajim cannot be used"
 msgstr "Gajims D-Bus-egenskaper kan inte användas"
 
@@ -4632,386 +4712,386 @@ msgstr ""
 "Sessionsbussen är inte tillgänglig.\n"
 "Läs http://trac.gajim.org/wiki/GajimDBus för hjälp"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
+msgid "twelve"
+msgstr "tolv"
+
+#: ../src/common/fuzzyclock.py:38
 msgid "one"
 msgstr "ett"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "two"
 msgstr "två"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "three"
 msgstr "tre"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:38
 msgid "four"
 msgstr "fyra"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "five"
 msgstr "fem"
 
-#: ../src/common/fuzzyclock.py:42
+#: ../src/common/fuzzyclock.py:39
 msgid "six"
 msgstr "sex"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "seven"
 msgstr "sju"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "eight"
 msgstr "åtta"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "nine"
 msgstr "nio"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:39
 msgid "ten"
 msgstr "tio"
 
-#: ../src/common/fuzzyclock.py:43
+#: ../src/common/fuzzyclock.py:40
 msgid "eleven"
 msgstr "elva"
 
+#. Strings to use for the output. %(0)s will be replaced with the preceding hour
+#. (e.g. "x PAST %(0)s"), {1} with the coming hour (e.g. "x TO {1}"). '''
 #: ../src/common/fuzzyclock.py:44
-msgid "twelve"
-msgstr "tolv"
-
-#. Strings to use for the output. $0 will be replaced with the preceding hour (e.g. "x PAST $0"), $1 with the coming hour (e.g. "x TO $1). '''
-#. A "singular-form". It is used when talking about hour 0
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "$0 o'clock"
-msgstr "$0"
+msgid "%(0)s o'clock"
+msgstr "%(0)s"
 
-#: ../src/common/fuzzyclock.py:47 ../src/common/fuzzyclock.py:55
-msgid "five past $0"
-msgstr "fem över $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "five past %(0)s"
+msgstr "fem över %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "ten past $0"
-msgstr "tio i $0"
+#: ../src/common/fuzzyclock.py:44
+msgid "ten past %(0)s"
+msgstr "tio i %(0)s"
 
-#: ../src/common/fuzzyclock.py:48 ../src/common/fuzzyclock.py:56
-msgid "quarter past $0"
-msgstr "kvart över $0"
+#: ../src/common/fuzzyclock.py:45
+msgid "quarter past %(0)s"
+msgstr "kvart över %(0)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty past $0"
-msgstr "tio i halv $1"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty past %(0)s"
+msgstr "tio i halv %(1)s"
 
-#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:57
-msgid "twenty five past $0"
-msgstr "fem i halv $1"
+#: ../src/common/fuzzyclock.py:45
+msgid "twenty five past %(0)s"
+msgstr "fem i halv %(1)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "half past $0"
-msgstr "halv $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "half past %(0)s"
+msgstr "halv %(1)s"
 
-#: ../src/common/fuzzyclock.py:50 ../src/common/fuzzyclock.py:58
-msgid "twenty five to $1"
-msgstr "fem över halv $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty five to %(1)s"
+msgstr "fem över halv %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "twenty to $1"
-msgstr "tjugo i $1"
+#: ../src/common/fuzzyclock.py:46
+msgid "twenty to %(1)s"
+msgstr "tjugo i %(1)s"
 
-#: ../src/common/fuzzyclock.py:51 ../src/common/fuzzyclock.py:59
-msgid "quarter to $1"
-msgstr "kvart i $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "quarter to %(1)s"
+msgstr "kvart i %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "ten to $1"
-msgstr "tio i $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "ten to %(1)s"
+msgstr "tio i %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:60
-msgid "five to $1"
-msgstr "fem i $1"
+#: ../src/common/fuzzyclock.py:47
+msgid "five to %(1)s"
+msgstr "fem i %(1)s"
 
-#: ../src/common/fuzzyclock.py:52 ../src/common/fuzzyclock.py:61
-msgid "$1 o'clock"
-msgstr "$1"
+#: ../src/common/fuzzyclock.py:47
+msgid "%(1)s o'clock"
+msgstr "%(1)s"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49 ../src/common/fuzzyclock.py:51
 msgid "Night"
 msgstr "Natt"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Early morning"
 msgstr "Tidig morgon"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:49
 msgid "Morning"
 msgstr "Morgon"
 
-#: ../src/common/fuzzyclock.py:64
+#: ../src/common/fuzzyclock.py:50
 msgid "Almost noon"
 msgstr "Nästan mitt på dagen"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Noon"
 msgstr "Mitt på dagen"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Afternoon"
 msgstr "Eftermiddag"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:50
 msgid "Evening"
 msgstr "Kväll"
 
-#: ../src/common/fuzzyclock.py:65
+#: ../src/common/fuzzyclock.py:51
 msgid "Late evening"
 msgstr "Sen kväll"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53
 msgid "Start of week"
 msgstr "Början av veckan"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:53 ../src/common/fuzzyclock.py:54
 msgid "Middle of week"
 msgstr "Mitt i veckan"
 
-#: ../src/common/fuzzyclock.py:67
+#: ../src/common/fuzzyclock.py:54
 msgid "End of week"
 msgstr "Slutet av veckan"
 
-#: ../src/common/fuzzyclock.py:68
+#: ../src/common/fuzzyclock.py:54
 msgid "Weekend!"
 msgstr "Helg!"
 
-#: ../src/common/helpers.py:141
+#: ../src/common/helpers.py:140
 msgid "Invalid character in username."
 msgstr "Ogiltigt tecken i användarnamn"
 
-#: ../src/common/helpers.py:146
+#: ../src/common/helpers.py:145
 msgid "Server address required."
 msgstr "Serveradress krävs."
 
-#: ../src/common/helpers.py:152
+#: ../src/common/helpers.py:151
 msgid "Invalid character in hostname."
 msgstr "Ogiltigt tecken i värdnamn."
 
-#: ../src/common/helpers.py:159
+#: ../src/common/helpers.py:158
 msgid "Invalid character in resource."
 msgstr "Ogiltigt tecken i resurs."
 
-#: ../src/common/helpers.py:191
+#: ../src/common/helpers.py:190
 msgid "_Busy"
 msgstr "_Upptagen"
 
-#: ../src/common/helpers.py:193
+#: ../src/common/helpers.py:192
 msgid "Busy"
 msgstr "Upptagen"
 
-#: ../src/common/helpers.py:196
+#: ../src/common/helpers.py:195
 msgid "_Not Available"
 msgstr "_Inte tillgänglig"
 
-#: ../src/common/helpers.py:201
+#: ../src/common/helpers.py:200
 msgid "_Free for Chat"
 msgstr "_Ledig för chatt"
 
-#: ../src/common/helpers.py:203
+#: ../src/common/helpers.py:202
 msgid "Free for Chat"
 msgstr "Ledig för chatt"
 
-#: ../src/common/helpers.py:206
+#: ../src/common/helpers.py:205
 msgid "_Available"
 msgstr "_Tillgänglig"
 
-#: ../src/common/helpers.py:208 ../src/features_window.py:115
+#: ../src/common/helpers.py:207 ../src/features_window.py:116
 msgid "Available"
 msgstr "Tillgänglig"
 
-#: ../src/common/helpers.py:210
+#: ../src/common/helpers.py:209
 msgid "Connecting"
 msgstr "Ansluter"
 
-#: ../src/common/helpers.py:213
+#: ../src/common/helpers.py:212
 msgid "A_way"
 msgstr "Fr_ånvarande"
 
-#: ../src/common/helpers.py:218
+#: ../src/common/helpers.py:217
 msgid "_Offline"
 msgstr "_Frånkopplad"
 
-#: ../src/common/helpers.py:220
+#: ../src/common/helpers.py:219
 msgid "Offline"
 msgstr "Frånkopplad"
 
-#: ../src/common/helpers.py:223
+#: ../src/common/helpers.py:222
 msgid "_Invisible"
 msgstr "_Osynlig"
 
-#: ../src/common/helpers.py:229
+#: ../src/common/helpers.py:228
 msgid "?contact has status:Unknown"
 msgstr "?kontakt har status:Okänd"
 
-#: ../src/common/helpers.py:231
+#: ../src/common/helpers.py:230
 msgid "?contact has status:Has errors"
 msgstr "?kontakt har status:Har fel"
 
-#: ../src/common/helpers.py:236
+#: ../src/common/helpers.py:235
 msgid "?Subscription we already have:None"
 msgstr "?Prenumeration vi redan har:Ingen"
 
-#: ../src/common/helpers.py:238
+#: ../src/common/helpers.py:237
 msgid "To"
 msgstr "Till"
 
-#: ../src/common/helpers.py:242
+#: ../src/common/helpers.py:241
 msgid "Both"
 msgstr "Båda"
 
-#: ../src/common/helpers.py:250
+#: ../src/common/helpers.py:249
 msgid "?Ask (for Subscription):None"
 msgstr "?Fråga (för prenumeration):Ingen"
 
-#: ../src/common/helpers.py:252
+#: ../src/common/helpers.py:251
 msgid "Subscribe"
 msgstr "Prenumerera"
 
-#: ../src/common/helpers.py:261
+#: ../src/common/helpers.py:260
 msgid "?Group Chat Contact Role:None"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: ../src/common/helpers.py:264
+#: ../src/common/helpers.py:263
 msgid "Moderators"
 msgstr "Moderatorer"
 
-#: ../src/common/helpers.py:266
+#: ../src/common/helpers.py:265
 msgid "Moderator"
 msgstr "Moderator"
 
-#: ../src/common/helpers.py:269
+#: ../src/common/helpers.py:268
 msgid "Participants"
 msgstr "Deltagare"
 
-#: ../src/common/helpers.py:271
+#: ../src/common/helpers.py:270
 msgid "Participant"
 msgstr "Deltagare"
 
-#: ../src/common/helpers.py:274
+#: ../src/common/helpers.py:273
 msgid "Visitors"
 msgstr "Besökare"
 
-#: ../src/common/helpers.py:276
+#: ../src/common/helpers.py:275
 msgid "Visitor"
 msgstr "Besökare"
 
-#: ../src/common/helpers.py:282
+#: ../src/common/helpers.py:281
 #, fuzzy
 msgid "?Group Chat Contact Affiliation:None"
 msgstr "?Gruppchatt kontaktroll:Ingen"
 
-#: ../src/common/helpers.py:284
+#: ../src/common/helpers.py:283
 msgid "Owner"
 msgstr "Ägare"
 
-#: ../src/common/helpers.py:286
+#: ../src/common/helpers.py:285
 msgid "Administrator"
 msgstr "Administratör"
 
-#: ../src/common/helpers.py:288
+#: ../src/common/helpers.py:287
 msgid "Member"
 msgstr "Medlem"
 
-#: ../src/common/helpers.py:325
+#: ../src/common/helpers.py:324
 msgid "is paying attention to the conversation"
 msgstr "uppmärksammar konversationen"
 
-#: ../src/common/helpers.py:327
+#: ../src/common/helpers.py:326
 msgid "is doing something else"
 msgstr "gör något annat"
 
-#: ../src/common/helpers.py:329
+#: ../src/common/helpers.py:328
 msgid "is composing a message..."
 msgstr "skriver ett meddelande..."
 
 #. paused means he or she was composing but has stopped for a while
-#: ../src/common/helpers.py:332
+#: ../src/common/helpers.py:331
 msgid "paused composing a message"
 msgstr "tog en paus i skrivandet"
 
-#: ../src/common/helpers.py:334
+#: ../src/common/helpers.py:333
 msgid "has closed the chat window or tab"
 msgstr "har stängt chattfönstret eller fliken"
 
 #. GiB means gibibyte
-#: ../src/common/helpers.py:662
+#: ../src/common/helpers.py:653
 #, python-format
 msgid "%s GiB"
 msgstr "%s GiB"
 
 #. GB means gigabyte
-#: ../src/common/helpers.py:665
+#: ../src/common/helpers.py:656
 #, python-format
 msgid "%s GB"
 msgstr "%s GB"
 
 #. MiB means mibibyte
-#: ../src/common/helpers.py:669
+#: ../src/common/helpers.py:660
 #, python-format
 msgid "%s MiB"
 msgstr "%s MiB"
 
 #. MB means megabyte
-#: ../src/common/helpers.py:672
+#: ../src/common/helpers.py:663
 #, python-format
 msgid "%s MB"
 msgstr "%s MB"
 
 #. KiB means kibibyte
-#: ../src/common/helpers.py:676
+#: ../src/common/helpers.py:667
 #, python-format
 msgid "%s KiB"
 msgstr "%s KiB"
 
 #. KB means kilo bytes
-#: ../src/common/helpers.py:679
+#: ../src/common/helpers.py:670
 #, python-format
 msgid "%s KB"
 msgstr "%s KB"
 
 #. B means bytes
-#: ../src/common/helpers.py:682
+#: ../src/common/helpers.py:673
 #, python-format
 msgid "%s B"
 msgstr "%s B"
 
-#: ../src/common/helpers.py:1089 ../src/common/helpers.py:1096
+#: ../src/common/helpers.py:1161 ../src/common/helpers.py:1168
 #, python-format
 msgid "%d message pending"
 msgid_plural "%d messages pending"
 msgstr[0] "%d meddelande väntar"
 msgstr[1] "%d meddelanden väntar"
 
-#: ../src/common/helpers.py:1102
+#: ../src/common/helpers.py:1174
 #, python-format
 msgid " from room %s"
 msgstr " från rummet %s"
 
-#: ../src/common/helpers.py:1105 ../src/common/helpers.py:1124
+#: ../src/common/helpers.py:1177 ../src/common/helpers.py:1196
 #, python-format
 msgid " from user %s"
 msgstr " från användaren %s"
 
-#: ../src/common/helpers.py:1107
+#: ../src/common/helpers.py:1179
 #, python-format
 msgid " from %s"
 msgstr " från %s"
 
-#: ../src/common/helpers.py:1114 ../src/common/helpers.py:1121
+#: ../src/common/helpers.py:1186 ../src/common/helpers.py:1193
 #, python-format
 msgid "%d event pending"
 msgid_plural "%d events pending"
 msgstr[0] "%d väntande händelse"
 msgstr[1] "%d väntande händelser"
 
-#: ../src/common/helpers.py:1154
+#: ../src/common/helpers.py:1226
 #, python-format
 msgid "Gajim - %s"
 msgstr "Gajim - %s"
@@ -5021,653 +5101,658 @@ msgstr "Gajim - %s"
 msgid "Error executing \"%(command)s\": %(error)s"
 msgstr "Fel vid körning av \"%(command)s\": %(error)s"
 
+#: ../src/common/logging_helpers.py:33
+#, python-format
+msgid "%s is not a valid loglevel"
+msgstr "%s är inte en giltig loggnivå"
+
 #. we talk about a file
-#: ../src/common/optparser.py:56
+#: ../src/common/optparser.py:57
 #, python-format
 msgid "error: cannot open %s for reading"
 msgstr "fel: kan inte öppna %s för läsning"
 
-#: ../src/common/optparser.py:230 ../src/common/optparser.py:231
+#: ../src/common/optparser.py:239 ../src/common/optparser.py:240
 msgid "cyan"
 msgstr "cyan"
 
-#: ../src/common/optparser.py:347
+#: ../src/common/optparser.py:356
 msgid "migrating logs database to indices"
 msgstr "migrerar loggdatabas till index"
 
-#: ../src/common/passwords.py:117
+#: ../src/common/passwords.py:123
 #, python-format
 msgid "XMPP account %s@%s"
 msgstr "XMPP-kontot %s@%s"
 
-#: ../src/common/pep.py:29
+#: ../src/common/pep.py:30
 msgid "Afraid"
 msgstr "Rädd"
 
-#: ../src/common/pep.py:30
+#: ../src/common/pep.py:31
 msgid "Amazed"
 msgstr "Förvånad"
 
-#: ../src/common/pep.py:31
+#: ../src/common/pep.py:32
 msgid "Amorous"
 msgstr "Kärleksfull"
 
-#: ../src/common/pep.py:32
+#: ../src/common/pep.py:33
 msgid "Angry"
 msgstr "Arg"
 
-#: ../src/common/pep.py:33
+#: ../src/common/pep.py:34
 msgid "Annoyed"
 msgstr "Irriterad"
 
-#: ../src/common/pep.py:34
+#: ../src/common/pep.py:35
 msgid "Anxious"
 msgstr "Ängslig"
 
-#: ../src/common/pep.py:35
+#: ../src/common/pep.py:36
 msgid "Aroused"
 msgstr "Intresserad"
 
-#: ../src/common/pep.py:36
+#: ../src/common/pep.py:37
 msgid "Ashamed"
 msgstr "Skamsen"
 
-#: ../src/common/pep.py:37
+#: ../src/common/pep.py:38
 msgid "Bored"
 msgstr "Uttråkad"
 
-#: ../src/common/pep.py:38
+#: ../src/common/pep.py:39
 msgid "Brave"
 msgstr "Modig"
 
-#: ../src/common/pep.py:39
+#: ../src/common/pep.py:40
 msgid "Calm"
 msgstr "Lugn"
 
-#: ../src/common/pep.py:40
+#: ../src/common/pep.py:41
 msgid "Cautious"
 msgstr "Försiktig"
 
-#: ../src/common/pep.py:41
+#: ../src/common/pep.py:42
 msgid "Cold"
 msgstr "Kall"
 
-#: ../src/common/pep.py:42
+#: ../src/common/pep.py:43
 msgid "Confident"
 msgstr "Självsäker"
 
-#: ../src/common/pep.py:43
+#: ../src/common/pep.py:44
 msgid "Confused"
 msgstr "Förvirrad"
 
-#: ../src/common/pep.py:44
+#: ../src/common/pep.py:45
 msgid "Contemplative"
 msgstr "Kontemplativ"
 
-#: ../src/common/pep.py:45
+#: ../src/common/pep.py:46
 msgid "Contented"
 msgstr "Utmanad"
 
-#: ../src/common/pep.py:46
+#: ../src/common/pep.py:47
 msgid "Cranky"
 msgstr "Excentrisk"
 
-#: ../src/common/pep.py:47
+#: ../src/common/pep.py:48
 msgid "Crazy"
 msgstr "Galen"
 
-#: ../src/common/pep.py:48
+#: ../src/common/pep.py:49
 msgid "Creative"
 msgstr "Kreativ"
 
-#: ../src/common/pep.py:49
+#: ../src/common/pep.py:50
 msgid "Curious"
 msgstr "Nyfiken"
 
-#: ../src/common/pep.py:50
+#: ../src/common/pep.py:51
 msgid "Dejected"
 msgstr "Bedrövad"
 
-#: ../src/common/pep.py:51
+#: ../src/common/pep.py:52
 msgid "Depressed"
 msgstr "Deprimerad"
 
-#: ../src/common/pep.py:52
+#: ../src/common/pep.py:53
 msgid "Disappointed"
 msgstr "Besviken"
 
-#: ../src/common/pep.py:53
+#: ../src/common/pep.py:54
 msgid "Disgusted"
 msgstr "Äcklad"
 
-#: ../src/common/pep.py:54
+#: ../src/common/pep.py:55
 msgid "Dismayed"
 msgstr "Förskräckt"
 
-#: ../src/common/pep.py:55
+#: ../src/common/pep.py:56
 msgid "Distracted"
 msgstr "Distraherad"
 
-#: ../src/common/pep.py:56
+#: ../src/common/pep.py:57
 msgid "Embarrassed"
 msgstr "Besvärad"
 
-#: ../src/common/pep.py:57
+#: ../src/common/pep.py:58
 msgid "Envious"
 msgstr "Avundsjuk"
 
-#: ../src/common/pep.py:58
+#: ../src/common/pep.py:59
 msgid "Excited"
 msgstr "Upphetsad"
 
-#: ../src/common/pep.py:59
+#: ../src/common/pep.py:60
 msgid "Flirtatious"
 msgstr "Flirtig"
 
-#: ../src/common/pep.py:60
+#: ../src/common/pep.py:61
 msgid "Frustrated"
 msgstr "Frustrerad"
 
-#: ../src/common/pep.py:61
+#: ../src/common/pep.py:62
 msgid "Grateful"
 msgstr "Tacksam"
 
-#: ../src/common/pep.py:62
+#: ../src/common/pep.py:63
 msgid "Grieving"
 msgstr "Sörjer"
 
-#: ../src/common/pep.py:63
+#: ../src/common/pep.py:64
 msgid "Grumpy"
 msgstr "Grinig"
 
-#: ../src/common/pep.py:64
+#: ../src/common/pep.py:65
 msgid "Guilty"
 msgstr "Skyldig"
 
-#: ../src/common/pep.py:65
+#: ../src/common/pep.py:66
 msgid "Happy"
 msgstr "Glad"
 
-#: ../src/common/pep.py:66
+#: ../src/common/pep.py:67
 msgid "Hopeful"
 msgstr "Hoppfull"
 
-#: ../src/common/pep.py:67
+#: ../src/common/pep.py:68
 msgid "Hot"
 msgstr "Het"
 
-#: ../src/common/pep.py:68
+#: ../src/common/pep.py:69
 msgid "Humbled"
 msgstr "Spak"
 
-#: ../src/common/pep.py:69
+#: ../src/common/pep.py:70
 msgid "Humiliated"
 msgstr "Förödmjukad"
 
-#: ../src/common/pep.py:70
+#: ../src/common/pep.py:71
 msgid "Hungry"
 msgstr "Hungrig"
 
-#: ../src/common/pep.py:71
+#: ../src/common/pep.py:72
 msgid "Hurt"
 msgstr "Sårad"
 
-#: ../src/common/pep.py:72
+#: ../src/common/pep.py:73
 msgid "Impressed"
 msgstr "Imponerad"
 
-#: ../src/common/pep.py:73
+#: ../src/common/pep.py:74
 msgid "In Awe"
 msgstr "Respektfull"
 
-#: ../src/common/pep.py:74
+#: ../src/common/pep.py:75
 msgid "In Love"
 msgstr "Kär"
 
-#: ../src/common/pep.py:75
+#: ../src/common/pep.py:76
 msgid "Indignant"
 msgstr "Upprörd"
 
-#: ../src/common/pep.py:76
+#: ../src/common/pep.py:77
 msgid "Interested"
 msgstr "Intresserad"
 
-#: ../src/common/pep.py:77
+#: ../src/common/pep.py:78
 msgid "Intoxicated"
 msgstr "Berusad"
 
-#: ../src/common/pep.py:78
+#: ../src/common/pep.py:79
 msgid "Invincible"
 msgstr "Oövervinnelig"
 
-#: ../src/common/pep.py:79
+#: ../src/common/pep.py:80
 msgid "Jealous"
 msgstr "Avundsjuk"
 
-#: ../src/common/pep.py:80
+#: ../src/common/pep.py:81
 msgid "Lonely"
 msgstr "Ensam"
 
-#: ../src/common/pep.py:81
+#: ../src/common/pep.py:82
 msgid "Lost"
 msgstr "Förlorad"
 
-#: ../src/common/pep.py:82
+#: ../src/common/pep.py:83
 msgid "Lucky"
 msgstr "Lycklig"
 
-#: ../src/common/pep.py:83
+#: ../src/common/pep.py:84
 msgid "Mean"
 msgstr "Elak"
 
-#: ../src/common/pep.py:84
+#: ../src/common/pep.py:85
 msgid "Moody"
 msgstr "Lynnig"
 
-#: ../src/common/pep.py:85
+#: ../src/common/pep.py:86
 msgid "Nervous"
 msgstr "Nervös"
 
-#: ../src/common/pep.py:86
+#: ../src/common/pep.py:87
 msgid "Neutral"
 msgstr "Neutral"
 
-#: ../src/common/pep.py:87
+#: ../src/common/pep.py:88
 msgid "Offended"
 msgstr "Förolämpad"
 
-#: ../src/common/pep.py:88
+#: ../src/common/pep.py:89
 msgid "Outraged"
 msgstr "Rasande"
 
-#: ../src/common/pep.py:89
+#: ../src/common/pep.py:90
 msgid "Playful"
 msgstr "Lekfull"
 
-#: ../src/common/pep.py:90
+#: ../src/common/pep.py:91
 msgid "Proud"
 msgstr "Stolt"
 
-#: ../src/common/pep.py:91
+#: ../src/common/pep.py:92
 msgid "Relaxed"
 msgstr "Avslappnad"
 
-#: ../src/common/pep.py:92
+#: ../src/common/pep.py:93
 msgid "Relieved"
 msgstr "Lättad"
 
-#: ../src/common/pep.py:93
+#: ../src/common/pep.py:94
 msgid "Remorseful"
 msgstr "Ångerfull"
 
-#: ../src/common/pep.py:94
+#: ../src/common/pep.py:95
 msgid "Restless"
 msgstr "Rastlös"
 
-#: ../src/common/pep.py:95
+#: ../src/common/pep.py:96
 msgid "Sad"
 msgstr "Ledsen"
 
-#: ../src/common/pep.py:96
+#: ../src/common/pep.py:97
 msgid "Sarcastic"
 msgstr "Sarkastisk"
 
-#: ../src/common/pep.py:97
+#: ../src/common/pep.py:98
 msgid "Satisfied"
 msgstr "Nöjd"
 
-#: ../src/common/pep.py:98
+#: ../src/common/pep.py:99
 msgid "Serious"
 msgstr "Seriös"
 
-#: ../src/common/pep.py:99
+#: ../src/common/pep.py:100
 msgid "Shocked"
 msgstr "Chockad"
 
-#: ../src/common/pep.py:100
+#: ../src/common/pep.py:101
 msgid "Shy"
 msgstr "Blyg"
 
-#: ../src/common/pep.py:101
+#: ../src/common/pep.py:102
 msgid "Sick"
 msgstr "Sjuk"
 
-#: ../src/common/pep.py:102
+#: ../src/common/pep.py:103
 msgid "Sleepy"
 msgstr "Sömning"
 
-#: ../src/common/pep.py:103
+#: ../src/common/pep.py:104
 msgid "Spontaneous"
 msgstr "Spontan"
 
-#: ../src/common/pep.py:104
+#: ../src/common/pep.py:105
 msgid "Stressed"
 msgstr "Stressad"
 
-#: ../src/common/pep.py:105
+#: ../src/common/pep.py:106
 msgid "Strong"
 msgstr "Stark"
 
-#: ../src/common/pep.py:106
+#: ../src/common/pep.py:107
 msgid "Surprised"
 msgstr "Överraskad"
 
-#: ../src/common/pep.py:107
+#: ../src/common/pep.py:108
 msgid "Thankful"
 msgstr "Tacksam"
 
-#: ../src/common/pep.py:108
+#: ../src/common/pep.py:109
 msgid "Thirsty"
 msgstr "Törstig"
 
-#: ../src/common/pep.py:109
+#: ../src/common/pep.py:110
 msgid "Tired"
 msgstr "Trött"
 
-#: ../src/common/pep.py:110
+#: ../src/common/pep.py:111
 msgid "Undefined"
 msgstr "Odefinierad"
 
-#: ../src/common/pep.py:111
+#: ../src/common/pep.py:112
 msgid "Weak"
 msgstr "Svag"
 
-#: ../src/common/pep.py:112
+#: ../src/common/pep.py:113
 msgid "Worried"
 msgstr "Bekymrad"
 
-#: ../src/common/pep.py:115
+#: ../src/common/pep.py:116
 #, fuzzy
 msgid "Doing Chores"
 msgstr "Fel Lösenfras"
 
-#: ../src/common/pep.py:116
+#: ../src/common/pep.py:117
 msgid "Buying Groceries"
 msgstr "Handlar mat"
 
-#: ../src/common/pep.py:117
+#: ../src/common/pep.py:118
 msgid "Cleaning"
 msgstr "Städar"
 
-#: ../src/common/pep.py:118
+#: ../src/common/pep.py:119
 msgid "Cooking"
 msgstr "Lagar mat"
 
-#: ../src/common/pep.py:119
+#: ../src/common/pep.py:120
 msgid "Doing Maintenance"
 msgstr "Reparerar"
 
-#: ../src/common/pep.py:120
+#: ../src/common/pep.py:121
 msgid "Doing the Dishes"
 msgstr "Diskar"
 
-#: ../src/common/pep.py:121
+#: ../src/common/pep.py:122
 msgid "Doing the Laundry"
 msgstr "Tvättar"
 
-#: ../src/common/pep.py:122
+#: ../src/common/pep.py:123
 msgid "Gardening"
 msgstr "Arbetar i trädgården"
 
-#: ../src/common/pep.py:123
+#: ../src/common/pep.py:124
 msgid "Running an Errand"
 msgstr "Springer ett ärende"
 
-#: ../src/common/pep.py:124
+#: ../src/common/pep.py:125
 msgid "Walking the Dog"
 msgstr "Ute och går med hunden"
 
-#: ../src/common/pep.py:125
+#: ../src/common/pep.py:126
 msgid "Drinking"
 msgstr "Dricker"
 
-#: ../src/common/pep.py:126
+#: ../src/common/pep.py:127
 msgid "Having a Beer"
 msgstr "Tar en öl"
 
-#: ../src/common/pep.py:127
+#: ../src/common/pep.py:128
 msgid "Having Coffee"
 msgstr "Dricker kaffe"
 
-#: ../src/common/pep.py:128
+#: ../src/common/pep.py:129
 msgid "Having Tea"
 msgstr "Dricker te"
 
-#: ../src/common/pep.py:130
+#: ../src/common/pep.py:131
 msgid "Having a Snack"
 msgstr "Tar ett mellanmål"
 
-#: ../src/common/pep.py:131
+#: ../src/common/pep.py:132
 msgid "Having Breakfast"
 msgstr "Äter frukost"
 
-#: ../src/common/pep.py:132
+#: ../src/common/pep.py:133
 msgid "Having Dinner"
 msgstr "Äter middag"
 
-#: ../src/common/pep.py:133
+#: ../src/common/pep.py:134
 msgid "Having Lunch"
 msgstr "Äter lunch"
 
-#: ../src/common/pep.py:134
+#: ../src/common/pep.py:135
 msgid "Exercising"
 msgstr "Tränar"
 
-#: ../src/common/pep.py:135 ../src/common/pep.py:180
+#: ../src/common/pep.py:136 ../src/common/pep.py:181
 msgid "Cycling"
 msgstr "Cyklar"
 
-#: ../src/common/pep.py:136
+#: ../src/common/pep.py:137
 msgid "Dancing"
 msgstr "Dansar"
 
-#: ../src/common/pep.py:137
+#: ../src/common/pep.py:138
 #, fuzzy
 msgid "Hiking"
 msgstr "Sparkar %s"
 
-#: ../src/common/pep.py:138
+#: ../src/common/pep.py:139
 msgid "Jogging"
 msgstr "Joggar"
 
-#: ../src/common/pep.py:139
+#: ../src/common/pep.py:140
 msgid "Playing Sports"
 msgstr "Sportar"
 
-#: ../src/common/pep.py:140
+#: ../src/common/pep.py:141
 msgid "Running"
 msgstr "Springer"
 
-#: ../src/common/pep.py:141
+#: ../src/common/pep.py:142
 msgid "Skiing"
 msgstr "Åker skidor"
 
-#: ../src/common/pep.py:142
+#: ../src/common/pep.py:143
 msgid "Swimming"
 msgstr "Simmar"
 
-#: ../src/common/pep.py:143
+#: ../src/common/pep.py:144
 msgid "Working out"
 msgstr "Tränar"
 
-#: ../src/common/pep.py:144
+#: ../src/common/pep.py:145
 #, fuzzy
 msgid "Grooming"
 msgstr "Från"
 
-#: ../src/common/pep.py:145
+#: ../src/common/pep.py:146
 msgid "At the Spa"
 msgstr "Njuter på ett spa"
 
-#: ../src/common/pep.py:146
+#: ../src/common/pep.py:147
 msgid "Brushing Teeth"
 msgstr "Borstar tänderna"
 
-#: ../src/common/pep.py:147
+#: ../src/common/pep.py:148
 msgid "Getting a Haircut"
 msgstr "Är hos frissan"
 
-#: ../src/common/pep.py:148
+#: ../src/common/pep.py:149
 msgid "Shaving"
 msgstr "Rakar sig"
 
-#: ../src/common/pep.py:149
+#: ../src/common/pep.py:150
 msgid "Taking a Bath"
 msgstr "Tar ett bad"
 
-#: ../src/common/pep.py:150
+#: ../src/common/pep.py:151
 msgid "Taking a Shower"
 msgstr "Tar en dusch"
 
-#: ../src/common/pep.py:151
+#: ../src/common/pep.py:152
 msgid "Having an Appointment"
 msgstr "I ett möte"
 
-#: ../src/common/pep.py:153
+#: ../src/common/pep.py:154
 msgid "Day Off"
 msgstr "Har en ledig dag"
 
-#: ../src/common/pep.py:154
+#: ../src/common/pep.py:155
 msgid "Hanging out"
 msgstr "Hänger"
 
-#: ../src/common/pep.py:155
+#: ../src/common/pep.py:156
 msgid "Hiding"
 msgstr "Gömmer sig"
 
-#: ../src/common/pep.py:156
+#: ../src/common/pep.py:157
 msgid "On Vacation"
 msgstr "På semester"
 
-#: ../src/common/pep.py:157
+#: ../src/common/pep.py:158
 msgid "Praying"
 msgstr "Ber"
 
-#: ../src/common/pep.py:158
+#: ../src/common/pep.py:159
 msgid "Scheduled Holiday"
 msgstr "Planerad ledighet"
 
-#: ../src/common/pep.py:160
+#: ../src/common/pep.py:161
 msgid "Thinking"
 msgstr "Tänker"
 
-#: ../src/common/pep.py:161
+#: ../src/common/pep.py:162
 msgid "Relaxing"
 msgstr "Slappar"
 
-#: ../src/common/pep.py:162
+#: ../src/common/pep.py:163
 msgid "Fishing"
 msgstr "Fiskar"
 
-#: ../src/common/pep.py:163
+#: ../src/common/pep.py:164
 msgid "Gaming"
 msgstr "Spelar"
 
-#: ../src/common/pep.py:164
+#: ../src/common/pep.py:165
 msgid "Going out"
 msgstr "Går ut"
 
-#: ../src/common/pep.py:165
+#: ../src/common/pep.py:166
 msgid "Partying"
 msgstr "Festar"
 
-#: ../src/common/pep.py:166
+#: ../src/common/pep.py:167
 msgid "Reading"
 msgstr "Läser"
 
-#: ../src/common/pep.py:167
+#: ../src/common/pep.py:168
 msgid "Rehearsing"
 msgstr "Pluggar"
 
-#: ../src/common/pep.py:168
+#: ../src/common/pep.py:169
 msgid "Shopping"
 msgstr "Handlar"
 
-#: ../src/common/pep.py:169
+#: ../src/common/pep.py:170
 msgid "Smoking"
 msgstr "Röker"
 
-#: ../src/common/pep.py:170
+#: ../src/common/pep.py:171
 msgid "Socializing"
 msgstr "Minglar"
 
-#: ../src/common/pep.py:171
+#: ../src/common/pep.py:172
 msgid "Sunbathing"
 msgstr "Solar"
 
-#: ../src/common/pep.py:172
+#: ../src/common/pep.py:173
 msgid "Watching TV"
 msgstr "Ser på tv"
 
-#: ../src/common/pep.py:173
+#: ../src/common/pep.py:174
 msgid "Watching a Movie"
 msgstr "Ser en film"
 
-#: ../src/common/pep.py:174
+#: ../src/common/pep.py:175
 msgid "Talking"
 msgstr "Pratar"
 
-#: ../src/common/pep.py:175
+#: ../src/common/pep.py:176
 msgid "In Real Life"
 msgstr "I verkliga livet"
 
-#: ../src/common/pep.py:176
+#: ../src/common/pep.py:177
 msgid "On the Phone"
 msgstr "Pratar i telefon"
 
-#: ../src/common/pep.py:177
+#: ../src/common/pep.py:178
 msgid "On Video Phone"
 msgstr "I ett videosamtal"
 
-#: ../src/common/pep.py:178
+#: ../src/common/pep.py:179
 msgid "Traveling"
 msgstr "Reser"
 
-#: ../src/common/pep.py:179
+#: ../src/common/pep.py:180
 msgid "Commuting"
 msgstr "Pendlar"
 
-#: ../src/common/pep.py:181
+#: ../src/common/pep.py:182
 msgid "Driving"
 msgstr "Kör bil"
 
-#: ../src/common/pep.py:182
+#: ../src/common/pep.py:183
 msgid "In a Car"
 msgstr "I en bil"
 
-#: ../src/common/pep.py:183
+#: ../src/common/pep.py:184
 msgid "On a Bus"
 msgstr "På en buss"
 
-#: ../src/common/pep.py:184
+#: ../src/common/pep.py:185
 msgid "On a Plane"
 msgstr "På ett flygplan"
 
-#: ../src/common/pep.py:185
+#: ../src/common/pep.py:186
 msgid "On a Train"
 msgstr "På ett tåg"
 
-#: ../src/common/pep.py:186
+#: ../src/common/pep.py:187
 msgid "On a Trip"
 msgstr "På resa"
 
-#: ../src/common/pep.py:187
+#: ../src/common/pep.py:188
 msgid "Walking"
 msgstr "Promenerar"
 
-#: ../src/common/pep.py:189
+#: ../src/common/pep.py:190
 msgid "Coding"
 msgstr "Programmerar"
 
-#: ../src/common/pep.py:190
+#: ../src/common/pep.py:191
 msgid "In a Meeting"
 msgstr "I ett möte"
 
-#: ../src/common/pep.py:191
+#: ../src/common/pep.py:192
 msgid "Studying"
 msgstr "Studerar"
 
-#: ../src/common/pep.py:192
+#: ../src/common/pep.py:193
 msgid "Writing"
 msgstr "Skriver"
 
@@ -5702,15 +5787,15 @@ msgstr ""
 "Värden %s som du konfigurerade som det avancerade alternativet "
 "ft_add_hosts_to_send är inte giltig, därför ignoreras den."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:216
+#: ../src/common/zeroconf/connection_zeroconf.py:218
 msgid "To continue sending and receiving messages, you will need to reconnect."
 msgstr "För att fortsätta skicka och ta emot meddelanden måste du återansluta."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 msgid "Avahi error"
 msgstr "Avahifel"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:239
+#: ../src/common/zeroconf/connection_zeroconf.py:241
 #, python-format
 msgid ""
 "%s\n"
@@ -5719,31 +5804,31 @@ msgstr ""
 "%s\n"
 "Link-local-meddelanden kanske inte fungerar korrekt."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:250
+#: ../src/common/zeroconf/connection_zeroconf.py:252
 msgid "Please check if Avahi or Bonjour is installed."
 msgstr "Kontrollera om Avahi eller Bonjour är installerat."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:259
-#: ../src/common/zeroconf/connection_zeroconf.py:263
+#: ../src/common/zeroconf/connection_zeroconf.py:261
+#: ../src/common/zeroconf/connection_zeroconf.py:265
 msgid "Could not start local service"
 msgstr "Kunde inte starta lokal tjänst"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:260
+#: ../src/common/zeroconf/connection_zeroconf.py:262
 #, python-format
 msgid "Unable to bind to port %d."
 msgstr "Kunde inte binda till port %d."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:264
-#: ../src/common/zeroconf/connection_zeroconf.py:359
+#: ../src/common/zeroconf/connection_zeroconf.py:266
+#: ../src/common/zeroconf/connection_zeroconf.py:361
 msgid "Please check if avahi-daemon is running."
 msgstr "Kontrollera om avahi-daemon körs."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:358
+#: ../src/common/zeroconf/connection_zeroconf.py:360
 #, python-format
 msgid "Could not change status of account \"%s\""
 msgstr "Kunde inte ändra status för kontot \"%s\""
 
-#: ../src/common/zeroconf/connection_zeroconf.py:381
+#: ../src/common/zeroconf/connection_zeroconf.py:383
 msgid ""
 "You are not connected or not visible to others. Your message could not be "
 "sent."
@@ -5752,57 +5837,49 @@ msgstr ""
 "skickas."
 
 #. we're not english
-#: ../src/common/zeroconf/connection_zeroconf.py:399
+#: ../src/common/zeroconf/connection_zeroconf.py:401
 msgid "[This message is encrypted]"
 msgstr "[Det här meddelandet är krypterat]"
 
-#: ../src/common/zeroconf/connection_zeroconf.py:483
+#: ../src/common/zeroconf/connection_zeroconf.py:485
 msgid "Your message could not be sent."
 msgstr "Ditt meddelande kunde inte skickas."
 
 #. Contact Offline
-#: ../src/common/zeroconf/connection_zeroconf.py:489
+#: ../src/common/zeroconf/connection_zeroconf.py:491
 msgid "Contact is offline. Your message could not be sent."
 msgstr "Kontakten är nerkopplad. Ditt meddelande kunde inte skickas."
 
-#: ../src/common/zeroconf/connection_zeroconf.py:586
+#: ../src/common/zeroconf/connection_zeroconf.py:590
 msgid ""
 "Connection to host could not be established: Timeout while sending data."
 msgstr ""
 "Anslutning till värd kunde inte etableras: Timeout medan data skickades."
 
-#: ../src/common/zeroconf/zeroconf_avahi.py:183
+#: ../src/common/zeroconf/zeroconf_avahi.py:192
 #: ../src/common/zeroconf/zeroconf_bonjour.py:191
 #, python-format
 msgid "Error while adding service. %s"
 msgstr "Fel när tjänsten lades till. %s"
 
-#: ../src/config.py:151 ../src/config.py:602
+#: ../src/config.py:151 ../src/config.py:595
 msgid "Disabled"
 msgstr "Avstängd"
 
-#: ../src/config.py:392
+#: ../src/config.py:394
 msgid "Default Message"
 msgstr "Standardmeddelande"
 
-#: ../src/config.py:399
+#: ../src/config.py:403
 msgid "Enabled"
 msgstr "Aktiverad"
 
-#: ../src/config.py:441
-msgid "Always use OS/X default applications"
-msgstr "Använd alltid OS/X standardprogram"
-
-#: ../src/config.py:442
-msgid "Custom"
-msgstr "Anpassad"
-
-#: ../src/config.py:668 ../src/dialogs.py:1196
+#: ../src/config.py:661 ../src/dialogs.py:1305
 #, python-format
 msgid "Dictionary for lang %s not available"
 msgstr "Ordbok för språket %s inte tillgängligt"
 
-#: ../src/config.py:669
+#: ../src/config.py:662
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -5811,207 +5888,207 @@ msgstr ""
 "Du måste installera %s ordboken för att använda stavningskontroll, eller "
 "välj ett annat språk genom att sätta valet speller_language"
 
-#: ../src/config.py:1046
+#: ../src/config.py:1038
 msgid "status message title"
 msgstr "titel för statusmeddelande"
 
-#: ../src/config.py:1046
+#: ../src/config.py:1038
 msgid "status message text"
 msgstr "text för statusmeddelande"
 
 #. Name column
-#: ../src/config.py:1326 ../src/dialogs.py:1823 ../src/dialogs.py:1887
-#: ../src/disco.py:771 ../src/disco.py:1563 ../src/disco.py:1809
-#: ../src/history_window.py:87
+#: ../src/config.py:1306 ../src/dialogs.py:2058 ../src/dialogs.py:2122
+#: ../src/dialogs.py:2815 ../src/disco.py:773 ../src/disco.py:1568
+#: ../src/disco.py:1854 ../src/history_window.py:87
 msgid "Name"
 msgstr "Namn"
 
-#: ../src/config.py:1412
+#: ../src/config.py:1392
 msgid "Relogin now?"
 msgstr "Återanslut nu?"
 
-#: ../src/config.py:1413
+#: ../src/config.py:1393
 msgid "If you want all the changes to apply instantly, you must relogin."
 msgstr "Om du vill att ändringarna skall ske omedelbart måste du återansluta."
 
-#: ../src/config.py:1538 ../src/config.py:1639
+#: ../src/config.py:1521 ../src/config.py:1643
 msgid "OpenPGP is not usable on this computer"
 msgstr "OpenPGP är inte användbar på den här datorn"
 
-#: ../src/config.py:1675 ../src/config.py:1718
+#: ../src/config.py:1679 ../src/config.py:1724
 msgid "Unread events"
 msgstr "Olästa händelser"
 
-#: ../src/config.py:1676
+#: ../src/config.py:1680
 msgid "Read all pending events before removing this account."
 msgstr "Läs alla väntande händelser innan du tar bort detta konto."
 
-#: ../src/config.py:1702
+#: ../src/config.py:1706
 #, python-format
 msgid "You have opened chat in account %s"
 msgstr "Du har öppnat chatt i kontot %s"
 
-#: ../src/config.py:1703
+#: ../src/config.py:1707
 msgid "All chat and groupchat windows will be closed. Do you want to continue?"
 msgstr "Alla chatts- och gruppchattsfönster kommer stängas. Vill du fortsätta?"
 
-#: ../src/config.py:1714
+#: ../src/config.py:1720
 msgid "You are currently connected to the server"
 msgstr "Du är för närvarande ansluten till servern"
 
-#: ../src/config.py:1715
+#: ../src/config.py:1721
 msgid "To change the account name, you must be disconnected."
 msgstr "För att ändra kontonamnet måste du vara frånkopplad"
 
-#: ../src/config.py:1719
+#: ../src/config.py:1725
 msgid "To change the account name, you must read all pending events."
 msgstr "För att ändra kontonamnet måste du läsa alla väntande händelser."
 
-#: ../src/config.py:1725
+#: ../src/config.py:1731
 msgid "Account Name Already Used"
 msgstr "Kontonamn används redan"
 
-#: ../src/config.py:1726
+#: ../src/config.py:1732
 msgid ""
 "This name is already used by another of your accounts. Please choose another "
 "name."
 msgstr ""
 "Detta namn används redan av ett annat av dina konton. Välj ett annat namn."
 
-#: ../src/config.py:1730 ../src/config.py:1734
+#: ../src/config.py:1736 ../src/config.py:1740
 msgid "Invalid account name"
 msgstr "Ogiltigt kontonamn"
 
-#: ../src/config.py:1731
+#: ../src/config.py:1737
 msgid "Account name cannot be empty."
 msgstr "Kontonamnet kan inte vara tomt."
 
-#: ../src/config.py:1735
+#: ../src/config.py:1741
 msgid "Account name cannot contain spaces."
 msgstr "Kontonamnet kan inte innehålla mellanslag."
 
-#: ../src/config.py:1810
+#: ../src/config.py:1816
 msgid "Rename Account"
 msgstr "Byt namn på konto"
 
-#: ../src/config.py:1811
+#: ../src/config.py:1817
 #, python-format
 msgid "Enter a new name for account %s"
 msgstr "Ange ett nytt namn för kontot %s"
 
-#: ../src/config.py:1838
+#: ../src/config.py:1845
 msgid "A Jabber ID must be in the form \"user@servername\"."
 msgstr "Ett Jabber-ID måste vara av formen \"användare@servernamn\"."
 
-#: ../src/config.py:2028 ../src/config.py:3177
+#: ../src/config.py:2053 ../src/config.py:3237
 msgid "Invalid entry"
 msgstr "Ogiltig post"
 
-#: ../src/config.py:2029 ../src/config.py:3178
+#: ../src/config.py:2054 ../src/config.py:3238
 msgid "Custom port must be a port number."
 msgstr "Inställd port måste vara ett portnummer."
 
-#: ../src/config.py:2050
+#: ../src/config.py:2075
 msgid "Failed to get secret keys"
 msgstr "Lyckades inte hämta hemliga nycklar"
 
-#: ../src/config.py:2051
+#: ../src/config.py:2076
 msgid "There was a problem retrieving your OpenPGP secret keys."
 msgstr "Det uppstod problem när dina hemliga OpenPGP-nycklar skulle hämtas."
 
-#: ../src/config.py:2086
+#: ../src/config.py:2111
 msgid "OpenPGP Key Selection"
 msgstr "Val av OpenPGP-nyckel"
 
-#: ../src/config.py:2087
+#: ../src/config.py:2112
 msgid "Choose your OpenPGP key"
 msgstr "Välj din OpenPGP-nyckel"
 
-#: ../src/config.py:2094
+#: ../src/config.py:2119
 msgid "No such account available"
 msgstr "Inget sådant konto tillgängligt"
 
-#: ../src/config.py:2095
+#: ../src/config.py:2120
 msgid "You must create your account before editing your personal information."
 msgstr ""
 "Du måste skapa ditt konto innan du redigerar din personliga information."
 
-#: ../src/config.py:2102 ../src/dialogs.py:1675 ../src/dialogs.py:1811
-#: ../src/dialogs.py:1990 ../src/disco.py:439 ../src/profile_window.py:317
+#: ../src/config.py:2127 ../src/dialogs.py:1910 ../src/dialogs.py:2046
+#: ../src/dialogs.py:2225 ../src/disco.py:441 ../src/profile_window.py:317
 msgid "You are not connected to the server"
 msgstr "Du är inte ansluten till servern"
 
-#: ../src/config.py:2103
+#: ../src/config.py:2128
 msgid "Without a connection, you can not edit your personal information."
 msgstr "Du kan inte redigera din personliga information utan en anslutning."
 
-#: ../src/config.py:2107
+#: ../src/config.py:2132
 msgid "Your server doesn't support Vcard"
 msgstr "Din server saknar stöd för Vcard"
 
-#: ../src/config.py:2108
+#: ../src/config.py:2133
 msgid "Your server can't save your personal information."
 msgstr "Din server kan inte spara din personliga information."
 
-#: ../src/config.py:2139
+#: ../src/config.py:2164
 msgid "Account Local already exists."
 msgstr "Kontot Local används redan."
 
-#: ../src/config.py:2140
+#: ../src/config.py:2165
 msgid "Please rename or remove it before enabling link-local messaging."
 msgstr "Byt namn eller ta bort det innan du aktiverar link-local-meddelanden."
 
-#: ../src/config.py:2323
+#: ../src/config.py:2348
 #, python-format
 msgid "Edit %s"
 msgstr "Redigera %s"
 
-#: ../src/config.py:2325
+#: ../src/config.py:2350
 #, python-format
 msgid "Register to %s"
 msgstr "Registrera till %s"
 
 #. list at the beginning
-#: ../src/config.py:2361
+#: ../src/config.py:2386
 msgid "Ban List"
 msgstr "Bannlista"
 
-#: ../src/config.py:2362
+#: ../src/config.py:2387
 msgid "Member List"
 msgstr "Medlemslista"
 
-#: ../src/config.py:2363
+#: ../src/config.py:2388
 msgid "Owner List"
 msgstr "Ägarlista"
 
-#: ../src/config.py:2364
+#: ../src/config.py:2389
 msgid "Administrator List"
 msgstr "Administratörslista"
 
 #. Address column
 #. holds JID (who said this)
-#: ../src/config.py:2413 ../src/disco.py:778 ../src/history_manager.py:183
+#: ../src/config.py:2438 ../src/disco.py:780 ../src/history_manager.py:208
 msgid "JID"
 msgstr "JID"
 
-#: ../src/config.py:2423
+#: ../src/config.py:2448
 msgid "Reason"
 msgstr "Anledning"
 
-#: ../src/config.py:2430
+#: ../src/config.py:2455
 msgid "Nick"
 msgstr "Smeknamn"
 
-#: ../src/config.py:2436
+#: ../src/config.py:2461
 msgid "Role"
 msgstr "Roll"
 
-#: ../src/config.py:2463
+#: ../src/config.py:2488
 msgid "Banning..."
 msgstr "Bannlyser..."
 
 #. You can move '\n' before user@domain if that line is TOO BIG
-#: ../src/config.py:2465
+#: ../src/config.py:2490
 msgid ""
 "<b>Whom do you want to ban?</b>\n"
 "\n"
@@ -6019,11 +6096,11 @@ msgstr ""
 "<b>Vem vill du bannlysa?</b>\n"
 "\n"
 
-#: ../src/config.py:2467
+#: ../src/config.py:2492
 msgid "Adding Member..."
 msgstr "Lägger till medlem..."
 
-#: ../src/config.py:2468
+#: ../src/config.py:2493
 msgid ""
 "<b>Whom do you want to make a member?</b>\n"
 "\n"
@@ -6031,11 +6108,11 @@ msgstr ""
 "<b>Vem vill du göra till medlem?</b>\n"
 "\n"
 
-#: ../src/config.py:2470
+#: ../src/config.py:2495
 msgid "Adding Owner..."
 msgstr "Lägger till ägare..."
 
-#: ../src/config.py:2471
+#: ../src/config.py:2496
 msgid ""
 "<b>Whom do you want to make an owner?</b>\n"
 "\n"
@@ -6043,11 +6120,11 @@ msgstr ""
 "<b>Vem vill du göra till ägare?</b>\n"
 "\n"
 
-#: ../src/config.py:2473
+#: ../src/config.py:2498
 msgid "Adding Administrator..."
 msgstr "Lägger till administratör..."
 
-#: ../src/config.py:2474
+#: ../src/config.py:2499
 msgid ""
 "<b>Whom do you want to make an administrator?</b>\n"
 "\n"
@@ -6055,14 +6132,15 @@ msgstr ""
 "<b>Vem vill du göra till administratör?</b>\n"
 "\n"
 
-#: ../src/config.py:2475
+#: ../src/config.py:2500
+#, fuzzy
 msgid ""
 "Can be one of the following:\n"
 "1. user@domain/resource (only that resource matches).\n"
 "2. user@domain (any resource matches).\n"
 "3. domain/resource (only that resource matches).\n"
 "4. domain (the domain itself matches, as does any user@domain,\n"
-"domain/resource, or address containing a subdomain."
+"domain/resource, or address containing a subdomain)."
 msgstr ""
 "Kan vara en av följande:\n"
 "1. användare@domän/resurs (endast den resursen matchar)\n"
@@ -6071,86 +6149,90 @@ msgstr ""
 "4. domän (domänen i sig matchar, så gör även alla användare@domän,\n"
 "domän/resurs, eller adress som innehåller en underdomän."
 
-#: ../src/config.py:2572
+#: ../src/config.py:2597
 #, python-format
 msgid "Removing %s account"
 msgstr "Tar bort %s konto"
 
-#: ../src/config.py:2594 ../src/gajim.py:1482 ../src/gajim.py:1569
+#: ../src/config.py:2619 ../src/gajim.py:1465 ../src/gajim.py:1557
 msgid "Password Required"
 msgstr "Lösenord krävs"
 
-#. ('PASSWORD_REQUIRED', account, None)
-#: ../src/config.py:2595 ../src/gajim.py:1552
+#: ../src/config.py:2620 ../src/gajim.py:1537
 #, python-format
 msgid "Enter your password for account %s"
 msgstr "Ange ditt lösenord för kontot %s"
 
-#: ../src/config.py:2596 ../src/gajim.py:1569
+#: ../src/config.py:2621 ../src/gajim.py:1557
 msgid "Save password"
 msgstr "Spara lösenord"
 
-#: ../src/config.py:2605
+#: ../src/config.py:2630
 #, python-format
 msgid "Account \"%s\" is connected to the server"
 msgstr "Konto \"%s\" är anslutet till servern"
 
-#: ../src/config.py:2606
+#: ../src/config.py:2631
 msgid "If you remove it, the connection will be lost."
 msgstr "Om du tar bort det kommer anslutningen att förloras."
 
-#: ../src/config.py:2702
+#: ../src/config.py:2729
 msgid "Default"
 msgstr "Standard"
 
-#: ../src/config.py:2702
+#: ../src/config.py:2729
 msgid "?print_status:All"
 msgstr "?print_status:Alla"
 
-#: ../src/config.py:2703
+#: ../src/config.py:2730
 msgid "Enter and leave only"
 msgstr "In- och utgång enbart"
 
-#: ../src/config.py:2704
+#: ../src/config.py:2731
 msgid "?print_status:None"
 msgstr "?print_status:Ingen"
 
-#: ../src/config.py:2772
+#: ../src/config.py:2799
 msgid "New Group Chat"
 msgstr "Ny gruppchatt"
 
-#: ../src/config.py:2805
+#: ../src/config.py:2832
 msgid "This bookmark has invalid data"
 msgstr "Det här bokmärket har ogiltig data"
 
-#: ../src/config.py:2806
+#: ../src/config.py:2833
 msgid ""
 "Please be sure to fill out server and room fields or remove this bookmark."
 msgstr ""
 "Var säker på att fylla i server- och rumfälten eller ta bort det här "
 "bokmärket."
 
-#: ../src/config.py:3088
-msgid "Invalid username"
-msgstr "Ogiltigt användarnamn"
+#. invalid char
+#. Invalid Nickname
+#: ../src/config.py:2951 ../src/dialogs.py:1722
+#: ../src/groupchat_control.py:1471
+msgid "Invalid nickname"
+msgstr "Ogiltigt smeknamn"
 
-#: ../src/config.py:3090
-msgid "You must provide a username to configure this account."
-msgstr "Du behöver ange ett användarnamn för att konfigurera detta konto."
+#: ../src/config.py:2952 ../src/config.py:2966 ../src/config.py:2980
+#, fuzzy
+msgid "Character not allowed"
+msgstr "Smeknamnet tillåts inte: %s"
 
-#: ../src/config.py:3116
-msgid "Duplicate Jabber ID"
-msgstr "Dubblerat Jabber-ID"
+#: ../src/config.py:2965 ../src/config.py:3213
+msgid "Invalid server"
+msgstr "Ogiltig server"
 
-#: ../src/config.py:3117
-msgid "This account is already configured in Gajim."
-msgstr "Detta kontot är redan konfigurerat i Gajim."
+#: ../src/config.py:2979
+#, fuzzy
+msgid "Invalid room"
+msgstr "Ogiltig post"
 
-#: ../src/config.py:3134
+#: ../src/config.py:3130
 msgid "Account has been added successfully"
 msgstr "Kontot har lagts till"
 
-#: ../src/config.py:3135 ../src/config.py:3326
+#: ../src/config.py:3131 ../src/config.py:3137
 #, fuzzy
 msgid ""
 "You can set advanced account options by pressing the Advanced button, or "
@@ -6160,24 +6242,32 @@ msgstr ""
 "Du kan ställa in avancerade alternativ genom att trycka på \"Avancerat\", "
 "eller senare genom att använda \"Redigera->Konton\" från huvudfönstret."
 
-#: ../src/config.py:3153
-msgid "Invalid server"
-msgstr "Ogiltig server"
+#: ../src/config.py:3136
+msgid "Your new account has been created successfully"
+msgstr "Ditt nya konto har skapats"
+
+#: ../src/config.py:3174
+msgid "Invalid username"
+msgstr "Ogiltigt användarnamn"
 
-#: ../src/config.py:3154
+#: ../src/config.py:3176
+msgid "You must provide a username to configure this account."
+msgstr "Du behöver ange ett användarnamn för att konfigurera detta konto."
+
+#: ../src/config.py:3214
 msgid "Please provide a server on which you want to register."
 msgstr "Ange en server på vilken du vill registrera."
 
-#: ../src/config.py:3205 ../src/gajim.py:2102
+#: ../src/config.py:3270 ../src/gajim.py:2107
 msgid "Certificate Already in File"
 msgstr "Certifikatet finns redan i filen"
 
-#: ../src/config.py:3206 ../src/gajim.py:2103
+#: ../src/config.py:3271 ../src/gajim.py:2108
 #, python-format
 msgid "This certificate is already in file %s, so it's not added again."
 msgstr ""
 
-#: ../src/config.py:3274
+#: ../src/config.py:3339
 #, python-format
 msgid ""
 "<b>Security Warning</b>\n"
@@ -6192,7 +6282,7 @@ msgstr ""
 "SSL-fel: %(error)s\n"
 "Vill du fortfarande ansluta till denna server?"
 
-#: ../src/config.py:3280 ../src/gajim.py:2127
+#: ../src/config.py:3345 ../src/gajim.py:2132
 #, python-format
 msgid ""
 "Add this certificate to the list of trusted certificates.\n"
@@ -6203,74 +6293,70 @@ msgstr ""
 "SHA1-fingeravtryck för certifikatet:\n"
 "%s"
 
-#: ../src/config.py:3305 ../src/config.py:3346
+#: ../src/config.py:3370 ../src/config.py:3393
 msgid "An error occurred during account creation"
 msgstr "Ett fel uppstod när kontot skapades"
 
-#: ../src/config.py:3325
-msgid "Your new account has been created successfully"
-msgstr "Ditt nya konto har skapats"
-
-#: ../src/config.py:3430
+#: ../src/config.py:3460
 msgid "Account name is in use"
 msgstr "Kontonamnet används redan"
 
-#: ../src/config.py:3431
+#: ../src/config.py:3461
 msgid "You already have an account using this name."
 msgstr "Du har redan ett konto med det namnet."
 
-#: ../src/config.py:3584
+#: ../src/config.py:3614
 msgid "Active"
 msgstr "Aktiv"
 
-#: ../src/config.py:3592
+#: ../src/config.py:3622
 msgid "Event"
 msgstr "Händelse"
 
-#: ../src/config.py:3627
+#: ../src/config.py:3657
 msgid "First Message Received"
 msgstr "Första meddelandet mottaget"
 
-#: ../src/config.py:3628
+#: ../src/config.py:3658
 msgid "Next Message Received Focused"
 msgstr "Nästa meddelande blev fokuserat"
 
-#: ../src/config.py:3630
+#: ../src/config.py:3660
 msgid "Next Message Received Unfocused"
 msgstr "Nästa meddelande blev ofokuserat"
 
-#: ../src/config.py:3631
+#: ../src/config.py:3661
 msgid "Contact Connected"
 msgstr "Kontakt loggade in"
 
-#: ../src/config.py:3632
+#: ../src/config.py:3662
 msgid "Contact Disconnected"
 msgstr "Kontakt loggade ut"
 
-#: ../src/config.py:3633
+#: ../src/config.py:3663
 msgid "Message Sent"
 msgstr "Meddelande skickat"
 
-#: ../src/config.py:3634
+#: ../src/config.py:3664
 msgid "Group Chat Message Highlight"
 msgstr "Meddelande markerat i gruppchatt"
 
-#: ../src/config.py:3635
+#: ../src/config.py:3665
 msgid "Group Chat Message Received"
 msgstr "Meddelande mottaget i gruppchatt"
 
-#: ../src/config.py:3636
+#: ../src/config.py:3666
 msgid "GMail Email Received"
 msgstr "E-post mottaget på GMail"
 
-#: ../src/conversation_textview.py:560
+#: ../src/conversation_textview.py:570
 msgid ""
 "This icon indicates that this message has not yet\n"
 "been received by the remote end. If this icon stays\n"
 "for a long time, it's likely the message got lost."
 msgstr ""
 
-#: ../src/conversation_textview.py:579
+#: ../src/conversation_textview.py:589
 #, fuzzy
 msgid ""
 "Text below this line is what has been said since the\n"
@@ -6279,69 +6365,74 @@ msgstr ""
 "Texten under denna linje är vad som har sagts sedan du senast hade fokus på "
 "denna gruppchatt"
 
-#: ../src/conversation_textview.py:689
+#: ../src/conversation_textview.py:702
+#, fuzzy
+msgid "_Quote"
+msgstr "A_vsluta"
+
+#: ../src/conversation_textview.py:709
 #, python-format
 msgid "_Actions for \"%s\""
 msgstr "_Åtgärder för \"%s\""
 
-#: ../src/conversation_textview.py:701
+#: ../src/conversation_textview.py:721
 msgid "Read _Wikipedia Article"
 msgstr "Läs _Wikipedia Artikel"
 
-#: ../src/conversation_textview.py:706
+#: ../src/conversation_textview.py:726
 msgid "Look it up in _Dictionary"
 msgstr "Kolla upp det i _Uppslagsbok"
 
-#: ../src/conversation_textview.py:723
+#: ../src/conversation_textview.py:743
 #, python-format
 msgid "Dictionary URL is missing an \"%s\" and it is not WIKTIONARY"
 msgstr "URL för uppslagsbok saknar ett \"%s\" och det är inte en WIKTIONARY"
 
 #. we must have %s in the url
-#: ../src/conversation_textview.py:736
+#: ../src/conversation_textview.py:756
 #, python-format
 msgid "Web Search URL is missing an \"%s\""
 msgstr "URL för webbsökning saknar ett \"%s\""
 
-#: ../src/conversation_textview.py:739
+#: ../src/conversation_textview.py:759
 msgid "Web _Search for it"
 msgstr "_Sök på webben efter det"
 
-#: ../src/conversation_textview.py:745
+#: ../src/conversation_textview.py:765
 msgid "Open as _Link"
 msgstr "Öppna som _länk"
 
-#: ../src/conversation_textview.py:1199
+#: ../src/conversation_textview.py:1221
 msgid "Yesterday"
 msgstr "Igår"
 
 #. the number is >= 2
 #. %i is day in year (1-365), %d (1-31) we want %i
-#: ../src/conversation_textview.py:1203
+#: ../src/conversation_textview.py:1225
 #, python-format
 msgid "%i days ago"
 msgstr "%i dagar sen"
 
 #. if we have subject, show it too!
-#: ../src/conversation_textview.py:1237
+#: ../src/conversation_textview.py:1259
 #, python-format
 msgid "Subject: %s\n"
 msgstr "Ämne: %s\n"
 
-#: ../src/dataforms_widget.py:607
+#: ../src/dataforms_widget.py:541
 msgid "Jabber ID already in list"
 msgstr "Jabber-ID finns redan i listan"
 
-#: ../src/dataforms_widget.py:608
+#: ../src/dataforms_widget.py:542
 msgid "The Jabber ID you entered is already in the list. Choose another one."
 msgstr ""
 
 #. Default jid
-#: ../src/dataforms_widget.py:619
+#: ../src/dataforms_widget.py:553
 msgid "new@jabber.id"
 msgstr "ny@jabber.id"
 
-#: ../src/dataforms_widget.py:622 ../src/dataforms_widget.py:624
+#: ../src/dataforms_widget.py:556 ../src/dataforms_widget.py:558
 #, python-format
 msgid "new%d@jabber.id"
 msgstr "ny%d@jabber.id"
@@ -6364,131 +6455,131 @@ msgstr "Grupp"
 msgid "In the group"
 msgstr "I gruppen"
 
-#: ../src/dialogs.py:276
+#: ../src/dialogs.py:277
 msgid "KeyID"
 msgstr "Nyckel-ID"
 
-#: ../src/dialogs.py:281
+#: ../src/dialogs.py:282
 msgid "Contact name"
 msgstr "Kontaktnamn"
 
-#: ../src/dialogs.py:457
+#: ../src/dialogs.py:454
 msgid "Set Mood"
 msgstr "Ange humör"
 
-#: ../src/dialogs.py:545
+#: ../src/dialogs.py:537
 #, python-format
 msgid "%s Status Message"
 msgstr "Statusmeddelande för %s"
 
-#: ../src/dialogs.py:547
+#: ../src/dialogs.py:551
 msgid "Status Message"
 msgstr "Statusmeddelande"
 
-#: ../src/dialogs.py:659
+#: ../src/dialogs.py:750
 msgid "Overwrite Status Message?"
 msgstr "Skriv över statusmeddelande?"
 
-#: ../src/dialogs.py:660
+#: ../src/dialogs.py:751
 #, fuzzy
 msgid ""
 "This name is already used. Do you want to overwrite this status message?"
 msgstr ""
 "Detta namn används redan av ett annat av dina konton. Välj ett annat namn."
 
-#: ../src/dialogs.py:669
+#: ../src/dialogs.py:759
 msgid "Save as Preset Status Message"
 msgstr "Spara som Valbart Statusmeddelande"
 
-#: ../src/dialogs.py:670
+#: ../src/dialogs.py:760
 msgid "Please type a name for this status message"
 msgstr "Ange ett namn för detta statusmeddelande"
 
-#: ../src/dialogs.py:676
+#: ../src/dialogs.py:785
 msgid "AIM Address:"
 msgstr "AIM-adress:"
 
-#: ../src/dialogs.py:677
+#: ../src/dialogs.py:786
 msgid "GG Number:"
 msgstr "GG-nummer:"
 
-#: ../src/dialogs.py:678
+#: ../src/dialogs.py:787
 msgid "ICQ Number:"
 msgstr "ICQ-nummer:"
 
-#: ../src/dialogs.py:679
+#: ../src/dialogs.py:788
 msgid "MSN Address:"
 msgstr "MSN-adress:"
 
-#: ../src/dialogs.py:680
+#: ../src/dialogs.py:789
 msgid "Yahoo! Address:"
 msgstr "Yahoo!-adress:"
 
-#: ../src/dialogs.py:716
+#: ../src/dialogs.py:825
 #, python-format
 msgid "Please fill in the data of the contact you want to add in account %s"
 msgstr "Fyll i informationen om kontakten du vill lägga till i konto %s"
 
-#: ../src/dialogs.py:718
+#: ../src/dialogs.py:827
 msgid "Please fill in the data of the contact you want to add"
 msgstr "Fyll i informationen om kontakten du vill lägga till"
 
-#: ../src/dialogs.py:875 ../src/dialogs.py:881 ../src/dialogs.py:886
+#: ../src/dialogs.py:984 ../src/dialogs.py:990 ../src/dialogs.py:995
 msgid "Invalid User ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:882
+#: ../src/dialogs.py:991
 msgid "The user ID must not contain a resource."
 msgstr "Användarens ID får inte innehålla en resurs."
 
-#: ../src/dialogs.py:887
+#: ../src/dialogs.py:996
 msgid "You cannot add yourself to your roster."
 msgstr "Du kan inte lägga till dig själv i din kontaktlista."
 
-#: ../src/dialogs.py:901
+#: ../src/dialogs.py:1010
 msgid "Contact already in roster"
 msgstr "Kontakten finns redan i kontaktlistan"
 
-#: ../src/dialogs.py:902
+#: ../src/dialogs.py:1011
 msgid "This contact is already listed in your roster."
 msgstr "Denna kontakt finns redan i din kontaktlista."
 
-#: ../src/dialogs.py:938
+#: ../src/dialogs.py:1047
 msgid "User ID:"
 msgstr "Användar-id:"
 
-#: ../src/dialogs.py:996
+#: ../src/dialogs.py:1105
 msgid "A GTK+ jabber client"
 msgstr "En GTK+ jabberklient"
 
-#: ../src/dialogs.py:997
+#: ../src/dialogs.py:1106
 msgid "GTK+ Version:"
 msgstr "GTK+ version:"
 
-#: ../src/dialogs.py:998
+#: ../src/dialogs.py:1107
 msgid "PyGTK Version:"
 msgstr "PyGTK version:"
 
-#: ../src/dialogs.py:1008
+#: ../src/dialogs.py:1117
 msgid "Current Developers:"
 msgstr "Nuvarande utvecklare:"
 
-#: ../src/dialogs.py:1010
+#: ../src/dialogs.py:1119
 msgid "Past Developers:"
 msgstr "Tidigare utvecklare:"
 
-#: ../src/dialogs.py:1016
+#: ../src/dialogs.py:1125
 msgid "THANKS:"
 msgstr "TACK:"
 
 #. remove one english sentence
 #. and add it manually as translatable
-#: ../src/dialogs.py:1022
+#: ../src/dialogs.py:1131
 msgid "Last but not least, we would like to thank all the package maintainers."
 msgstr "Sist men inte minst vill vi tacka alla anvsraiga paketerare."
 
 #. here you write your name in the form Name FamilyName <someone@somewhere>
-#: ../src/dialogs.py:1035
+#: ../src/dialogs.py:1144
 msgid "translator-credits"
 msgstr ""
 "Daniel Nylander <po@danielnylander.se>\n"
@@ -6498,7 +6589,7 @@ msgstr ""
 "Skicka synpunkter på översättningen till\n"
 "<tp-sv@listor.tp-sv.se>."
 
-#: ../src/dialogs.py:1197
+#: ../src/dialogs.py:1306
 #, python-format
 msgid ""
 "You have to install %s dictionary to use spellchecking, or choose another "
@@ -6511,90 +6602,90 @@ msgstr ""
 "\n"
 "Markeringsfunktionen för felstavade ord kommer inte att användas"
 
-#: ../src/dialogs.py:1601
+#: ../src/dialogs.py:1723 ../src/dialogs.py:2002
+#: ../src/groupchat_control.py:1472
+msgid "The nickname has not allowed characters."
+msgstr "Smeknamnet innehåller icke-tillåtna tecken."
+
+#: ../src/dialogs.py:1835
 #, python-format
 msgid "Subscription request for account %(account)s from %(jid)s"
 msgstr "Prenumerationsbegäran för kontot %(account)s från %(jid)s"
 
-#: ../src/dialogs.py:1604
+#: ../src/dialogs.py:1838
 #, python-format
 msgid "Subscription request from %s"
 msgstr "Prenumerationsförfrågan från %s"
 
-#: ../src/dialogs.py:1668 ../src/gajim.py:2767
+#: ../src/dialogs.py:1903 ../src/gajim.py:2780
 #, python-format
 msgid "You are already in group chat %s"
 msgstr "Du är redan i gruppchatten %s"
 
-#: ../src/dialogs.py:1676
+#: ../src/dialogs.py:1911
 msgid "You can not join a group chat unless you are connected."
 msgstr "Du kan inte gå med i en gruppchatt utan att vara ansluten."
 
-#: ../src/dialogs.py:1695
+#: ../src/dialogs.py:1930
 #, python-format
 msgid "Join Group Chat with account %s"
 msgstr "Anslut till gruppchatt med konto %s"
 
-#: ../src/dialogs.py:1766
+#: ../src/dialogs.py:2001
 msgid "Invalid Nickname"
 msgstr "Ogiltigt smeknamn"
 
-#: ../src/dialogs.py:1767 ../src/groupchat_control.py:1455
-#: ../src/groupchat_control.py:1738
-msgid "The nickname has not allowed characters."
-msgstr "Smeknamnet innehåller icke-tillåtna tecken."
-
-#: ../src/dialogs.py:1771 ../src/dialogs.py:1777
-#: ../src/groupchat_control.py:1908
+#: ../src/dialogs.py:2006 ../src/dialogs.py:2012
+#: ../src/groupchat_control.py:1970
 #, fuzzy
 msgid "Invalid group chat Jabber ID"
 msgstr "Ogiltigt Jabber-ID"
 
-#: ../src/dialogs.py:1772 ../src/dialogs.py:1778
-#: ../src/groupchat_control.py:1909
+#: ../src/dialogs.py:2007 ../src/dialogs.py:2013
+#: ../src/groupchat_control.py:1971
 #, fuzzy
 msgid "The group chat Jabber ID has not allowed characters."
 msgstr "Rums- eller servernamnet innehåller icke tillåtna tecken."
 
-#: ../src/dialogs.py:1784
+#: ../src/dialogs.py:2019
 msgid "This is not a group chat"
 msgstr "Det här är ingen gruppchatt"
 
-#: ../src/dialogs.py:1785
+#: ../src/dialogs.py:2020
 #, python-format
 msgid "%s is not the name of a group chat."
 msgstr "%s är inte namnet på en gruppchatt."
 
-#: ../src/dialogs.py:1812
+#: ../src/dialogs.py:2047
 msgid "Without a connection, you can not synchronise your contacts."
 msgstr "Du kan inte synkronisera dina kontakter utan en anslutning."
 
-#: ../src/dialogs.py:1826
+#: ../src/dialogs.py:2061
 msgid "Server"
 msgstr "Server"
 
-#: ../src/dialogs.py:1859
+#: ../src/dialogs.py:2094
 msgid "This account is not connected to the server"
 msgstr "Detta konto är inte anslutet till servern"
 
-#: ../src/dialogs.py:1860
+#: ../src/dialogs.py:2095
 msgid "You cannot synchronize with an account unless it is connected."
 msgstr "Du kan inte synkronisera med ett konto utan att vara ansluten."
 
-#: ../src/dialogs.py:1884
+#: ../src/dialogs.py:2119
 msgid "Synchronise"
 msgstr "Synkronisera"
 
-#: ../src/dialogs.py:1942
+#: ../src/dialogs.py:2177
 #, python-format
 msgid "Start Chat with account %s"
 msgstr "Starta Chatt med konto %s"
 
-#: ../src/dialogs.py:1944
+#: ../src/dialogs.py:2179
 msgid "Start Chat"
 msgstr "Starta Chatt"
 
-#: ../src/dialogs.py:1945
+#: ../src/dialogs.py:2180
 msgid ""
 "Fill in the nickname or the Jabber ID of the contact you would like\n"
 "to send a chat message to:"
@@ -6603,275 +6694,301 @@ msgstr ""
 "skicka ett chattmeddelande till:"
 
 #. if offline or connecting
-#: ../src/dialogs.py:1969 ../src/dialogs.py:2343 ../src/dialogs.py:2493
-#: ../src/normal_control.py:640
+#: ../src/dialogs.py:2204 ../src/dialogs.py:2577 ../src/dialogs.py:2739
 msgid "Connection not available"
 msgstr "Anslutningen är inte tillgänglig"
 
-#: ../src/dialogs.py:1970 ../src/dialogs.py:2344 ../src/dialogs.py:2494
-#: ../src/normal_control.py:641
+#: ../src/dialogs.py:2205 ../src/dialogs.py:2578 ../src/dialogs.py:2740
 #, python-format
 msgid "Please make sure you are connected with \"%s\"."
 msgstr "Kontrollera att du är ansluten med \"%s\"."
 
-#: ../src/dialogs.py:1979 ../src/dialogs.py:1982
+#: ../src/dialogs.py:2214 ../src/dialogs.py:2217
 msgid "Invalid JID"
 msgstr "Ogiltigt JID"
 
-#: ../src/dialogs.py:1982
+#: ../src/dialogs.py:2217
 #, python-format
 msgid "Unable to parse \"%s\"."
 msgstr "Kunde inte tolka \"%s\"."
 
-#: ../src/dialogs.py:1991
+#: ../src/dialogs.py:2226
 msgid "Without a connection, you can not change your password."
 msgstr "Du kan inte ändra ditt lösenord utan en anslutning."
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2245
 msgid "Invalid password"
 msgstr "Ogiltigt lösenord"
 
-#: ../src/dialogs.py:2010
+#: ../src/dialogs.py:2245
 msgid "You must enter a password."
 msgstr "Du måste skriva in ett lösenord."
 
-#: ../src/dialogs.py:2014
+#: ../src/dialogs.py:2249
 msgid "Passwords do not match"
 msgstr "Lösenorden stämmer inte överens"
 
-#: ../src/dialogs.py:2015
+#: ../src/dialogs.py:2250
 msgid "The passwords typed in both fields must be identical."
 msgstr "Lösenorden skrivna i båda fälten måste vara identiska."
 
 #. img to display
 #. default value
-#: ../src/dialogs.py:2055 ../src/notify.py:245 ../src/notify.py:473
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2289 ../src/notify.py:257 ../src/notify.py:491
 msgid "Contact Signed In"
 msgstr "Kontakten loggade in"
 
-#: ../src/dialogs.py:2057 ../src/notify.py:253 ../src/notify.py:475
-#: ../src/osx/growler.py:12
+#: ../src/dialogs.py:2291 ../src/notify.py:265 ../src/notify.py:493
 msgid "Contact Signed Out"
 msgstr "Kontakt Loggade Ut"
 
 #. chat message
-#: ../src/dialogs.py:2059 ../src/notify.py:276 ../src/notify.py:477
-#: ../src/osx/growler.py:12
+#. img to display
+#: ../src/dialogs.py:2293 ../src/notify.py:288 ../src/notify.py:342
+#: ../src/notify.py:495
 msgid "New Message"
 msgstr "Nytt Meddelande"
 
 #. single message
-#: ../src/dialogs.py:2059 ../src/notify.py:257 ../src/notify.py:477
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2293 ../src/notify.py:269 ../src/notify.py:343
+#: ../src/notify.py:495
 msgid "New Single Message"
 msgstr "Nytt Enstaka Meddelande"
 
 #. private message
-#: ../src/dialogs.py:2060 ../src/notify.py:264 ../src/notify.py:478
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/notify.py:276 ../src/notify.py:343
+#: ../src/notify.py:496
 msgid "New Private Message"
 msgstr "Skicka Privat Meddelande"
 
-#: ../src/dialogs.py:2060 ../src/gajim.py:1685 ../src/notify.py:487
-#: ../src/osx/growler.py:13
+#: ../src/dialogs.py:2294 ../src/gajim.py:1673 ../src/notify.py:505
 msgid "New E-mail"
 msgstr "Ny E-post"
 
-#: ../src/dialogs.py:2062 ../src/gajim.py:1751 ../src/notify.py:480
-#: ../src/osx/growler.py:14
+#: ../src/dialogs.py:2296 ../src/gajim.py:1739 ../src/notify.py:498
 msgid "File Transfer Request"
 msgstr "Förfrågan om Filöverföring"
 
-#: ../src/dialogs.py:2064 ../src/gajim.py:1651 ../src/gajim.py:1718
-#: ../src/notify.py:482 ../src/osx/growler.py:14
+#: ../src/dialogs.py:2298 ../src/gajim.py:1639 ../src/gajim.py:1706
+#: ../src/notify.py:500
 msgid "File Transfer Error"
 msgstr "Fel i Filöverföring"
 
-#: ../src/dialogs.py:2066 ../src/gajim.py:1793 ../src/gajim.py:1815
-#: ../src/gajim.py:1832 ../src/notify.py:484 ../src/osx/growler.py:15
+#: ../src/dialogs.py:2300 ../src/gajim.py:1784 ../src/gajim.py:1806
+#: ../src/gajim.py:1823 ../src/notify.py:502
 msgid "File Transfer Completed"
 msgstr "Filöverföring Klar"
 
-#: ../src/dialogs.py:2067 ../src/gajim.py:1796 ../src/notify.py:485
-#: ../src/osx/growler.py:15
+#: ../src/dialogs.py:2301 ../src/gajim.py:1787 ../src/notify.py:503
 msgid "File Transfer Stopped"
 msgstr "Filöverföring Stoppad"
 
-#: ../src/dialogs.py:2069 ../src/gajim.py:1503 ../src/notify.py:489
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2303 ../src/gajim.py:1486 ../src/notify.py:507
 msgid "Groupchat Invitation"
 msgstr "Inbjudan till Gruppchatt"
 
-#: ../src/dialogs.py:2071 ../src/notify.py:237 ../src/notify.py:491
-#: ../src/osx/growler.py:16
+#: ../src/dialogs.py:2305 ../src/notify.py:249 ../src/notify.py:509
 msgid "Contact Changed Status"
 msgstr "Kontakten ändrade status"
 
-#: ../src/dialogs.py:2262 ../src/normal_control.py:241
+#: ../src/dialogs.py:2496
 #, python-format
 msgid "Single Message using account %s"
 msgstr "Ett meddelande med kontot %s"
 
-#: ../src/dialogs.py:2264 ../src/normal_control.py:243
+#: ../src/dialogs.py:2498
 #, python-format
 msgid "Single Message in account %s"
 msgstr "Ett meddelande i kontot %s"
 
-#: ../src/dialogs.py:2266 ../src/normal_control.py:245
+#: ../src/dialogs.py:2500
 msgid "Single Message"
 msgstr "Enstaka meddelande"
 
 #. prepare UI for Sending
-#: ../src/dialogs.py:2269 ../src/normal_control.py:248
+#: ../src/dialogs.py:2503
 #, python-format
 msgid "Send %s"
 msgstr "Skicka %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2292 ../src/normal_control.py:290
+#: ../src/dialogs.py:2526
 #, python-format
 msgid "Received %s"
 msgstr "Mottog %s"
 
 #. prepare UI for Receiving
-#: ../src/dialogs.py:2315 ../src/normal_control.py:324
+#: ../src/dialogs.py:2549
 #, fuzzy, python-format
 msgid "Form %s"
 msgstr "Från %s"
 
 #. we create a new blank window to send and we preset RE: and to jid
-#: ../src/dialogs.py:2394 ../src/normal_control.py:692
+#: ../src/dialogs.py:2628
 #, python-format
 msgid "RE: %s"
 msgstr "SV: %s"
 
-#: ../src/dialogs.py:2395 ../src/normal_control.py:696
+#: ../src/dialogs.py:2629
 #, python-format
 msgid "%s wrote:\n"
 msgstr "%s skrev:\n"
 
-#: ../src/dialogs.py:2439
+#: ../src/dialogs.py:2678
 #, python-format
 msgid "XML Console for %s"
 msgstr "XML-konsol för %s"
 
-#: ../src/dialogs.py:2441
+#: ../src/dialogs.py:2680
 msgid "XML Console"
 msgstr "XML-konsol"
 
-#: ../src/dialogs.py:2565
+#. Set labels
+#. self.action can be 'add', 'modify' or 'remove'
+#: ../src/dialogs.py:2789
+#, fuzzy, python-format
+msgid "<b>%s</b> would like you to <b>%s</b> some contacts in your roster."
+msgstr "Jag vill lägga till dig i min kontaktlista."
+
+#: ../src/dialogs.py:2804 ../src/dialogs.py:2851
+#, fuzzy
+msgid "Add"
+msgstr "Adress"
+
+#: ../src/dialogs.py:2806 ../src/dialogs.py:2883
+#, fuzzy
+msgid "Modify"
+msgstr "Lynnig"
+
+#: ../src/dialogs.py:2812
+#, fuzzy
+msgid "Jabber ID"
+msgstr "Jabber-ID:"
+
+#: ../src/dialogs.py:2818
+#, fuzzy
+msgid "Groups"
+msgstr "Grupp"
+
+#. it is selected
+#. remote_jid = model[iter][1].decode('utf-8')
+#: ../src/dialogs.py:2929
+#, fuzzy, python-format
+msgid "%s suggested me to add you in my roster."
+msgstr "Jag skulle vilja lägga till dig i min kontaktlista."
+
+#: ../src/dialogs.py:3029
 #, python-format
 msgid "Privacy List <b><i>%s</i></b>"
 msgstr "Privat identitetslista <b><i>%s</i></b>"
 
-#: ../src/dialogs.py:2569
+#: ../src/dialogs.py:3033
 #, python-format
 msgid "Privacy List for %s"
 msgstr "Privat integritetslista för %s"
 
-#: ../src/dialogs.py:2625
+#: ../src/dialogs.py:3089
 #, python-format
 msgid "Order: %(order)s, action: %(action)s, type: %(type)s, value: %(value)s"
 msgstr ""
 "Ordning: %(order)s, åtgärd: %(action)s, typ: %(type)s, värde: %(value)s"
 
-#: ../src/dialogs.py:2630
+#: ../src/dialogs.py:3094
 #, python-format
 msgid "Order: %(order)s, action: %(action)s"
 msgstr "Ordning: %(order)s, åtgärd: %(action)s"
 
-#: ../src/dialogs.py:2672
+#: ../src/dialogs.py:3136
 msgid "<b>Edit a rule</b>"
 msgstr "<b>Redigera en regel</b>"
 
-#: ../src/dialogs.py:2759
+#: ../src/dialogs.py:3223
 msgid "<b>Add a rule</b>"
 msgstr "<b>Lägg till en regel</b>"
 
-#: ../src/dialogs.py:2855
+#: ../src/dialogs.py:3319
 #, python-format
 msgid "Privacy Lists for %s"
 msgstr "Privata integritetslistor för %s"
 
-#: ../src/dialogs.py:2857
+#: ../src/dialogs.py:3321
 msgid "Privacy Lists"
 msgstr "Integritetslistor"
 
-#: ../src/dialogs.py:2927
+#: ../src/dialogs.py:3391
 msgid "Invalid List Name"
 msgstr "Ogiltigt listnamn"
 
-#: ../src/dialogs.py:2928
+#: ../src/dialogs.py:3392
 msgid "You must enter a name to create a privacy list."
 msgstr "Du måste ange ett namn för att skapa en integritetslista."
 
-#: ../src/dialogs.py:2960
+#: ../src/dialogs.py:3424
 msgid "You are invited to a groupchat"
 msgstr "Du är inbjuden till en gruppchatt"
 
-#: ../src/dialogs.py:2963
+#: ../src/dialogs.py:3427
 msgid "$Contact has invited you to join a discussion"
 msgstr "$Contact har bjudit in dig till en diskussion"
 
-#: ../src/dialogs.py:2965
+#: ../src/dialogs.py:3429
 #, python-format
 msgid "$Contact has invited you to group chat %(room_jid)s"
 msgstr "$Contact har bjudit in dig till gruppchatten %(room_jid)s"
 
-#: ../src/dialogs.py:2973
+#: ../src/dialogs.py:3437
 #, python-format
 msgid "Comment: %s"
 msgstr "Kommentar: %s"
 
-#: ../src/dialogs.py:2975
+#: ../src/dialogs.py:3439
 msgid "Do you want to accept the invitation?"
 msgstr "Vill du acceptera inbjudan?"
 
-#: ../src/dialogs.py:3030
+#: ../src/dialogs.py:3495
 msgid "Choose Sound"
 msgstr "Välj ljud"
 
-#: ../src/dialogs.py:3040 ../src/dialogs.py:3091
+#: ../src/dialogs.py:3505 ../src/dialogs.py:3559
 msgid "All files"
 msgstr "Alla filer"
 
-#: ../src/dialogs.py:3045
+#: ../src/dialogs.py:3510
 msgid "Wav Sounds"
 msgstr "Wav-ljud"
 
-#: ../src/dialogs.py:3078
+#: ../src/dialogs.py:3546
 msgid "Choose Image"
 msgstr "Välj Bild"
 
-#: ../src/dialogs.py:3096
+#: ../src/dialogs.py:3564
 msgid "Images"
 msgstr "Bilder"
 
-#: ../src/dialogs.py:3161
+#: ../src/dialogs.py:3629
 #, python-format
 msgid "When %s becomes:"
 msgstr "När %s blir:"
 
-#: ../src/dialogs.py:3163
+#: ../src/dialogs.py:3631
 #, python-format
 msgid "Adding Special Notification for %s"
 msgstr "Lägger Till Speciellt Meddelande För %s"
 
 #. # means number
-#: ../src/dialogs.py:3232
+#: ../src/dialogs.py:3700
 msgid "#"
 msgstr "#"
 
-#: ../src/dialogs.py:3238
+#: ../src/dialogs.py:3706
 msgid "Condition"
 msgstr "Villkor"
 
-#: ../src/dialogs.py:3356
+#: ../src/dialogs.py:3824
 msgid "when I am "
 msgstr "när jag är "
 
-#: ../src/dialogs.py:3828
+#: ../src/dialogs.py:4296
 #, python-format
 msgid ""
 "Your chat session with <b>%(jid)s</b> is encrypted.\n"
@@ -6882,38 +6999,38 @@ msgstr ""
 "\n"
 "Denna sessions Short Authentication String är <b>%(sas)s</b>."
 
-#: ../src/dialogs.py:3832
+#: ../src/dialogs.py:4300
 msgid "You have already verified this contact's identity."
 msgstr "Du har redan verifierat identiteten för denna kontakt."
 
-#: ../src/dialogs.py:3838 ../src/dialogs.py:3925
+#: ../src/dialogs.py:4306 ../src/dialogs.py:4393
 msgid "Contact's identity verified"
 msgstr "Kontaktens identitet är verifierad"
 
-#: ../src/dialogs.py:3846
+#: ../src/dialogs.py:4314
 msgid "Verify again..."
 msgstr "Verifiera igen..."
 
-#: ../src/dialogs.py:3851
+#: ../src/dialogs.py:4319
 msgid ""
 "To be certain that <b>only</b> the expected person can read your messages or "
 "send you messages, you need to verify their identity by clicking the button "
 "below."
 msgstr ""
 
-#: ../src/dialogs.py:3854 ../src/dialogs.py:3906 ../src/dialogs.py:3919
+#: ../src/dialogs.py:4322 ../src/dialogs.py:4374 ../src/dialogs.py:4387
 msgid "Contact's identity NOT verified"
 msgstr "Kontaktens identitet är INTE verifierad"
 
-#: ../src/dialogs.py:3861
+#: ../src/dialogs.py:4329
 msgid "Verify..."
 msgstr "Verifiera..."
 
-#: ../src/dialogs.py:3873
+#: ../src/dialogs.py:4341
 msgid "Have you verified the contact's identity?"
 msgstr "Har du verifierat kontaktens identitet?"
 
-#: ../src/dialogs.py:3874
+#: ../src/dialogs.py:4342
 #, python-format
 msgid ""
 "To prevent talking to an unknown person, you should speak to <b>%(jid)s</b> "
@@ -6923,58 +7040,58 @@ msgid ""
 "This session's Short Authentication String is <b>%(sas)s</b>."
 msgstr ""
 
-#: ../src/dialogs.py:3875
+#: ../src/dialogs.py:4343
 msgid "Did you talk to the remote contact and verify the SAS?"
 msgstr ""
 
-#: ../src/dialogs.py:3907
+#: ../src/dialogs.py:4375
 #, python-format
 msgid "The contact's key (%s) <b>does not match</b> the key assigned in Gajim."
 msgstr ""
 
-#: ../src/dialogs.py:3913
+#: ../src/dialogs.py:4381
 msgid "No GPG key is assigned to this contact. So you cannot encrypt messages."
 msgstr ""
 
-#: ../src/dialogs.py:3920
+#: ../src/dialogs.py:4388
 msgid ""
 "GPG key is assigned to this contact, but <b>you do not trust his key</b>, so "
 "message <b>cannot</b> be encrypted. Use your GPG client to trust this key."
 msgstr ""
 
-#: ../src/dialogs.py:3926
+#: ../src/dialogs.py:4394
 msgid ""
 "GPG Key is assigned to this contact, and you trust his key, so messages will "
 "be encrypted."
 msgstr ""
 
-#: ../src/disco.py:116
+#: ../src/disco.py:118
 msgid "Others"
 msgstr "Andra"
 
 #. conference is a category for listing mostly groupchats in service discovery
-#: ../src/disco.py:120
+#: ../src/disco.py:122
 msgid "Conference"
 msgstr "Konferens"
 
-#: ../src/disco.py:440
+#: ../src/disco.py:442
 msgid "Without a connection, you can not browse available services"
 msgstr "Du kan inte bläddra bland tillgängliga tjänster utan en anslutning"
 
-#: ../src/disco.py:514
+#: ../src/disco.py:516
 #, python-format
 msgid "Service Discovery using account %s"
 msgstr "Söker tjänster med konto %s"
 
-#: ../src/disco.py:516
+#: ../src/disco.py:518
 msgid "Service Discovery"
 msgstr "Tjänstefinnare"
 
-#: ../src/disco.py:657
+#: ../src/disco.py:659
 msgid "The service could not be found"
 msgstr "Denna tjänst kunde inte hittas"
 
-#: ../src/disco.py:658
+#: ../src/disco.py:660
 msgid ""
 "There is no service at the address you entered, or it is not responding. "
 "Check the address and try again."
@@ -6982,313 +7099,331 @@ msgstr ""
 "Adressen du angav är ingen tjänstadress eller så svarar inte tjänsten. "
 "Kontrollera adressen och försök igen."
 
-#: ../src/disco.py:662 ../src/disco.py:958
+#: ../src/disco.py:664 ../src/disco.py:960
 msgid "The service is not browsable"
 msgstr "Tjänst är inte bläddringsbar"
 
-#: ../src/disco.py:663
+#: ../src/disco.py:665
 msgid "This type of service does not contain any items to browse."
 msgstr "Denna typ av tjänst innehåller inga objekt att bläddra genom."
 
-#: ../src/disco.py:700 ../src/disco.py:710
+#: ../src/disco.py:702 ../src/disco.py:712
 msgid "Invalid Server Name"
 msgstr "Ogiltigt servernamn"
 
-#: ../src/disco.py:757
+#: ../src/disco.py:759
 #, python-format
 msgid "Browsing %(address)s using account %(account)s"
 msgstr "Bläddrar i %(address)s med kontot %(account)s"
 
-#: ../src/disco.py:797
+#: ../src/disco.py:799
 msgid "_Browse"
 msgstr "_Bläddra"
 
-#: ../src/disco.py:959
+#: ../src/disco.py:961
 msgid "This service does not contain any items to browse."
 msgstr "Denna tjänst innehåller inga objekt att bläddra genom."
 
-#: ../src/disco.py:1181
+#: ../src/disco.py:1183
 msgid "_Execute Command"
 msgstr "_Kör kommando"
 
-#: ../src/disco.py:1191 ../src/disco.py:1355
+#: ../src/disco.py:1193 ../src/disco.py:1359
 msgid "Re_gister"
 msgstr "Re_gistrera"
 
-#: ../src/disco.py:1392
+#: ../src/disco.py:1396
 #, python-format
 msgid "Scanning %(current)d / %(total)d.."
 msgstr "Söker av %(current)d / %(total)d.."
 
 #. Users column
-#: ../src/disco.py:1573
+#: ../src/disco.py:1578
 msgid "Users"
 msgstr "Användare"
 
 #. Description column
-#: ../src/disco.py:1581
+#: ../src/disco.py:1586
 msgid "Description"
 msgstr "Beskrivning"
 
 #. Id column
-#: ../src/disco.py:1589
+#: ../src/disco.py:1594
 msgid "Id"
 msgstr "ID"
 
-#: ../src/disco.py:1818
+#: ../src/disco.py:1659 ../src/gajim.py:3178
+msgid "Bookmark already set"
+msgstr "Bokmärke finns redan"
+
+#: ../src/disco.py:1660 ../src/gajim.py:3179
+#, python-format
+msgid "Group Chat \"%s\" is already in your bookmarks."
+msgstr "Gruppchatten \"%s\" finns redan i dina bokmärken."
+
+#: ../src/disco.py:1669 ../src/gajim.py:3192
+msgid "Bookmark has been added successfully"
+msgstr "Bokmärket har lagts till"
+
+#: ../src/disco.py:1670 ../src/gajim.py:3193
+msgid "You can manage your bookmarks via Actions menu in your roster."
+msgstr "Du kan hantera dina bokmärken via åtgärdsmenyn i din kontaktlista."
+
+#: ../src/disco.py:1863
 msgid "Subscribed"
 msgstr "Prenumererar"
 
-#: ../src/disco.py:1826
+#: ../src/disco.py:1871
 msgid "Node"
 msgstr "Nod"
 
-#: ../src/disco.py:1883
+#: ../src/disco.py:1928
 msgid "New post"
 msgstr "Ny post"
 
-#: ../src/disco.py:1889
+#: ../src/disco.py:1934
 msgid "_Subscribe"
 msgstr "_Prenumerera"
 
-#: ../src/disco.py:1895
+#: ../src/disco.py:1940
 msgid "_Unsubscribe"
 msgstr "Säg _upp prenumeration"
 
-#: ../src/features_window.py:45
+#: ../src/features_window.py:46
 msgid "SSL certificat validation"
 msgstr "Validering av SSL-certifikat"
 
-#: ../src/features_window.py:46
+#: ../src/features_window.py:47
 msgid ""
 "A library used to validate server certificates to ensure a secure connection."
 msgstr ""
 
-#: ../src/features_window.py:47 ../src/features_window.py:48
+#: ../src/features_window.py:48 ../src/features_window.py:49
 msgid "Requires python-pyopenssl."
 msgstr "Kräver python-pyopenssl."
 
-#: ../src/features_window.py:49
+#: ../src/features_window.py:50
 msgid "Bonjour / Zeroconf"
 msgstr "Bonjour / Zeroconf"
 
-#: ../src/features_window.py:50
+#: ../src/features_window.py:51
 msgid "Serverless chatting with autodetected clients in a local network."
 msgstr ""
 
-#: ../src/features_window.py:51
+#: ../src/features_window.py:52
 msgid "Requires python-avahi."
 msgstr "Kräver python-avahi."
 
-#: ../src/features_window.py:52
+#: ../src/features_window.py:53
 msgid "Requires pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 msgstr "Kräver pybonjour (http://o2s.csail.mit.edu/o2s-wiki/pybonjour)."
 
-#: ../src/features_window.py:53
+#: ../src/features_window.py:54
 msgid "Command line"
 msgstr "Kommandorad"
 
-#: ../src/features_window.py:54
+#: ../src/features_window.py:55
 msgid "A script to control Gajim via commandline."
 msgstr "Ett skript för att styra Gajim via kommandraden."
 
-#: ../src/features_window.py:55
+#: ../src/features_window.py:56
 msgid "Requires python-dbus."
 msgstr "Kräver python-dbus."
 
-#: ../src/features_window.py:56 ../src/features_window.py:60
-#: ../src/features_window.py:64 ../src/features_window.py:68
-#: ../src/features_window.py:72 ../src/features_window.py:80
-#: ../src/features_window.py:84
+#: ../src/features_window.py:57 ../src/features_window.py:61
+#: ../src/features_window.py:65 ../src/features_window.py:69
+#: ../src/features_window.py:73 ../src/features_window.py:81
+#: ../src/features_window.py:85
 msgid "Feature not available under Windows."
 msgstr "Funktionen är inte tillgänglig under Windows."
 
-#: ../src/features_window.py:57
+#: ../src/features_window.py:58
 msgid "OpenGPG message encryption"
 msgstr "OpenPGP-meddelandekryptering"
 
-#: ../src/features_window.py:58
+#: ../src/features_window.py:59
 msgid "Encrypting chat messages with gpg keys."
 msgstr "Krypterar chattmeddelanden med gpg-nycklar."
 
-#: ../src/features_window.py:59
+#: ../src/features_window.py:60
 msgid "Requires gpg and python-GnuPGInterface."
 msgstr "Kräver gpg och python-GnuPGInterface."
 
-#: ../src/features_window.py:61
+#: ../src/features_window.py:62
 msgid "Network-manager"
 msgstr "Network-manager"
 
-#: ../src/features_window.py:62
+#: ../src/features_window.py:63
 msgid "Autodetection of network status."
 msgstr "Automatisk detektering av nätverksstatus."
 
-#: ../src/features_window.py:63
+#: ../src/features_window.py:64
 msgid "Requires gnome-network-manager and python-dbus."
 msgstr "Kräver gnome-network-manager och python-dbus."
 
-#: ../src/features_window.py:65
+#: ../src/features_window.py:66
 msgid "Session Management"
 msgstr "Sessionshantering"
 
-#: ../src/features_window.py:66
+#: ../src/features_window.py:67
 msgid "Gajim session is stored on logout and restored on login."
 msgstr "Gajim-sessionen lagras vid utloggning och återskapas vid inloggning."
 
-#: ../src/features_window.py:67
+#: ../src/features_window.py:68
 msgid "Requires python-gnome2."
 msgstr "Kräver python-gnome2."
 
-#: ../src/features_window.py:69
+#: ../src/features_window.py:70
 msgid "Password encryption"
 msgstr "Lösenordskryptering"
 
-#: ../src/features_window.py:70
+#: ../src/features_window.py:71
 msgid "Passwords can be stored securely and not just in plaintext."
 msgstr "Lösenord kan lagras säkert och inte bara i klartext."
 
-#: ../src/features_window.py:71
-msgid "Requires gnome-keyring and python-gnome2-desktop."
+#: ../src/features_window.py:72
+#, fuzzy
+msgid "Requires gnome-keyring and python-gnome2-desktop, or kwalletcli."
 msgstr "Kräver gnome-keyring och python-gnome2-desktop."
 
-#: ../src/features_window.py:73
+#: ../src/features_window.py:74
 msgid "SRV"
 msgstr "SRV"
 
-#: ../src/features_window.py:74
+#: ../src/features_window.py:75
 msgid "Ability to connect to servers which are using SRV records."
 msgstr "Möjlighet att ansluta till servrar som använder SRV-poster."
 
-#: ../src/features_window.py:75
+#: ../src/features_window.py:76
 msgid "Requires dnsutils."
 msgstr "Kräver dnsutils."
 
-#: ../src/features_window.py:76
+#: ../src/features_window.py:77
 msgid "Requires nslookup to use SRV records."
 msgstr "Kräver nslookup för att använda SRV-poster."
 
-#: ../src/features_window.py:77
+#: ../src/features_window.py:78
 msgid "Spell Checker"
 msgstr "Stavningskontroll"
 
-#: ../src/features_window.py:78
+#: ../src/features_window.py:79
 msgid "Spellchecking of composed messages."
 msgstr "Stavningskontrollerar meddelanden."
 
-#: ../src/features_window.py:79
+#: ../src/features_window.py:80
 msgid "Requires libgtkspell."
 msgstr "Kräver libgtkspell."
 
-#: ../src/features_window.py:81
+#: ../src/features_window.py:82
 msgid "Notification"
 msgstr "Notifiering"
 
-#: ../src/features_window.py:82
+#: ../src/features_window.py:83
 msgid "Passive popups notifying for new events."
 msgstr ""
 
-#: ../src/features_window.py:83
+#: ../src/features_window.py:84
 msgid ""
 "Requires python-notify or instead python-dbus in conjunction with "
 "notification-daemon."
 msgstr ""
 "Kräver python-notify eller python-dbus i kombination med notification-daemon."
 
-#: ../src/features_window.py:85
+#: ../src/features_window.py:86
 msgid "Trayicon"
 msgstr "Aktivitetsikon"
 
-#: ../src/features_window.py:86
+#: ../src/features_window.py:87
 msgid "A icon in systemtray reflecting the current presence."
 msgstr "En ikon i aktivitetsfältet som beskriver aktuell närvaro."
 
-#: ../src/features_window.py:87
+#: ../src/features_window.py:88
 msgid ""
 "Requires python-gnome2-extras or compiled trayicon module from Gajim sources."
 msgstr ""
 "Kräver python-gnome2-extras eller kompilerad trayicon-modul från Gajims "
 "källkod."
 
-#: ../src/features_window.py:88
+#: ../src/features_window.py:89
 msgid "Requires PyGTK >= 2.10."
 msgstr "Kräver PyGTK >= 2.10."
 
-#: ../src/features_window.py:89
+#: ../src/features_window.py:90
 msgid "Automatic status"
 msgstr "Automatisk status"
 
-#: ../src/features_window.py:90
+#: ../src/features_window.py:91
 msgid "Ability to measure idle time, in order to set auto status."
 msgstr ""
 
-#: ../src/features_window.py:91
+#: ../src/features_window.py:92
 msgid "Requires libxss library."
 msgstr "Kräver libxss-biblioteket."
 
-#: ../src/features_window.py:92
+#: ../src/features_window.py:93
 msgid "Requires python2.5."
 msgstr "Kräver python2.5."
 
-#: ../src/features_window.py:93
+#: ../src/features_window.py:94
 msgid "LaTeX"
 msgstr "LaTeX"
 
-#: ../src/features_window.py:94
+#: ../src/features_window.py:95
 msgid "Transform LaTeX expressions between $$ $$."
 msgstr "Transformera LaTeX-uttryck mellan $$ $$."
 
-#: ../src/features_window.py:95
+#: ../src/features_window.py:96
 msgid ""
 "Requires texlive-latex-base and dvipng. You have to set 'use_latex' to True "
 "in the Advanced Configuration Editor."
 msgstr ""
 
-#: ../src/features_window.py:96
+#: ../src/features_window.py:97
 msgid ""
 "Requires texlive-latex-base and dvipng (All is in MikTeX). You have to set "
 "'use_latex' to True in the Advanced Configuration Editor."
 msgstr ""
 
-#: ../src/features_window.py:97
+#: ../src/features_window.py:98
 #, fuzzy
 msgid "End to End message encryption"
 msgstr "OpenPGP-kryptering"
 
-#: ../src/features_window.py:98
+#: ../src/features_window.py:99
 msgid "Encrypting chat messages."
 msgstr "Krypterar chattmeddelanden."
 
-#: ../src/features_window.py:99 ../src/features_window.py:100
+#: ../src/features_window.py:100 ../src/features_window.py:101
 msgid "Requires python-crypto."
 msgstr "Kräver python-crypto."
 
-#: ../src/features_window.py:101
+#: ../src/features_window.py:102
 msgid "RST Generator"
 msgstr "RST-generator"
 
-#: ../src/features_window.py:102
+#: ../src/features_window.py:103
 msgid ""
 "Generate XHTML output from RST code (see http://docutils.sourceforge.net/"
 "docs/ref/rst/restructuredtext.html)."
 msgstr ""
 
-#: ../src/features_window.py:103 ../src/features_window.py:104
+#: ../src/features_window.py:104 ../src/features_window.py:105
 msgid "Requires python-docutils."
 msgstr "Kräver python-docutils."
 
-#: ../src/features_window.py:105
+#: ../src/features_window.py:106
 msgid "Banners and clickable links"
 msgstr "Banners och klickbara länkar"
 
-#: ../src/features_window.py:106
+#: ../src/features_window.py:107
 msgid "Ability to have clickable URLs in chat and groupchat window banners."
 msgstr ""
 
-#: ../src/features_window.py:107 ../src/features_window.py:108
+#: ../src/features_window.py:108 ../src/features_window.py:109
 msgid "Requires python-sexy."
 msgstr "Kräver python-sexy."
 
-#: ../src/features_window.py:122
+#: ../src/features_window.py:123
 msgid "Feature"
 msgstr "Funktion"
 
@@ -7317,7 +7452,7 @@ msgstr "Storlek: %s"
 #. You is a reply of who sent a file
 #. You is a reply of who received a file
 #: ../src/filetransfers_window.py:183 ../src/filetransfers_window.py:193
-#: ../src/history_manager.py:495
+#: ../src/history_manager.py:520
 msgid "You"
 msgstr "Du"
 
@@ -7327,7 +7462,7 @@ msgid "Sender: %s"
 msgstr "Avsändare: %s"
 
 #: ../src/filetransfers_window.py:185 ../src/filetransfers_window.py:596
-#: ../src/tooltips.py:671
+#: ../src/tooltips.py:670
 msgid "Recipient: "
 msgstr "Mottagare: "
 
@@ -7359,26 +7494,27 @@ msgid "Error message: %s"
 msgstr "Felmeddelande: %s"
 
 #: ../src/filetransfers_window.py:231
-msgid "File transfer stopped by the contact at the other end"
-msgstr "Filöverföringen stoppades av kontakten på andra sidan"
+#, fuzzy
+msgid "File transfer stopped"
+msgstr "Filöverföring Stoppad"
 
-#: ../src/filetransfers_window.py:252
+#: ../src/filetransfers_window.py:251
 msgid "Choose File to Send..."
 msgstr "Välj fil att skicka..."
 
-#: ../src/filetransfers_window.py:268 ../src/tooltips.py:709
+#: ../src/filetransfers_window.py:267 ../src/tooltips.py:708
 msgid "Description: "
 msgstr "Beskrivning: "
 
-#: ../src/filetransfers_window.py:279
+#: ../src/filetransfers_window.py:278
 msgid "Gajim cannot access this file"
 msgstr "Gajim kan inte komma åt denna fil"
 
-#: ../src/filetransfers_window.py:280
+#: ../src/filetransfers_window.py:279
 msgid "This file is being used by another process."
 msgstr "Denna fil används av en annan process."
 
-#: ../src/filetransfers_window.py:311
+#: ../src/filetransfers_window.py:310
 #, python-format
 msgid "File: %s"
 msgstr "Fil: %s"
@@ -7398,12 +7534,12 @@ msgstr "Beskrivning: %s"
 msgid "%s wants to send you a file:"
 msgstr "%s vill skicka en fil till dig:"
 
-#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:817
+#: ../src/filetransfers_window.py:332 ../src/gtkgui_helpers.py:812
 #, python-format
 msgid "Cannot overwrite existing file \"%s\""
 msgstr "Kan inte skriva över befintliga filen \"%s\""
 
-#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:819
+#: ../src/filetransfers_window.py:333 ../src/gtkgui_helpers.py:814
 msgid ""
 "A file with this name already exists and you do not have permission to "
 "overwrite it."
@@ -7411,22 +7547,22 @@ msgstr ""
 "En fil med det här namnet existerar redan och du har inte rättigheter att "
 "skriva över den."
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "This file already exists"
 msgstr "Den här filen finns redan"
 
-#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:823
+#: ../src/filetransfers_window.py:349 ../src/gtkgui_helpers.py:818
 msgid "What do you want to do?"
 msgstr "Vad vill du göra?"
 
 #. read-only bit is used to mark special folder under windows,
 #. not to mark that a folder is read-only. See ticket #3587
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:830
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:825
 #, python-format
 msgid "Directory \"%s\" is not writable"
 msgstr "Katalogen \"%s\" är inte skrivbar"
 
-#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:831
+#: ../src/filetransfers_window.py:359 ../src/gtkgui_helpers.py:826
 msgid "You do not have permission to create files in this directory."
 msgstr "Du har inte rättigheter att skapa filer i den här katalogen."
 
@@ -7462,11 +7598,11 @@ msgstr "Fil: "
 msgid "It is not possible to send empty files"
 msgstr "Det är inte möjligt att skicka tomma filer"
 
-#: ../src/filetransfers_window.py:592 ../src/tooltips.py:661
+#: ../src/filetransfers_window.py:592 ../src/tooltips.py:660
 msgid "Name: "
 msgstr "Namn: "
 
-#: ../src/filetransfers_window.py:594 ../src/tooltips.py:665
+#: ../src/filetransfers_window.py:594 ../src/tooltips.py:664
 msgid "Sender: "
 msgstr "Sändare: "
 
@@ -7474,36 +7610,40 @@ msgstr "Sändare: "
 msgid "Pause"
 msgstr "Paus"
 
-#: ../src/gajim.py:92
-#, python-format
-msgid "%s is not a valid loglevel"
-msgstr "%s är inte en giltig loggnivå"
-
-#: ../src/gajim.py:164
+#: ../src/gajim.py:139
 msgid "Gajim needs X server to run. Quiting..."
 msgstr "Gajim behöver Xserver för att köra. Avbryter..."
 
-#: ../src/gajim.py:193
-msgid "Gajim needs PyGTK 2.8 or above"
+#: ../src/gajim.py:141
+#, python-format
+msgid "importing PyGTK failed: %s"
+msgstr ""
+
+#: ../src/gajim.py:170
+#, fuzzy
+msgid "Gajim needs PyGTK 2.12 or above"
 msgstr "Gajim behöver PyGTK 2.8 eller senare"
 
-#: ../src/gajim.py:194
-msgid "Gajim needs PyGTK 2.8 or above to run. Quiting..."
+#: ../src/gajim.py:171
+#, fuzzy
+msgid "Gajim needs PyGTK 2.12 or above to run. Quiting..."
 msgstr "Gajim behöver PyGTK 2.8 eller senare för att köra. Avbryter..."
 
-#: ../src/gajim.py:196
-msgid "Gajim needs GTK 2.8 or above"
+#: ../src/gajim.py:173
+#, fuzzy
+msgid "Gajim needs GTK 2.12 or above"
 msgstr "Gajim behöver GTK 2.8 eller senare"
 
-#: ../src/gajim.py:197
-msgid "Gajim needs GTK 2.8 or above to run. Quiting..."
+#: ../src/gajim.py:174
+#, fuzzy
+msgid "Gajim needs GTK 2.12 or above to run. Quiting..."
 msgstr "Gajim behöver GTK 2.8 eller senare för att köra. Avbryter..."
 
-#: ../src/gajim.py:202
+#: ../src/gajim.py:179
 msgid "GTK+ runtime is missing libglade support"
 msgstr "GTK+ runtime saknar libgladestöd"
 
-#: ../src/gajim.py:204
+#: ../src/gajim.py:181
 #, python-format
 msgid ""
 "Please remove your current GTK+ runtime and install the latest stable "
@@ -7512,20 +7652,20 @@ msgstr ""
 "Ta bort din nuvarande GTK+ runtime och installera senaste stabila version "
 "från %s"
 
-#: ../src/gajim.py:206
+#: ../src/gajim.py:183
 msgid ""
 "Please make sure that GTK+ and PyGTK have libglade support in your system."
 msgstr "Kontrollera att GTK+ och PyGTK har libglade-stöd i ditt system."
 
-#: ../src/gajim.py:211
+#: ../src/gajim.py:188
 msgid "Gajim needs PySQLite2 to run"
 msgstr "Gajim behöver PySQLite2 för att fungera"
 
-#: ../src/gajim.py:219
+#: ../src/gajim.py:196
 msgid "Gajim needs pywin32 to run"
 msgstr "Gajim behöver pywin32 för att köra"
 
-#: ../src/gajim.py:220
+#: ../src/gajim.py:197
 #, python-format
 msgid ""
 "Please make sure that Pywin32 is installed on your system. You can get it at "
@@ -7534,11 +7674,11 @@ msgstr ""
 "Kontrollera att Pywin32 är installerat på ditt system. Du kan hämta det på %s"
 
 #. set the icon to all newly opened wind
-#: ../src/gajim.py:374
+#: ../src/gajim.py:342
 msgid "Gajim is already running"
 msgstr "Gajim körs redan"
 
-#: ../src/gajim.py:375
+#: ../src/gajim.py:343
 msgid ""
 "Another instance of Gajim seems to be running\n"
 "Run anyway?"
@@ -7546,36 +7686,36 @@ msgstr ""
 "En annan instans of Gajim verkar redan vara igång\n"
 "Starta ändå?"
 
-#: ../src/gajim.py:460
+#: ../src/gajim.py:428
 msgid "Passphrase Required"
 msgstr "Lösenfras krävs"
 
-#: ../src/gajim.py:461
+#: ../src/gajim.py:429
 #, python-format
 msgid "Enter GPG key passphrase for key %(keyid)s (account %(account)s)."
 msgstr ""
 "Ange GPG-nyckelns lösenfras för nyckeln %(keyid)s (kontot %(account)s)."
 
-#: ../src/gajim.py:475
+#: ../src/gajim.py:443
 #, fuzzy
 msgid "GPG key expired"
 msgstr "Ingen GPG-nyckel tilldelad"
 
-#: ../src/gajim.py:476
+#: ../src/gajim.py:444
 #, fuzzy, python-format
 msgid "Your GPG key has expied, you will be connected to %s without OpenPGP."
 msgstr "Du kommer ansluta till %s utan OpenPGP."
 
 #. ask again
-#: ../src/gajim.py:485
+#: ../src/gajim.py:453
 msgid "Wrong Passphrase"
 msgstr "Felaktig lösenfras"
 
-#: ../src/gajim.py:486
+#: ../src/gajim.py:454
 msgid "Please retype your GPG passphrase or press Cancel."
 msgstr "Ange ditt GPG-lösenord igen eller tryck på Avbryt."
 
-#: ../src/gajim.py:549
+#: ../src/gajim.py:512
 #, python-format
 msgid ""
 "Your desired nickname in group chat %s is in use or registered by another "
@@ -7586,55 +7726,59 @@ msgstr ""
 "av\n"
 "en annan deltagare. Ange ett annat smeknamn nedan:"
 
-#: ../src/gajim.py:563
+#: ../src/gajim.py:515
+msgid "Always use this nickname when there is a conflict"
+msgstr ""
+
+#: ../src/gajim.py:532
 msgid "Do you accept this request?"
 msgstr "Accepterar du den här förfrågan?"
 
-#: ../src/gajim.py:565
+#: ../src/gajim.py:534
 #, python-format
 msgid "Do you accept this request on account %s?"
 msgstr "Accepterar du den här begäran på kontot %s?"
 
-#: ../src/gajim.py:568
+#: ../src/gajim.py:537
 #, python-format
 msgid "HTTP (%(method)s) Authorization for %(url)s (id: %(id)s)"
 msgstr "HTTP (%(method)s)-auktorisering för %(url)s (id: %(id)s)"
 
-#: ../src/gajim.py:619 ../src/notify.py:493 ../src/osx/growler.py:17
+#: ../src/gajim.py:588 ../src/notify.py:511
 msgid "Connection Failed"
 msgstr "Anslutningsfel"
 
-#: ../src/gajim.py:937 ../src/gajim.py:941
+#: ../src/gajim.py:915 ../src/gajim.py:919
 #, python-format
 msgid "Error %(code)s: %(msg)s"
 msgstr "Fel %(code)s: %(msg)s"
 
 #. ('MSGNOTSENT', account, (jid, ierror_msg, msg, time, session))
-#: ../src/gajim.py:951 ../src/gajim.py:965
+#: ../src/gajim.py:929 ../src/gajim.py:943
 #, python-format
 msgid "error while sending %(message)s ( %(error)s )"
 msgstr "fel vid sändning av %(message)s ( %(error)s )"
 
-#: ../src/gajim.py:988 ../src/notify.py:495
+#: ../src/gajim.py:970 ../src/notify.py:513
 #, fuzzy
 msgid "Subscription request"
 msgstr "Prenumerationsbegäran"
 
-#: ../src/gajim.py:1013
+#: ../src/gajim.py:995
 msgid "Authorization accepted"
 msgstr "Auktorisering accepterad"
 
-#: ../src/gajim.py:1014
+#: ../src/gajim.py:996
 #, python-format
 msgid "The contact \"%s\" has authorized you to see his or her status."
 msgstr "Kontakten \"%s\" har auktoriserat dig att se hans eller hennes status."
 
-#: ../src/gajim.py:1026
+#: ../src/gajim.py:1008
 #, python-format
 msgid "Contact \"%s\" removed subscription from you"
 msgstr "Kontakten \"%s\" tog bort prenumerationen från dig"
 
-#: ../src/gajim.py:1027
+#: ../src/gajim.py:1009
 msgid ""
 "You will always see him or her as offline.\n"
 "Do you want to remove him or her from your contact list?"
@@ -7642,77 +7786,77 @@ msgstr ""
 "Du kommer alltid att se honom eller henne som frånkopplad.\n"
 "Vill du ta bort honom eller henne från din kontaktlista?"
 
-#: ../src/gajim.py:1052 ../src/notify.py:497
+#: ../src/gajim.py:1034 ../src/notify.py:515
 #, fuzzy
 msgid "Unsubscribed"
 msgstr "Säg _upp prenumeration"
 
-#: ../src/gajim.py:1093
+#: ../src/gajim.py:1075
 #, python-format
 msgid "Contact with \"%s\" cannot be established"
 msgstr "Kontakt med \"%s\" kan inte etableras"
 
-#: ../src/gajim.py:1281 ../src/groupchat_control.py:1166
+#: ../src/gajim.py:1264 ../src/groupchat_control.py:1175
 #, python-format
 msgid "%(nick)s is now known as %(new_nick)s"
 msgstr "%(nick)s är nu känd som %(new_nick)s"
 
-#: ../src/gajim.py:1299 ../src/groupchat_control.py:1341
-#: ../src/history_window.py:428 ../src/notify.py:232
+#: ../src/gajim.py:1282 ../src/groupchat_control.py:1358
+#: ../src/history_window.py:428 ../src/notify.py:244
 #, python-format
 msgid "%(nick)s is now %(status)s"
 msgstr "%(nick)s är nu %(status)s"
 
-#: ../src/gajim.py:1366
+#: ../src/gajim.py:1349
 #, python-format
 msgid "%(jid)s has set the subject to %(subject)s"
 msgstr "%(jid)s har ställt in ämnet till %(subject)s"
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/gajim.py:1430 ../src/groupchat_control.py:1126
+#: ../src/gajim.py:1413 ../src/groupchat_control.py:1134
 msgid "Any occupant is allowed to see your full JID"
 msgstr ""
 
-#: ../src/gajim.py:1433
+#: ../src/gajim.py:1416
 msgid "Room now shows unavailable member"
 msgstr "Rummet visar nu otillgängliga medlemmar"
 
-#: ../src/gajim.py:1435
+#: ../src/gajim.py:1418
 msgid "room now does not show unavailable members"
 msgstr "rummet visar nu inga otillgängliga medlemmar"
 
-#: ../src/gajim.py:1438
+#: ../src/gajim.py:1421
 msgid "A non-privacy-related room configuration change has occurred"
 msgstr ""
 
 #. Can be a presence (see chg_contact_status in groupchat_control.py)
-#: ../src/gajim.py:1441
+#: ../src/gajim.py:1424
 msgid "Room logging is now enabled"
 msgstr "Rumsloggning är nu aktiverad"
 
-#: ../src/gajim.py:1443
+#: ../src/gajim.py:1426
 msgid "Room logging is now disabled"
 msgstr "Rumsloggning är nu inaktiverad"
 
-#: ../src/gajim.py:1445
+#: ../src/gajim.py:1428
 msgid "Room is now non-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1448
+#: ../src/gajim.py:1431
 msgid "Room is now semi-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1451
+#: ../src/gajim.py:1434
 msgid "Room is now fully-anonymous"
 msgstr ""
 
-#: ../src/gajim.py:1483
+#: ../src/gajim.py:1466
 #, python-format
 msgid "A Password is required to join the room %s. Please type it."
 msgstr "Ett lösenord krävs för att gå in i rummet %s. Ange lösenordet."
 
-#: ../src/gajim.py:1517
+#: ../src/gajim.py:1500
 msgid ""
 "You configured Gajim to use GPG agent, but there is no GPG agent running or "
 "it returned a wrong passphrase.\n"
@@ -7720,31 +7864,32 @@ msgstr ""
 "Du har konfigurerat Gajim till att använda GPG-agent, men det finns ingen "
 "GPG-agent igång eller så returnerade den en felaktig lösenfras.\n"
 
-#: ../src/gajim.py:1519
+#: ../src/gajim.py:1502
 msgid "You are currently connected without your OpenPGP key."
 msgstr "Du är för närvarande ansluten utan din OpenPGP-nyckel."
 
-#: ../src/gajim.py:1522
+#: ../src/gajim.py:1505
 msgid "Your passphrase is incorrect"
 msgstr "Din lösenfras är inkorrekt."
 
-#: ../src/gajim.py:1545
+#: ../src/gajim.py:1528
 #, fuzzy
 msgid "GPG key not trusted"
 msgstr "GPG är inte användbar"
 
-#: ../src/gajim.py:1545
+#: ../src/gajim.py:1528
 msgid ""
 "The GPG key used to encrypt this chat is not trusted. Do you really want to "
 "encrypt this message?"
 msgstr ""
 
-#: ../src/gajim.py:1547 ../src/gajim.py:2185 ../src/gajim.py:2220
-#: ../src/groupchat_control.py:1849 ../src/roster_window.py:3826
+#: ../src/gajim.py:1530 ../src/gajim.py:2190 ../src/gajim.py:2225
+#: ../src/groupchat_control.py:1906 ../src/message_window.py:212
+#: ../src/roster_window.py:3906
 msgid "Do _not ask me again"
 msgstr "Fråga mig i_nte igen"
 
-#: ../src/gajim.py:1555
+#: ../src/gajim.py:1540
 #, fuzzy
 msgid ""
 "Gnome Keyring is installed but not \t\t\t\tcorrectly started (environment "
@@ -7753,19 +7898,19 @@ msgstr ""
 "Gnome Keyring är installerad men inte \t\t\t\t\t\t\tkorrekt startad "
 "(miljövariabeln är förmodligen inte \t\t\t\t\t\t\tkorrekt inställd)"
 
-#: ../src/gajim.py:1662
+#: ../src/gajim.py:1650
 #, python-format
 msgid "New mail on %(gmail_mail_address)s"
 msgstr "Ny e-post på %(gmail_mail_address)s"
 
-#: ../src/gajim.py:1664
+#: ../src/gajim.py:1652
 #, python-format
 msgid "You have %d new mail conversation"
 msgid_plural "You have %d new mail conversations"
 msgstr[0] "Du har %d ny e-postkonversation"
 msgstr[1] "Du har %d nya e-postkonversationer"
 
-#: ../src/gajim.py:1677
+#: ../src/gajim.py:1665
 #, python-format
 msgid ""
 "\n"
@@ -7780,80 +7925,90 @@ msgstr ""
 "Ämne: %(subject)s\n"
 "%(snippet)s"
 
-#: ../src/gajim.py:1748
+#: ../src/gajim.py:1736
 #, python-format
 msgid "%s wants to send you a file."
 msgstr "%s vill skicka en fil till dig."
 
-#: ../src/gajim.py:1816
+#: ../src/gajim.py:1774 ../src/roster_window.py:1843
+#, fuzzy
+msgid "Remote contact stopped transfer"
+msgstr "Ta bort en kontakt från kontaktlista"
+
+#: ../src/gajim.py:1776 ../src/roster_window.py:1845
+#, fuzzy
+msgid "Error opening file"
+msgstr "Fel vid läsning av fil:"
+
+#: ../src/gajim.py:1807
 #, python-format
 msgid "You successfully received %(filename)s from %(name)s."
 msgstr "%(filename)s har mattagits från %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1820
+#: ../src/gajim.py:1811
 #, python-format
 msgid "File transfer of %(filename)s from %(name)s stopped."
 msgstr "Överföringen av %(filename)s från %(name)s har stannat."
 
-#: ../src/gajim.py:1833
+#: ../src/gajim.py:1824
 #, python-format
 msgid "You successfully sent %(filename)s to %(name)s."
 msgstr "%(filename)s har skickats till %(name)s."
 
 #. ft stopped
-#: ../src/gajim.py:1837
+#: ../src/gajim.py:1828
 #, python-format
 msgid "File transfer of %(filename)s to %(name)s stopped."
 msgstr "Överföringen av %(filename)s till %(name)s har stannat."
 
-#: ../src/gajim.py:1925
+#: ../src/gajim.py:1926
 #, python-format
 msgid ""
 "Unable to decrypt message from %s\n"
 "It may have been tampered with."
 msgstr ""
 
-#: ../src/gajim.py:1932
+#: ../src/gajim.py:1933
 msgid "Unable to decrypt message"
 msgstr "Kunde inte dekryptera meddelande"
 
-#: ../src/gajim.py:2006
+#: ../src/gajim.py:2007
 msgid "Username Conflict"
 msgstr "Användarnamn-konflikt"
 
-#: ../src/gajim.py:2007
+#: ../src/gajim.py:2008
 msgid "Please type a new username for your local account"
 msgstr "Ange ett nytt användarnamn för ditt lokala konto"
 
-#: ../src/gajim.py:2019
+#: ../src/gajim.py:2020
 msgid "Ping?"
 msgstr "Ping?"
 
-#: ../src/gajim.py:2032
+#: ../src/gajim.py:2033
 #, python-format
 msgid "Pong! (%s s.)"
 msgstr "Pong! (%s s.)"
 
-#: ../src/gajim.py:2043
+#: ../src/gajim.py:2044
 msgid "Error."
 msgstr "Fel."
 
-#: ../src/gajim.py:2068
+#: ../src/gajim.py:2069
 msgid "Resource Conflict"
 msgstr "Resurskonflikt"
 
-#: ../src/gajim.py:2069
+#: ../src/gajim.py:2070
 msgid ""
 "You are already connected to this account with the same resource. Please "
 "type a new one"
 msgstr "Du är redan ansluten till detta konto med samma resurs. Ange en annan"
 
-#: ../src/gajim.py:2124
+#: ../src/gajim.py:2129
 msgid "Error verifying SSL certificate"
 msgstr "Fel vid verifiering av SSL-certifikat"
 
-#: ../src/gajim.py:2125
+#: ../src/gajim.py:2130
 #, python-format
 msgid ""
 "There was an error verifying the SSL certificate of your jabber server: %"
@@ -7864,15 +8019,15 @@ msgstr ""
 "server: %(error)s\n"
 "Vill du fortfarande ansluta till denna server?"
 
-#: ../src/gajim.py:2130
+#: ../src/gajim.py:2135
 msgid "Ignore this error for this certificate."
 msgstr "Ignorera detta fel med certifikatet."
 
-#: ../src/gajim.py:2150
+#: ../src/gajim.py:2155
 msgid "SSL certificate error"
 msgstr "SSL-certifikatfel"
 
-#: ../src/gajim.py:2151
+#: ../src/gajim.py:2156
 #, python-format
 msgid ""
 "It seems the SSL certificate of account %(account)s has changed or your "
@@ -7889,11 +8044,11 @@ msgstr ""
 "\n"
 "Vill du fortfarande ansluta och uppdatera fingeravtrycket för certifikatet?"
 
-#: ../src/gajim.py:2181 ../src/gajim.py:2216
+#: ../src/gajim.py:2186 ../src/gajim.py:2221
 msgid "Insecure connection"
 msgstr "Osäker anslutning"
 
-#: ../src/gajim.py:2182
+#: ../src/gajim.py:2187
 msgid ""
 "You are about to send your password on an unencrypted connection. Are you "
 "sure you want to do that?"
@@ -7901,11 +8056,11 @@ msgstr ""
 "Du är på väg att skicka ditt lösenord över en okrypterad anslutning. Är du "
 "säker på att du vill göra det?"
 
-#: ../src/gajim.py:2184 ../src/gajim.py:2219
+#: ../src/gajim.py:2189 ../src/gajim.py:2224
 msgid "Yes, I really want to connect insecurely"
 msgstr "Ja, jag vill verkligen ansluta på ett osäkert sätt"
 
-#: ../src/gajim.py:2217
+#: ../src/gajim.py:2222
 msgid ""
 "You are about to send your password on an insecure connection. You should "
 "install PyOpenSSL to prevent that. Are you sure you want to do that?"
@@ -7914,83 +8069,66 @@ msgstr ""
 "installera PyOpenSSL för att förhindra det. Är du säker på att du vill "
 "skicka lösenordet?"
 
-#: ../src/gajim.py:2237
+#: ../src/gajim.py:2242
 msgid "PEP node was not removed"
 msgstr ""
 
-#: ../src/gajim.py:2238
+#: ../src/gajim.py:2243
 #, python-format
 msgid "PEP node %(node)s was not removed: %(message)s"
 msgstr ""
 
 #. theme doesn't exist, disable emoticons
-#: ../src/gajim.py:2724 ../src/gajim.py:2746
+#: ../src/gajim.py:2737 ../src/gajim.py:2759
 msgid "Emoticons disabled"
 msgstr "Känsloikoner inaktiverade"
 
-#: ../src/gajim.py:2725
+#: ../src/gajim.py:2738
 msgid ""
 "Your configured emoticons theme has not been found, so emoticons have been "
 "disabled."
 msgstr ""
 
-#: ../src/gajim.py:2747
+#: ../src/gajim.py:2760
 msgid ""
 "Your configured emoticons theme cannot been loaded. You maybe need to update "
 "the format of emoticons.py file. See http://trac.gajim.org/wiki/Emoticons "
 "for more details."
 msgstr ""
 
-#: ../src/gajim.py:2773 ../src/roster_window.py:3314
+#: ../src/gajim.py:2786 ../src/roster_window.py:3390
 msgid "You cannot join a group chat while you are invisible"
 msgstr "Du kan inte gå in i en gruppchatt när du är osynlig"
 
 #. it is good to notify the user
 #. in case he or she cannot see the output of the console
-#: ../src/gajim.py:3051
+#: ../src/gajim.py:3069
 msgid "Could not save your settings and preferences"
 msgstr "Kunde inte spara dina inställningar"
 
-#: ../src/gajim.py:3148
-msgid "Bookmark already set"
-msgstr "Bokmärke finns redan"
-
-#: ../src/gajim.py:3149
-#, python-format
-msgid "Group Chat \"%s\" is already in your bookmarks."
-msgstr "Gruppchatten \"%s\" finns redan i dina bokmärken."
-
-#: ../src/gajim.py:3162
-msgid "Bookmark has been added successfully"
-msgstr "Bokmärket har lagts till"
-
-#: ../src/gajim.py:3163
-msgid "You can manage your bookmarks via Actions menu in your roster."
-msgstr "Du kan hantera dina bokmärken via åtgärdsmenyn i din kontaktlista."
-
-#: ../src/gajim-remote.py:81
+#: ../src/gajim-remote.py:78
 msgid "Shows a help on specific command"
 msgstr "Visar hjälp för ett specifikt kommando"
 
 #. User gets help for the command, specified by this parameter
-#: ../src/gajim-remote.py:84
+#: ../src/gajim-remote.py:81
 msgid "command"
 msgstr "kommando"
 
-#: ../src/gajim-remote.py:85
+#: ../src/gajim-remote.py:82
 msgid "show help on command"
 msgstr "visar hjälp för kommando"
 
-#: ../src/gajim-remote.py:89
+#: ../src/gajim-remote.py:86
 msgid "Shows or hides the roster window"
 msgstr "Visar eller döljer kontaktlistan"
 
-#: ../src/gajim-remote.py:93
+#: ../src/gajim-remote.py:90
 #, fuzzy
 msgid "Pops up a window with the next pending event"
 msgstr "Öppnar ett fönster med nästa olästa meddelande"
 
-#: ../src/gajim-remote.py:97
+#: ../src/gajim-remote.py:94
 msgid ""
 "Prints a list of all contacts in the roster. Each contact appears on a "
 "separate line"
@@ -7998,47 +8136,48 @@ msgstr ""
 "Skriver ut en lista över alla kontakter i kontaktlistan. Varje kontakt "
 "hamnar på en egen rad"
 
-#: ../src/gajim-remote.py:100 ../src/gajim-remote.py:115
-#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:138
+#: ../src/gajim-remote.py:97 ../src/gajim-remote.py:112
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:138
 #: ../src/gajim-remote.py:152 ../src/gajim-remote.py:161
 #: ../src/gajim-remote.py:182 ../src/gajim-remote.py:212
 #: ../src/gajim-remote.py:221 ../src/gajim-remote.py:228
 #: ../src/gajim-remote.py:235 ../src/gajim-remote.py:246
-#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:262 ../src/gajim-remote.py:273
 msgid "account"
 msgstr "konto"
 
-#: ../src/gajim-remote.py:100
+#: ../src/gajim-remote.py:97
 msgid "show only contacts of the given account"
 msgstr "visa bara kontakter för det givna kontot"
 
-#: ../src/gajim-remote.py:106
+#: ../src/gajim-remote.py:103
 msgid "Prints a list of registered accounts"
 msgstr "Skriver ut en lista över registrerade konton"
 
-#: ../src/gajim-remote.py:110
+#: ../src/gajim-remote.py:107
 msgid "Changes the status of account or accounts"
 msgstr "Ändrar status för konto eller konton"
 
 #. offline, online, chat, away, xa, dnd, invisible should not be translated
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:110
 msgid "status"
 msgstr "status"
 
-#: ../src/gajim-remote.py:113
+#: ../src/gajim-remote.py:110
 msgid "one of: offline, online, chat, away, xa, dnd, invisible "
 msgstr "en av: offline, online, chat, away, xa, dnd, invisible "
 
-#: ../src/gajim-remote.py:114 ../src/gajim-remote.py:135
-#: ../src/gajim-remote.py:149 ../src/gajim-remote.py:160
+#: ../src/gajim-remote.py:111 ../src/gajim-remote.py:124
+#: ../src/gajim-remote.py:135 ../src/gajim-remote.py:149
+#: ../src/gajim-remote.py:160 ../src/gajim-remote.py:264
 msgid "message"
 msgstr "meddelande"
 
-#: ../src/gajim-remote.py:114
+#: ../src/gajim-remote.py:111
 msgid "status message"
 msgstr "statusmeddelande"
 
-#: ../src/gajim-remote.py:115
+#: ../src/gajim-remote.py:112
 msgid ""
 "change status of account \"account\". If not specified, try to change status "
 "of all accounts that have \"sync with global status\" option set"
@@ -8046,19 +8185,23 @@ msgstr ""
 "ändra status för kontot \"konto\". Om inte angivet, försök ändra status på "
 "alla konton som har alternativet \"synkronisera med global status\" inställt"
 
-#: ../src/gajim-remote.py:121
+#: ../src/gajim-remote.py:118
 msgid "Shows the chat dialog so that you can send messages to a contact"
 msgstr "Visa chattdialogen så att du kan skicka meddelanden till en kontakt"
 
-#: ../src/gajim-remote.py:123
+#: ../src/gajim-remote.py:120
 msgid "JID of the contact that you want to chat with"
 msgstr "JID för kontakten som du vill chatta med"
 
-#: ../src/gajim-remote.py:125 ../src/gajim-remote.py:212
+#: ../src/gajim-remote.py:122 ../src/gajim-remote.py:212
 msgid "if specified, contact is taken from the contact list of this account"
 msgstr ""
 "om specificerat tas kontakten bort från kontaktlistan för det här kontot"
 
+#: ../src/gajim-remote.py:125
+msgid "message content. The account must be specified or \"\""
+msgstr ""
+
 #: ../src/gajim-remote.py:130
 #, fuzzy
 msgid ""
@@ -8258,51 +8401,56 @@ msgstr "URI att hantera"
 msgid "Account in which you want to handle it"
 msgstr "Konto i vilket du vill hanterare den"
 
-#: ../src/gajim-remote.py:267
+#: ../src/gajim-remote.py:264
+#, fuzzy
+msgid "Message content"
+msgstr "meddelandeinnehåll"
+
+#: ../src/gajim-remote.py:268
 msgid "Join a MUC room"
 msgstr "Gå in i ett MUC-rum"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:270
 msgid "room"
 msgstr "rum"
 
-#: ../src/gajim-remote.py:269
+#: ../src/gajim-remote.py:270
 msgid "Room JID"
 msgstr "Rummets JID"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "nick"
 msgstr "smeknamn"
 
-#: ../src/gajim-remote.py:270
+#: ../src/gajim-remote.py:271
 msgid "Nickname to use"
 msgstr "Smeknamn att använda"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 msgid "password"
 msgstr "lösenord"
 
-#: ../src/gajim-remote.py:271
+#: ../src/gajim-remote.py:272
 msgid "Password to enter the room"
 msgstr "Lösenord för att gå in i rummet"
 
-#: ../src/gajim-remote.py:272
+#: ../src/gajim-remote.py:273
 msgid "Account from which you want to enter the room"
 msgstr "Konto från vilket du vill gå in i rummet"
 
-#: ../src/gajim-remote.py:277
+#: ../src/gajim-remote.py:278
 msgid "Check if Gajim is running"
 msgstr "Kontrollera om Gajim är igång"
 
-#: ../src/gajim-remote.py:281
+#: ../src/gajim-remote.py:282
 msgid "Shows or hides the ipython window"
 msgstr "Visar eller döljer ipython-fönstret"
 
-#: ../src/gajim-remote.py:308
+#: ../src/gajim-remote.py:309
 msgid "Missing argument \"contact_jid\""
 msgstr "Saknar argument \"contact_jid\""
 
-#: ../src/gajim-remote.py:327
+#: ../src/gajim-remote.py:328
 #, python-format
 msgid ""
 "'%s' is not in your roster.\n"
@@ -8311,17 +8459,17 @@ msgstr ""
 "\"%s\" finns inte i din kontaktlista.\n"
 "Ange konto för att skicka meddelandet."
 
-#: ../src/gajim-remote.py:330
+#: ../src/gajim-remote.py:331
 msgid "You have no active account"
 msgstr "Du har inget aktivt konto"
 
-#: ../src/gajim-remote.py:382
+#: ../src/gajim-remote.py:383
 msgid "It seems Gajim is not running. So you can't use gajim-remote."
 msgstr ""
 "Det verkar som om Gajim inte är igång. Därför kan du inte använda gajim-"
 "remote."
 
-#: ../src/gajim-remote.py:405
+#: ../src/gajim-remote.py:406
 #, python-format
 msgid ""
 "Usage: %(basename)s %(command)s %(arguments)s \n"
@@ -8330,16 +8478,16 @@ msgstr ""
 "Användning: %(basename)s %(command)s %(arguments)s \n"
 "\t %(help)s"
 
-#: ../src/gajim-remote.py:409
+#: ../src/gajim-remote.py:410
 msgid "Arguments:"
 msgstr "Parametrar:"
 
-#: ../src/gajim-remote.py:413
+#: ../src/gajim-remote.py:414
 #, python-format
 msgid "%s not found"
 msgstr "%s kunde inte hittas"
 
-#: ../src/gajim-remote.py:417
+#: ../src/gajim-remote.py:418
 #, python-format
 msgid ""
 "Usage: %s command [arguments]\n"
@@ -8348,7 +8496,7 @@ msgstr ""
 "Användning: %s kommando [parametrar]\n"
 "Kommando är en av:\n"
 
-#: ../src/gajim-remote.py:482
+#: ../src/gajim-remote.py:483
 #, python-format
 msgid ""
 "Too many arguments. \n"
@@ -8357,7 +8505,7 @@ msgstr ""
 "För många argument. \n"
 "Skriv \"%(basename)s help %(command)s\" för mer information"
 
-#: ../src/gajim-remote.py:487
+#: ../src/gajim-remote.py:488
 #, python-format
 msgid ""
 "Argument \"%(arg)s\" is not specified. \n"
@@ -8366,7 +8514,7 @@ msgstr ""
 "Argumentet \"%(arg)s\" är inte angivet. \n"
 "Skriv \"%(basename)s help %(command)s\" för mer info"
 
-#: ../src/gajim-remote.py:506
+#: ../src/gajim-remote.py:507
 #, fuzzy
 msgid "Wrong uri"
 msgstr "Fel Lösenfras"
@@ -8384,15 +8532,15 @@ msgid "Please create a clean new theme with your desired name."
 msgstr "Skapa ett nytt, tomt tema med ditt önskade namn."
 
 #. don't confuse translators
-#: ../src/gajim_themes_window.py:172
+#: ../src/gajim_themes_window.py:169
 msgid "theme name"
 msgstr "temanamn"
 
-#: ../src/gajim_themes_window.py:189
+#: ../src/gajim_themes_window.py:186
 msgid "You cannot delete your current theme"
 msgstr "Du kan inte ta bort ditt nuvarande tema"
 
-#: ../src/gajim_themes_window.py:190
+#: ../src/gajim_themes_window.py:187
 msgid "Please first choose another for your current theme."
 msgstr "Välj först ett annat för ditt aktuella tema."
 
@@ -8407,153 +8555,155 @@ msgid "You are no longer in group chat \"%(room)s\" or \"%(nick)s\" has left."
 msgstr ""
 "Du är inte längre i gruppchatten \"%(room)s\" eller \"%(nick)s\" har lämnat."
 
-#: ../src/groupchat_control.py:453
+#: ../src/groupchat_control.py:409
 msgid "Insert Nickname"
 msgstr "Infoga smeknamn"
 
-#: ../src/groupchat_control.py:605
+#: ../src/groupchat_control.py:561
 msgid "Conversation with "
 msgstr "Konversation med "
 
-#: ../src/groupchat_control.py:607
+#: ../src/groupchat_control.py:563
 msgid "Continued conversation"
 msgstr "Fortsatt konversation"
 
-#: ../src/groupchat_control.py:1014
-msgid "Really send file?"
-msgstr "Verkligen skicka filen?"
-
-#: ../src/groupchat_control.py:1015
-#, python-format
-msgid "If you send a file to %s, he/she will know your real Jabber ID."
-msgstr ""
-"Om du skickar en fil till %s så kommer han/hon att få veta ditt riktiga "
-"Jabber-ID."
-
 #. Can be a message (see handle_event_gc_config_change in gajim.py)
-#: ../src/groupchat_control.py:1129
+#: ../src/groupchat_control.py:1137
 msgid "Room logging is enabled"
 msgstr "Rumsloggning är aktiverad"
 
-#: ../src/groupchat_control.py:1131
+#: ../src/groupchat_control.py:1139
 msgid "A new room has been created"
 msgstr "Ett nytt rum har skapats"
 
-#: ../src/groupchat_control.py:1134
+#: ../src/groupchat_control.py:1142
 msgid "The server has assigned or modified your roomnick"
 msgstr "Servern har tilldelat eller ändrat ditt rumsnamn"
 
 #. do not print 'kicked by None'
-#: ../src/groupchat_control.py:1140
+#: ../src/groupchat_control.py:1148
 #, python-format
 msgid "%(nick)s has been kicked: %(reason)s"
 msgstr "%(nick)s har blivit sparkad: %(reason)s"
 
-#: ../src/groupchat_control.py:1144
+#: ../src/groupchat_control.py:1152
 #, python-format
 msgid "%(nick)s has been kicked by %(who)s: %(reason)s"
 msgstr "%(nick)s har blivit sparkad av %(who)s: %(reason)s"
 
 #. do not print 'banned by None'
-#: ../src/groupchat_control.py:1151
+#: ../src/groupchat_control.py:1159
 #, python-format
 msgid "%(nick)s has been banned: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst: %(reason)s"
 
-#: ../src/groupchat_control.py:1155
+#: ../src/groupchat_control.py:1163
 #, python-format
 msgid "%(nick)s has been banned by %(who)s: %(reason)s"
 msgstr "%(nick)s har blivit bannlyst av %(who)s: %(reason)s"
 
-#: ../src/groupchat_control.py:1164
+#: ../src/groupchat_control.py:1173 ../src/groupchat_control.py:1250
 #, python-format
 msgid "You are now known as %s"
 msgstr "Du är nu känd som %s"
 
-#: ../src/groupchat_control.py:1202 ../src/groupchat_control.py:1206
-#: ../src/groupchat_control.py:1211
+#: ../src/groupchat_control.py:1211 ../src/groupchat_control.py:1215
+#: ../src/groupchat_control.py:1220
 #, python-format
 msgid "%(nick)s has been removed from the room (%(reason)s)"
 msgstr "%(nick)s har tagits bort från rummet (%(reason)s)"
 
-#: ../src/groupchat_control.py:1203
+#: ../src/groupchat_control.py:1212
 #, fuzzy
 msgid "affiliation changed"
 msgstr "Anknytning: "
 
-#: ../src/groupchat_control.py:1208
+#: ../src/groupchat_control.py:1217
 msgid "room configuration changed to members-only"
 msgstr "rumskonfigurationen har ändrats till members-only"
 
-#: ../src/groupchat_control.py:1213
+#: ../src/groupchat_control.py:1222
 msgid "system shutdown"
 msgstr ""
 
-#: ../src/groupchat_control.py:1282
+#: ../src/groupchat_control.py:1299
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s by %(actor)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1286
+#: ../src/groupchat_control.py:1303
 #, python-format
 msgid "** Affiliation of %(nick)s has been set to %(affiliation)s"
 msgstr ""
 
-#: ../src/groupchat_control.py:1301
+#: ../src/groupchat_control.py:1318
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s by %(actor)s"
 msgstr "** Rollen för %(nick)s har ställts in till %(role)s av %(actor)s"
 
-#: ../src/groupchat_control.py:1305
+#: ../src/groupchat_control.py:1322
 #, python-format
 msgid "** Role of %(nick)s has been set to %(role)s"
 msgstr "** Rollen för %(nick)s har ställts in till %(role)s"
 
-#: ../src/groupchat_control.py:1334
+#: ../src/groupchat_control.py:1351
 #, python-format
 msgid "%s has left"
 msgstr "%s har lämnat"
 
-#: ../src/groupchat_control.py:1339
+#: ../src/groupchat_control.py:1356
 #, python-format
 msgid "%s has joined the group chat"
 msgstr "%s har gått in i gruppchatten"
 
-#. Invalid Nickname
-#. invalid char
-#: ../src/groupchat_control.py:1454 ../src/groupchat_control.py:1737
-msgid "Invalid nickname"
-msgstr "Ogiltigt smeknamn"
-
-#: ../src/groupchat_control.py:1478 ../src/groupchat_control.py:1496
-#: ../src/groupchat_control.py:1582 ../src/groupchat_control.py:1599
+#: ../src/groupchat_control.py:1496 ../src/groupchat_control.py:1514
 #, python-format
 msgid "Nickname not found: %s"
 msgstr "Smeknamnet kunde inte hittas: %s"
 
-#: ../src/groupchat_control.py:1512
+#: ../src/groupchat_control.py:1530
 msgid "This group chat has no subject"
 msgstr "Denna gruppchatt saknar ämne"
 
-#: ../src/groupchat_control.py:1524
+#: ../src/groupchat_control.py:1542
 #, python-format
 msgid "Invited %(contact_jid)s to %(room_jid)s."
 msgstr "Bjöd in %(contact_jid)s till %(room_jid)s."
 
-#: ../src/groupchat_control.py:1660
+#: ../src/groupchat_control.py:1605
+#, python-format
+msgid ""
+"There is an ambiguity: %d nicks match.\n"
+" Please use graphical interface "
+msgstr ""
+
+#. We can't do the difference between nick and reason
+#. So we don't say the nick
+#: ../src/groupchat_control.py:1621 ../src/groupchat_control.py:1652
+#, fuzzy
+msgid "Nickname not found"
+msgstr "Smeknamnet kunde inte hittas: %s"
+
+#: ../src/groupchat_control.py:1645
+#, python-format
+msgid ""
+"There is an ambiguity: %d nicks match.\n"
+" Please use graphical interface"
+msgstr ""
+
+#: ../src/groupchat_control.py:1728
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname|JID> [reason], bans the JID from the group chat. The "
 "nickname of an occupant may be substituted, but not if it contains \"@\". If "
-"the JID is currently in the group chat, he/she/it will also be kicked. Does "
-"NOT support spaces in nickname."
+"the JID is currently in the group chat, he/she/it will also be kicked."
 msgstr ""
 "Användning: /%s <smeknamn|JID> [reason], bannlyser JID från rummet. "
 "Smeknamnet kan substitueras, men inte om det innehåller \"@\". Of JID "
 "befinner sig i rummet kommer han/hon/den/det också att att bli sparkad. "
 "Stödjer INTE mellanslag i smeknamn."
 
-#: ../src/groupchat_control.py:1667
+#: ../src/groupchat_control.py:1734
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname>, opens a private chat window with the specified "
@@ -8562,7 +8712,7 @@ msgstr ""
 "Användning: /%s <semknamn>, öppnar ett privat chattfönster till den "
 "specificerade deltagaren."
 
-#: ../src/groupchat_control.py:1673
+#: ../src/groupchat_control.py:1740
 #, python-format
 msgid ""
 "Usage: /%s [reason], closes the current window or tab, displaying reason if "
@@ -8571,7 +8721,7 @@ msgstr ""
 "Användning: /%s [anledning], stänger aktuellt fönster eller flik och visar "
 "anledning om sådan specificerades."
 
-#: ../src/groupchat_control.py:1679
+#: ../src/groupchat_control.py:1746
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <JID> [reason], invites JID to the current group chat, optionally "
@@ -8580,7 +8730,7 @@ msgstr ""
 "Användning: /%s <JID> [anledning], bjuder in JID till aktivt rum med en "
 "valbar anledning."
 
-#: ../src/groupchat_control.py:1683
+#: ../src/groupchat_control.py:1750
 #, python-format
 msgid ""
 "Usage: /%s <room>@<server>[/nickname], offers to join room@server optionally "
@@ -8589,18 +8739,17 @@ msgstr ""
 "Användning: /%s <rum>@<server>[/smeknamn], erbjuder att delta i rum@server "
 "med valbart smeknamn"
 
-#: ../src/groupchat_control.py:1687
-#, python-format
+#: ../src/groupchat_control.py:1754
+#, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [reason], removes the occupant specified by nickname "
-"from the group chat and optionally displays a reason. Does NOT support "
-"spaces in nickname."
+"from the group chat and optionally displays a reason."
 msgstr ""
 "Användning: /%s <smeknamn> [anledning], tar bort medlemmen angiven med "
 "smeknamn från gruppchatten och visar en valfri anledning. Tillåter INTE "
 "blanksteg i smeknamnet."
 
-#: ../src/groupchat_control.py:1696
+#: ../src/groupchat_control.py:1762
 #, fuzzy, python-format
 msgid ""
 "Usage: /%s <nickname> [message], opens a private message window and sends "
@@ -8609,23 +8758,23 @@ msgstr ""
 "Användning: /%s <smeknamn> [meddelande], öppnar ett privat meddelandefönster "
 "och skickar ett meddelande till medlemmen specificerad med smeknamn."
 
-#: ../src/groupchat_control.py:1701
+#: ../src/groupchat_control.py:1767
 #, python-format
 msgid "Usage: /%s <nickname>, changes your nickname in current group chat."
 msgstr "Användning: /%s <smeknamn>, ändrar ditt smeknamn i aktuell gruppchatt."
 
-#: ../src/groupchat_control.py:1705
+#: ../src/groupchat_control.py:1771
 #, python-format
 msgid "Usage: /%s , display the names of group chat occupants."
 msgstr "Användning: /%s, visa namnen för gruppchattens deltagare."
 
-#: ../src/groupchat_control.py:1709
+#: ../src/groupchat_control.py:1775
 #, python-format
 msgid "Usage: /%s [topic], displays or updates the current group chat topic."
 msgstr ""
 "Användning: /%s [ämne], visar eller uppdaterar ämnet för aktuell gruppchatt."
 
-#: ../src/groupchat_control.py:1712
+#: ../src/groupchat_control.py:1778
 #, python-format
 msgid ""
 "Usage: /%s <message>, sends a message without looking for other commands."
@@ -8633,62 +8782,76 @@ msgstr ""
 "Användning: /%s <meddelande>, skickar meddelande utan att leta efter andra "
 "kommandon."
 
-#: ../src/groupchat_control.py:1843
+#: ../src/groupchat_control.py:1781
+#, python-format
+msgid ""
+"Usage: /%s <nickname>, prevent <nickname> to send you messages or private "
+"messages."
+msgstr ""
+
+#: ../src/groupchat_control.py:1784
+#, fuzzy, python-format
+msgid ""
+"Usage: /%s <nickname>, allow <nickname> to send you messages and private "
+"messages."
+msgstr "Användning: /%s <smeknamn>, ändrar ditt smeknamn i aktuell gruppchatt."
+
+#: ../src/groupchat_control.py:1900
 #, python-format
 msgid "Are you sure you want to leave group chat \"%s\"?"
 msgstr "Är du säker på att du vill lämna gruppchatten \"%s\"?"
 
-#: ../src/groupchat_control.py:1845
+#: ../src/groupchat_control.py:1902
 msgid ""
 "If you close this window, you will be disconnected from this group chat."
 msgstr ""
 "Du kommer att bli frånkopplad från denna gruppchatt om du stänger detta "
 "fönster."
 
-#: ../src/groupchat_control.py:1882
+#: ../src/groupchat_control.py:1939
 msgid "Changing Subject"
 msgstr "Ändrar Ämne"
 
-#: ../src/groupchat_control.py:1883
+#: ../src/groupchat_control.py:1940
 msgid "Please specify the new subject:"
 msgstr "Ange det nya ämnet:"
 
-#: ../src/groupchat_control.py:1887
+#: ../src/groupchat_control.py:1947
 msgid "Changing Nickname"
 msgstr "Byter Smeknamn"
 
-#: ../src/groupchat_control.py:1888
+#: ../src/groupchat_control.py:1948
 msgid "Please specify the new nickname you want to use:"
 msgstr "Ange det nya smeknamnet du vill använda:"
 
 #. Ask for a reason
-#: ../src/groupchat_control.py:1915
+#: ../src/groupchat_control.py:1977
 #, python-format
 msgid "Destroying %s"
 msgstr "Förstör %s"
 
-#: ../src/groupchat_control.py:1916
+#: ../src/groupchat_control.py:1978
 msgid ""
 "You are going to definitively destroy this room.\n"
 "You may specify a reason below:"
 msgstr ""
 
-#: ../src/groupchat_control.py:1918
+#: ../src/groupchat_control.py:1980
 msgid "You may also enter an alternate venue:"
 msgstr ""
 
 #. ask for reason
-#: ../src/groupchat_control.py:2089
+#: ../src/groupchat_control.py:2151
 #, python-format
 msgid "Kicking %s"
 msgstr "Sparkar %s"
 
-#: ../src/groupchat_control.py:2090 ../src/groupchat_control.py:2381
+#: ../src/groupchat_control.py:2152 ../src/groupchat_control.py:2457
 msgid "You may specify a reason below:"
 msgstr "Du kan ange en orsak här under:"
 
 #. ask for reason
-#: ../src/groupchat_control.py:2380
+#: ../src/groupchat_control.py:2456
 #, python-format
 msgid "Banning %s"
 msgstr "Bannlyser %s"
@@ -8719,81 +8882,81 @@ msgstr "Detaljer"
 msgid "Error: cannot open %s for reading"
 msgstr "Fel: kan inte öppna %s för läsning"
 
-#: ../src/gtkgui_helpers.py:356
+#: ../src/gtkgui_helpers.py:351
 msgid "Error reading file:"
 msgstr "Fel vid läsning av fil:"
 
-#: ../src/gtkgui_helpers.py:359
+#: ../src/gtkgui_helpers.py:354
 msgid "Error parsing file:"
 msgstr "Fel vid parsning av fil:"
 
 #. do not traceback (could be a permission problem)
 #. we talk about a file here
-#: ../src/gtkgui_helpers.py:396
+#: ../src/gtkgui_helpers.py:391
 #, python-format
 msgid "Could not write to %s. Session Management support will not work"
 msgstr ""
 "Kunde inte skriva till %s. Session Management-stöd kommer inte att fungera"
 
 #. xmpp: is currently handled by another program, so ask the user
-#: ../src/gtkgui_helpers.py:733
+#: ../src/gtkgui_helpers.py:728
 msgid "Gajim is not the default Jabber client"
 msgstr "Gajim är inte standardklient för Jabber"
 
-#: ../src/gtkgui_helpers.py:734
+#: ../src/gtkgui_helpers.py:729
 msgid "Would you like to make Gajim the default Jabber client?"
 msgstr "Vill du göra Gajim till standardklient för Jabber?"
 
-#: ../src/gtkgui_helpers.py:735
+#: ../src/gtkgui_helpers.py:730
 msgid "Always check to see if Gajim is the default Jabber client on startup"
 msgstr "Kontrollera vid start om Gajim är standardklient för Jabber"
 
-#: ../src/gtkgui_helpers.py:804
+#: ../src/gtkgui_helpers.py:799
 msgid "Extension not supported"
 msgstr "Utökning stöds inte"
 
-#: ../src/gtkgui_helpers.py:805
+#: ../src/gtkgui_helpers.py:800
 #, python-format
 msgid "Image cannot be saved in %(type)s format. Save as %(new_filename)s?"
 msgstr "Bilden kan inte sparas i %(type)s format. Spara som %(new_filename)s?"
 
-#: ../src/gtkgui_helpers.py:840
+#: ../src/gtkgui_helpers.py:835
 msgid "Save Image as..."
 msgstr "Spara bild som..."
 
-#: ../src/history_manager.py:96
+#: ../src/history_manager.py:121
 msgid "Cannot find history logs database"
 msgstr "Kan inte hitta historie- och logdatabas"
 
 #. holds jid
-#: ../src/history_manager.py:136
+#: ../src/history_manager.py:161
 msgid "Contacts"
 msgstr "Kontakter"
 
 #. holds time
-#: ../src/history_manager.py:149 ../src/history_manager.py:189
+#: ../src/history_manager.py:174 ../src/history_manager.py:214
 #: ../src/history_window.py:95
 msgid "Date"
 msgstr "Datum"
 
 #. holds nickname
-#: ../src/history_manager.py:155 ../src/history_manager.py:207
+#: ../src/history_manager.py:180 ../src/history_manager.py:232
 msgid "Nickname"
 msgstr "Smeknamn"
 
 #. holds message
-#: ../src/history_manager.py:163 ../src/history_manager.py:195
+#: ../src/history_manager.py:188 ../src/history_manager.py:220
 #: ../src/history_window.py:103
 msgid "Message"
 msgstr "Meddelande"
 
-#: ../src/history_manager.py:223
+#: ../src/history_manager.py:248
 msgid ""
 "Do you want to clean up the database? (STRONGLY NOT RECOMMENDED IF GAJIM IS "
 "RUNNING)"
 msgstr "Vill du städa upp databasen? (DU AVRÅDS ATT GÖRA DETTA OM GAJIM KÖRS)"
 
-#: ../src/history_manager.py:225
+#: ../src/history_manager.py:250
 msgid ""
 "Normally allocated database size will not be freed, it will just become "
 "reusable. If you really want to reduce database filesize, click YES, else "
@@ -8807,26 +8970,26 @@ msgstr ""
 "\n"
 "Om du väljer JA, vänta..."
 
-#: ../src/history_manager.py:433
+#: ../src/history_manager.py:458
 msgid "Exporting History Logs..."
 msgstr "Exporterar Loggar..."
 
-#: ../src/history_manager.py:508
+#: ../src/history_manager.py:533
 #, python-format
 msgid "%(who)s on %(time)s said: %(message)s\n"
 msgstr "%(who)s på %(time)s sa: %(message)s\n"
 
-#: ../src/history_manager.py:545
+#: ../src/history_manager.py:570
 msgid "Do you really want to delete logs of the selected contact?"
 msgid_plural "Do you really want to delete logs of the selected contacts?"
 msgstr[0] "Vill du verkligen ta bort loggar för den valda kontakten?"
 msgstr[1] "Vill du verkligen ta bort loggar för de valda kontakterna?"
 
-#: ../src/history_manager.py:549 ../src/history_manager.py:584
+#: ../src/history_manager.py:574 ../src/history_manager.py:609
 msgid "This is an irreversible operation."
 msgstr "Denna operation kan inte göras ogjord."
 
-#: ../src/history_manager.py:581
+#: ../src/history_manager.py:606
 msgid "Do you really want to delete the selected message?"
 msgid_plural "Do you really want to delete the selected messages?"
 msgstr[0] "Vill du verkligen ta bort det valda meddelandet?"
@@ -8856,27 +9019,37 @@ msgstr "Status är nu: %(status)s: %(status_msg)s"
 msgid "Status is now: %(status)s"
 msgstr "Status är nu: %(status)s"
 
-#: ../src/htmltextview.py:564 ../src/htmltextview.py:575
+#: ../src/htmltextview.py:528 ../src/htmltextview.py:539
 msgid "Timeout loading image"
 msgstr "Tidsgräns översteg vid inläsning av bild"
 
-#: ../src/htmltextview.py:585
+#: ../src/htmltextview.py:549
 msgid "Image is too big"
 msgstr "Bild är för stor"
 
-#: ../src/message_window.py:443
+#: ../src/message_window.py:210
+#, fuzzy
+msgid "You are going to close several tabs"
+msgstr "Du är inte ansluten till servern"
+
+#: ../src/message_window.py:211
+#, fuzzy
+msgid "Do you really want to close them all?"
+msgstr "Vill du verkligen ta bort det valda meddelandet?"
+
+#: ../src/message_window.py:448
 msgid "Chats"
 msgstr "Chattar"
 
-#: ../src/message_window.py:445
+#: ../src/message_window.py:450
 msgid "Group Chats"
 msgstr "Gruppchatt"
 
-#: ../src/message_window.py:447
+#: ../src/message_window.py:452
 msgid "Private Chats"
 msgstr "Privat Chatt"
 
-#: ../src/message_window.py:453
+#: ../src/message_window.py:458
 msgid "Messages"
 msgstr "Meddelanden"
 
@@ -8888,70 +9061,66 @@ msgstr "- meddelanden kommer att loggas"
 msgid "- messages will not be logged"
 msgstr "- meddelanden kommer inte att loggas"
 
-#: ../src/notify.py:230
+#: ../src/notify.py:242
 #, python-format
 msgid "%(nick)s Changed Status"
 msgstr "%(nick)s ändrade status"
 
-#: ../src/notify.py:240
+#: ../src/notify.py:252
 #, python-format
 msgid "%(nickname)s Signed In"
 msgstr "%(nickname)s loggade in"
 
-#: ../src/notify.py:248
+#: ../src/notify.py:260
 #, python-format
 msgid "%(nickname)s Signed Out"
 msgstr "%(nickname)s loggade ut"
 
-#: ../src/notify.py:260
+#: ../src/notify.py:272
 #, python-format
 msgid "New Single Message from %(nickname)s"
 msgstr "Nytt meddelande från %(nickname)s"
 
-#: ../src/notify.py:268
+#: ../src/notify.py:280
 #, python-format
 msgid "New Private Message from group chat %s"
 msgstr "Nytt privat meddelande från gruppchatten %s"
 
-#: ../src/notify.py:270
+#: ../src/notify.py:282
 #, python-format
 msgid "%(nickname)s: %(message)s"
 msgstr "%(nickname)s: %(message)s"
 
-#: ../src/notify.py:273
+#: ../src/notify.py:285
 #, python-format
 msgid "Messaged by %(nickname)s"
 msgstr "Skickat av %(nickname)s"
 
-#: ../src/notify.py:279
+#: ../src/notify.py:291
 #, python-format
 msgid "New Message from %(nickname)s"
 msgstr "Nytt meddelande från %(nickname)s"
 
-#: ../src/notify.py:534
+#: ../src/notify.py:555
 msgid "Ignore"
 msgstr "Ignorera"
 
-#: ../src/osx/growler.py:10
-msgid "Generic"
-msgstr "Allmän"
-
 #: ../src/profile_window.py:55
 msgid "Retrieving profile..."
 msgstr "Hämtar profil..."
 
-#: ../src/profile_window.py:108 ../src/roster_window.py:2758
+#: ../src/profile_window.py:108 ../src/roster_window.py:2834
 msgid "File is empty"
 msgstr "Filen är tom"
 
-#: ../src/profile_window.py:111 ../src/roster_window.py:2761
+#: ../src/profile_window.py:111 ../src/roster_window.py:2837
 msgid "File does not exist"
 msgstr "Filen finns inte"
 
 #. keep identation
 #. unknown format
 #: ../src/profile_window.py:125 ../src/profile_window.py:141
-#: ../src/roster_window.py:2763 ../src/roster_window.py:2774
+#: ../src/roster_window.py:2839 ../src/roster_window.py:2850
 msgid "Could not load image"
 msgstr "Kunde inte läsa in bild"
 
@@ -8983,48 +9152,48 @@ msgstr ""
 "Det uppstod ett fel vid publiceringen av er personliga information, försök "
 "igen senare."
 
-#: ../src/roster_window.py:285 ../src/roster_window.py:939
+#: ../src/roster_window.py:280 ../src/roster_window.py:962
 msgid "Merged accounts"
 msgstr "Sammanfoga konton"
 
-#: ../src/roster_window.py:1874
+#: ../src/roster_window.py:1898
 msgid "Authorization has been sent"
 msgstr "Auktorisering har sänts"
 
-#: ../src/roster_window.py:1875
+#: ../src/roster_window.py:1899
 #, python-format
 msgid "Now \"%s\" will know your status."
 msgstr "Nu kommer \"%s\" veta din status."
 
-#: ../src/roster_window.py:1895
+#: ../src/roster_window.py:1919
 msgid "Subscription request has been sent"
 msgstr "Prenumerationsförfrågan har sänts"
 
-#: ../src/roster_window.py:1896
+#: ../src/roster_window.py:1920
 #, python-format
 msgid "If \"%s\" accepts this request you will know his or her status."
 msgstr ""
 "Om \"%s\" accepterar din förfrågan kommer du att känna till hans eller "
 "hennes status."
 
-#: ../src/roster_window.py:1908
+#: ../src/roster_window.py:1932
 msgid "Authorization has been removed"
 msgstr "Auktorisering har tagits bort"
 
-#: ../src/roster_window.py:1909
+#: ../src/roster_window.py:1933
 #, python-format
 msgid "Now \"%s\" will always see you as offline."
 msgstr "Nu kommer \"%s\" alltid se dig som offline."
 
-#: ../src/roster_window.py:1934
+#: ../src/roster_window.py:1961
 msgid "GPG is not usable"
 msgstr "GPG är inte användbar"
 
-#: ../src/roster_window.py:2093 ../src/roster_window.py:3258
+#: ../src/roster_window.py:2157 ../src/roster_window.py:3334
 msgid "You are participating in one or more group chats"
 msgstr "Du deltar i en eller flera guppchatter"
 
-#: ../src/roster_window.py:2094 ../src/roster_window.py:3259
+#: ../src/roster_window.py:2158 ../src/roster_window.py:3335
 msgid ""
 "Changing your status to invisible will result in disconnection from those "
 "group chats. Are you sure you want to go invisible?"
@@ -9032,15 +9201,28 @@ msgstr ""
 "Om du byter status till osynlig kommer du att förlora anslutningen till "
 "gruppchatterna. Är du säker på att du vill byta status till osynlig?"
 
-#: ../src/roster_window.py:2120
+#: ../src/roster_window.py:2184
 msgid "desync'ed"
 msgstr "inte i synk"
 
-#: ../src/roster_window.py:2258 ../src/roster_window.py:2495
+#: ../src/roster_window.py:2240
+msgid "Really quit Gajim?"
+msgstr ""
+
+#: ../src/roster_window.py:2241
+#, fuzzy
+msgid "Are you sure you want to quit Gajim?"
+msgstr "Är du säker på att du vill lämna rummet \"%s\"?"
+
+#: ../src/roster_window.py:2242
+msgid "Always close Gajim"
+msgstr ""
+
+#: ../src/roster_window.py:2333 ../src/roster_window.py:2570
 msgid "You have unread messages"
 msgstr "Du har olästa meddelanden"
 
-#: ../src/roster_window.py:2259
+#: ../src/roster_window.py:2334
 #, fuzzy
 msgid ""
 "Messages will only be available for reading them later if you have history "
@@ -9049,16 +9231,16 @@ msgstr ""
 "Meddelanden kommer bara vara tillgängliga för läsning senare om du har "
 "historik påslagen."
 
-#: ../src/roster_window.py:2496
+#: ../src/roster_window.py:2571
 msgid "You must read them before removing this transport."
 msgstr "Du måste läsa dem innan du tar bort denna transport."
 
-#: ../src/roster_window.py:2499
+#: ../src/roster_window.py:2574
 #, python-format
 msgid "Transport \"%s\" will be removed"
 msgstr "Transporten \"%s\" kommer tas bort"
 
-#: ../src/roster_window.py:2500
+#: ../src/roster_window.py:2575
 #, fuzzy
 msgid ""
 "You will no longer be able to send and receive messages from contacts using "
@@ -9067,11 +9249,11 @@ msgstr ""
 "Du kommer inte längre kunna ta emot eller skicka meddelanden till kontakter "
 "från denna transport."
 
-#: ../src/roster_window.py:2503
+#: ../src/roster_window.py:2578
 msgid "Transports will be removed"
 msgstr "Transporter kommer att tas bort"
 
-#: ../src/roster_window.py:2508
+#: ../src/roster_window.py:2583
 #, python-format
 msgid ""
 "You will no longer be able to send and receive messages to contacts from "
@@ -9081,58 +9263,58 @@ msgstr ""
 "kontakter från dessa transporter: %s"
 
 #. it's jid
-#: ../src/roster_window.py:2639
+#: ../src/roster_window.py:2714
 msgid "Rename Contact"
 msgstr "Byt namn på kontakt"
 
-#: ../src/roster_window.py:2640
+#: ../src/roster_window.py:2715
 #, python-format
 msgid "Enter a new nickname for contact %s"
 msgstr "Ange ett nytt smeknamn för kontakten %s"
 
-#: ../src/roster_window.py:2647
+#: ../src/roster_window.py:2722
 msgid "Rename Group"
 msgstr "Byt namn på grupp"
 
-#: ../src/roster_window.py:2648
+#: ../src/roster_window.py:2723
 #, python-format
 msgid "Enter a new name for group %s"
 msgstr "Ange ett nytt namn för gruppen %s"
 
-#: ../src/roster_window.py:2704
+#: ../src/roster_window.py:2780
 msgid "Remove Group"
 msgstr "Ta bort grupp"
 
-#: ../src/roster_window.py:2705
+#: ../src/roster_window.py:2781
 #, python-format
 msgid "Do you want to remove group %s from the roster?"
 msgstr "Vill du ta bort gruppen %s från kontaktlistan?"
 
-#: ../src/roster_window.py:2706
+#: ../src/roster_window.py:2782
 #, fuzzy
 msgid "Also remove all contacts in this group from your roster"
 msgstr "Ta bort en kontakt från register"
 
-#: ../src/roster_window.py:2745
+#: ../src/roster_window.py:2821
 msgid "Assign OpenPGP Key"
 msgstr "Tilldela OpenPGP-nyckel"
 
-#: ../src/roster_window.py:2746
+#: ../src/roster_window.py:2822
 msgid "Select a key to apply to the contact"
 msgstr "Välj en nyckel att tilldela kontakten"
 
-#: ../src/roster_window.py:3099
+#: ../src/roster_window.py:3172
 #, python-format
 msgid "Contact \"%s\" will be removed from your roster"
 msgstr "Kontakten \"%s\" kommer att tas bort från kontaktlistan"
 
-#: ../src/roster_window.py:3101
+#: ../src/roster_window.py:3174
 #, python-format
 msgid "You are about to remove \"%(name)s\" (%(jid)s) from your roster.\n"
 msgstr ""
 "Du är på väg att ta bort \"%(name)s\" (%(jid)s) från din kontaktlista.\n"
 
-#: ../src/roster_window.py:3106
+#: ../src/roster_window.py:3179
 msgid ""
 "By removing this contact you also remove authorization resulting in him or "
 "her always seeing you as offline."
@@ -9141,11 +9323,11 @@ msgstr ""
 "vilket resulterar i att kontakten kommer alltid se dig som frånkopplad."
 
 #. Contact is not in roster
-#: ../src/roster_window.py:3112
+#: ../src/roster_window.py:3185
 msgid "Do you want to continue?"
 msgstr "Vill du fortsätta?"
 
-#: ../src/roster_window.py:3115
+#: ../src/roster_window.py:3188
 msgid ""
 "By removing this contact you also by default remove authorization resulting "
 "in him or her always seeing you as offline."
@@ -9153,18 +9335,18 @@ msgstr ""
 "Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen. "
 "Kontakten kommer alltid se dig som frånkopplad."
 
-#: ../src/roster_window.py:3118
+#: ../src/roster_window.py:3191
 msgid "I want this contact to know my status after removal"
 msgstr ""
 "Jag vill att denna kontakten skall känna till min status även efter "
 "borttagningen"
 
 #. several contact to remove at the same time
-#: ../src/roster_window.py:3122
+#: ../src/roster_window.py:3195
 msgid "Contacts will be removed from your roster"
 msgstr "Kontakter kommer att tas bort från din kontaktlista"
 
-#: ../src/roster_window.py:3127
+#: ../src/roster_window.py:3200
 #, fuzzy, python-format
 msgid ""
 "By removing these contacts:%s\n"
@@ -9173,19 +9355,19 @@ msgstr ""
 "Genom att ta bort den här kontakten kommer du också ta bort auktoriseringen "
 "vilket resulterar i att kontakten kommer alltid se dig som frånkopplad."
 
-#: ../src/roster_window.py:3182
+#: ../src/roster_window.py:3256
 msgid "No account available"
 msgstr "Inget konto tillgängligt"
 
-#: ../src/roster_window.py:3183
+#: ../src/roster_window.py:3257
 msgid "You must create an account before you can chat with other contacts."
 msgstr "Du måste skapa ett konto innan du kan chatta med andra kontakter."
 
-#: ../src/roster_window.py:3733
+#: ../src/roster_window.py:3813
 msgid "Metacontacts storage not supported by your server"
 msgstr "Metakontakter kan inte lagras på din server"
 
-#: ../src/roster_window.py:3735
+#: ../src/roster_window.py:3815
 msgid ""
 "Your server does not support storing metacontacts information. So those "
 "information will not be saved on next reconnection."
@@ -9193,13 +9375,13 @@ msgstr ""
 "Din server saknar stöd för att lagra information om metakontakter. Denna "
 "information kommer därför inte att sparas vid nästa återanslutning."
 
-#: ../src/roster_window.py:3820
+#: ../src/roster_window.py:3900
 msgid ""
 "You are about to create a metacontact. Are you sure you want to continue?"
 msgstr ""
 "Du är på väg att skapa en metakontakt. Är du säker på att du vill fortsätta?"
 
-#: ../src/roster_window.py:3822
+#: ../src/roster_window.py:3902
 msgid ""
 "Metacontacts are a way to regroup several contacts in one line. Generally it "
 "is used when the same person has several Jabber accounts or transport "
@@ -9209,140 +9391,142 @@ msgstr ""
 "Normalt sätt används det när en person har flera Jabberkonton eller "
 "transportkonton."
 
-#: ../src/roster_window.py:3935
+#: ../src/roster_window.py:4015
 #, fuzzy
 msgid "Invalid file URI:"
 msgstr "Ogiltig Fil"
 
-#: ../src/roster_window.py:3946
+#: ../src/roster_window.py:4026
 #, python-format
 msgid "Do you want to send this file to %s:"
 msgid_plural "Do you want to send these files to %s:"
 msgstr[0] "Vill du skicka denna fil till %s:"
 msgstr[1] "Vill du skicka dessa filer till %s:"
 
+#: ../src/roster_window.py:4131
+#, fuzzy, python-format
+msgid "Send %s to %s"
+msgstr "Skicka %s"
+
+#: ../src/roster_window.py:4137
+#, python-format
+msgid "Make %s and %s metacontacts"
+msgstr "Gör %s till en metakontakt för %s"
+
 #. new chat
 #. single message
 #. for chat_with
 #. for single message
 #. join gc
-#: ../src/roster_window.py:4623 ../src/roster_window.py:4694
-#: ../src/roster_window.py:4703 ../src/systray.py:215 ../src/systray.py:262
-#: ../src/systray.py:268
+#: ../src/roster_window.py:4720 ../src/roster_window.py:4791
+#: ../src/roster_window.py:4800 ../src/systray.py:216 ../src/systray.py:263
+#: ../src/systray.py:269
 #, python-format
 msgid "using account %s"
 msgstr "använder kontot %s"
 
 #. add
-#: ../src/roster_window.py:4710
+#: ../src/roster_window.py:4807
 #, python-format
 msgid "to %s account"
 msgstr "till %s konto"
 
 #. disco
-#: ../src/roster_window.py:4715
+#: ../src/roster_window.py:4812
 #, python-format
 msgid "using %s account"
 msgstr "använder %s-kontot"
 
-#: ../src/roster_window.py:4752 ../src/systray.py:278
+#: ../src/roster_window.py:4849 ../src/systray.py:279
 msgid "_Manage Bookmarks..."
 msgstr "_Hantera bokmärken..."
 
 #. profile, avatar
-#: ../src/roster_window.py:4772
+#: ../src/roster_window.py:4869
 #, python-format
 msgid "of account %s"
 msgstr "för kontot %s"
 
-#: ../src/roster_window.py:4812
+#: ../src/roster_window.py:4909
 #, python-format
 msgid "for account %s"
 msgstr "för kontot %s"
 
-#: ../src/roster_window.py:4874 ../src/roster_window.py:4983
+#: ../src/roster_window.py:4965 ../src/roster_window.py:5066
 msgid "_Change Status Message"
 msgstr "_Ändra statusmeddelande"
 
-#: ../src/roster_window.py:4901
+#: ../src/roster_window.py:4992
 msgid "Publish Tune"
 msgstr "Publicera låt"
 
-#: ../src/roster_window.py:4908
-msgid "Mood"
-msgstr "Humör"
-
-#: ../src/roster_window.py:4912
-msgid "Activity"
-msgstr "Aktivitet"
-
-#: ../src/roster_window.py:4917
+#: ../src/roster_window.py:5000
 msgid "Configure Services..."
 msgstr "Konfigurera tjänster..."
 
-#: ../src/roster_window.py:5071
+#: ../src/roster_window.py:5154
 msgid "_Maximize All"
 msgstr "_Maximera alla"
 
 #. Send Group Message
-#: ../src/roster_window.py:5079 ../src/roster_window.py:5605
+#: ../src/roster_window.py:5162 ../src/roster_window.py:5688
 msgid "Send Group M_essage"
 msgstr "Skicka gruppm_eddelande"
 
-#: ../src/roster_window.py:5087
+#: ../src/roster_window.py:5170
 msgid "To all users"
 msgstr "Till alla användare"
 
-#: ../src/roster_window.py:5091
+#: ../src/roster_window.py:5174
 msgid "To all online users"
 msgstr "Till alla anslutna användare"
 
-#: ../src/roster_window.py:5502
+#: ../src/roster_window.py:5585
 msgid "I would like to add you to my roster"
 msgstr "Jag skulle vilja lägga till dig i min kontaktlista"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5625
+#: ../src/roster_window.py:5708
 msgid "_Manage Contacts"
 msgstr "_Hantera kontakter"
 
 #. Send single message
-#: ../src/roster_window.py:5686
+#: ../src/roster_window.py:5769
 msgid "Send Single Message"
 msgstr "Skicka ett meddelande"
 
 #. Manage Transport submenu
-#: ../src/roster_window.py:5742
+#: ../src/roster_window.py:5825
 msgid "_Manage Transport"
 msgstr "_Hantera transport"
 
 #. Modify Transport
-#: ../src/roster_window.py:5750
+#: ../src/roster_window.py:5833
 msgid "_Modify Transport"
 msgstr "_Ändra transport"
 
-#: ../src/roster_window.py:5824
+#: ../src/roster_window.py:5907
 msgid "_Maximize"
 msgstr "_Maximera"
 
-#: ../src/roster_window.py:5831
+#: ../src/roster_window.py:5914
 msgid "_Disconnect"
 msgstr "_Koppla från"
 
-#: ../src/roster_window.py:5911
+#: ../src/roster_window.py:5994
 msgid "_New Group Chat"
 msgstr "_Ny gruppchatt"
 
 #. History manager
-#: ../src/roster_window.py:6024
+#: ../src/roster_window.py:6107
 msgid "History Manager"
 msgstr "Historikhanterare"
 
-#: ../src/roster_window.py:6033
+#: ../src/roster_window.py:6116
 msgid "_Join New Group Chat"
 msgstr "_Gå in i ny gruppchatt"
 
-#: ../src/roster_window.py:6243
+#: ../src/roster_window.py:6273
 msgid "Change Status Message..."
 msgstr "Ändra statusmeddelande..."
 
@@ -9363,16 +9547,16 @@ msgstr ""
 msgid "Disk WriteError"
 msgstr ""
 
-#: ../src/session.py:238
+#: ../src/session.py:244
 #, python-format
 msgid "Subject: %s"
 msgstr "Ämne: %s"
 
-#: ../src/session.py:403 ../src/session.py:438
+#: ../src/session.py:417 ../src/session.py:452
 msgid "Confirm these session options"
 msgstr "Bekräfta dessa sessionsalternativ"
 
-#: ../src/session.py:405
+#: ../src/session.py:419
 #, python-format
 msgid ""
 "The remote client wants to negotiate an session with these features:\n"
@@ -9387,7 +9571,7 @@ msgstr ""
 "\n"
 "\tGodtar du dessa alternativ?"
 
-#: ../src/session.py:439
+#: ../src/session.py:453
 #, python-format
 msgid ""
 "The remote client selected these options:\n"
@@ -9402,7 +9586,7 @@ msgstr ""
 "\n"
 "Vill du fortsätta med sessionen?"
 
-#: ../src/systray.py:176
+#: ../src/systray.py:177
 msgid "_Change Status Message..."
 msgstr "_Byt Statusmeddelande..."
 
@@ -9410,116 +9594,108 @@ msgstr "_Byt Statusmeddelande..."
 msgid "Hide this menu"
 msgstr "Dölj denna meny"
 
-#: ../src/tooltips.py:327 ../src/tooltips.py:521
+#: ../src/tooltips.py:326 ../src/tooltips.py:520
 msgid "Jabber ID: "
 msgstr "Jabber-ID: "
 
-#: ../src/tooltips.py:330 ../src/tooltips.py:525
+#: ../src/tooltips.py:329 ../src/tooltips.py:524
 msgid "Resource: "
 msgstr "Resurs: "
 
-#: ../src/tooltips.py:335
+#: ../src/tooltips.py:334
 #, python-format
 msgid "%(owner_or_admin_or_member)s of this group chat"
 msgstr "%(owner_or_admin_or_member)s av den här gruppchatten"
 
-#: ../src/tooltips.py:432
+#: ../src/tooltips.py:431
 msgid " [blocked]"
 msgstr " [blockerad]"
 
-#: ../src/tooltips.py:436
+#: ../src/tooltips.py:435
 msgid " [minimized]"
 msgstr " [minimerad]"
 
-#: ../src/tooltips.py:451 ../src/tooltips.py:706
+#: ../src/tooltips.py:450 ../src/tooltips.py:705
 msgid "Status: "
 msgstr "Status: "
 
-#: ../src/tooltips.py:481
+#: ../src/tooltips.py:480
 #, python-format
 msgid "Last status: %s"
 msgstr "Senaste status: %s"
 
-#: ../src/tooltips.py:483
+#: ../src/tooltips.py:482
 #, python-format
 msgid " since %s"
 msgstr " sedan %s"
 
-#: ../src/tooltips.py:501
+#: ../src/tooltips.py:500
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../src/tooltips.py:503
+#: ../src/tooltips.py:502
 msgid "Disconnected"
 msgstr "Frånkopplad"
 
 #. ('both' is the normal sub so we don't show it)
-#: ../src/tooltips.py:532
+#: ../src/tooltips.py:531
 msgid "Subscription: "
 msgstr "Prenumeration: "
 
-#: ../src/tooltips.py:542
+#: ../src/tooltips.py:541
 msgid "OpenPGP: "
 msgstr "OpenPGP: "
 
-#: ../src/tooltips.py:587
-msgid "Mood:"
-msgstr "Humör:"
-
-#: ../src/tooltips.py:602
-msgid "Activity:"
-msgstr "Aktivitet:"
-
-#: ../src/tooltips.py:638
+#: ../src/tooltips.py:637
 msgid "Tune:"
 msgstr "Låt:"
 
-#: ../src/tooltips.py:664
+#: ../src/tooltips.py:663
 msgid "Download"
 msgstr "Hämta"
 
-#: ../src/tooltips.py:670
+#: ../src/tooltips.py:669
 msgid "Upload"
 msgstr "Skicka upp"
 
-#: ../src/tooltips.py:677
+#: ../src/tooltips.py:676
 msgid "Type: "
 msgstr "Typ: "
 
-#: ../src/tooltips.py:681
+#: ../src/tooltips.py:680
 msgid "Transferred: "
 msgstr "Överfört: "
 
-#: ../src/tooltips.py:684 ../src/tooltips.py:705
+#: ../src/tooltips.py:683 ../src/tooltips.py:704
 msgid "Not started"
 msgstr "Inte startad"
 
-#: ../src/tooltips.py:688
+#: ../src/tooltips.py:687
 msgid "Stopped"
 msgstr "Stoppad"
 
-#: ../src/tooltips.py:690 ../src/tooltips.py:693
+#: ../src/tooltips.py:689 ../src/tooltips.py:692
 msgid "Completed"
 msgstr "Färdigställd"
 
-#: ../src/tooltips.py:697
+#: ../src/tooltips.py:696
 msgid "?transfer status:Paused"
 msgstr "?transfer status:Pausad"
 
 #. stalled is not paused. it is like 'frozen' it stopped alone
-#: ../src/tooltips.py:701
+#: ../src/tooltips.py:700
 msgid "Stalled"
 msgstr "Avstannad"
 
-#: ../src/tooltips.py:703
+#: ../src/tooltips.py:702
 msgid "Transferring"
 msgstr "Överför"
 
-#: ../src/tooltips.py:739
+#: ../src/tooltips.py:738
 msgid "This service has not yet responded with detailed information"
 msgstr "Denna tjänst har ännu inte svarat med detaljerad information"
 
-#: ../src/tooltips.py:742
+#: ../src/tooltips.py:741
 msgid ""
 "This service could not respond with detailed information.\n"
 "It is most likely legacy or broken"
@@ -9527,28 +9703,28 @@ msgstr ""
 "Denna tjänst kunde inte svara med detaljerad information.\n"
 "Tjänsten är antagligen föråldrad eller trasig."
 
-#: ../src/vcard.py:246
+#: ../src/vcard.py:245
 msgid "?Client:Unknown"
 msgstr "?Klient:Okänd"
 
-#: ../src/vcard.py:248
+#: ../src/vcard.py:247
 msgid "?OS:Unknown"
 msgstr "?OS:Okänt"
 
-#: ../src/vcard.py:269
+#: ../src/vcard.py:268
 msgid "?Time:Unknown"
 msgstr "?Tid:Okänd"
 
-#: ../src/vcard.py:293 ../src/vcard.py:303 ../src/vcard.py:524
+#: ../src/vcard.py:292 ../src/vcard.py:302 ../src/vcard.py:511
 #, python-format
 msgid "since %s"
 msgstr "sedan %s"
 
-#: ../src/vcard.py:332
+#: ../src/vcard.py:331
 msgid "<b>Affiliation:</b>"
 msgstr "<b>Tillhörighet:</b>"
 
-#: ../src/vcard.py:340
+#: ../src/vcard.py:339
 msgid ""
 "This contact is interested in your presence information, but you are not "
 "interested in his/her presence"
@@ -9556,7 +9732,7 @@ msgstr ""
 "Denna kontakt är intresserad av din närvaroinformation, men du är inte "
 "intresserad av hans/hennes"
 
-#: ../src/vcard.py:342
+#: ../src/vcard.py:341
 msgid ""
 "You are interested in the contact's presence information, but he/she is not "
 "interested in yours"
@@ -9564,30 +9740,74 @@ msgstr ""
 "Du är intresserad av denna kontakts närvaroinformation, men han/hon är inte "
 "intresserad av din"
 
-#: ../src/vcard.py:344
+#: ../src/vcard.py:343
 msgid "You and the contact are interested in each other's presence information"
 msgstr "Du och kontakten är intresserade av varandras närvaroinformation"
 
 #. None
-#: ../src/vcard.py:346
+#: ../src/vcard.py:345
 msgid ""
 "You are not interested in the contact's presence, and neither he/she is "
 "interested in yours"
 msgstr ""
 "Varken du eller kontakten är intresserad av varandras närvaroinformation"
 
-#: ../src/vcard.py:353
+#: ../src/vcard.py:352
 msgid "You are waiting contact's answer about your subscription request"
 msgstr "Du väntar på kontaktens svar på din förfrågan om prenumeration"
 
-#: ../src/vcard.py:355
+#: ../src/vcard.py:354
 msgid "There is no pending subscription request."
 msgstr "Det finns inga väntande prenumerationsbegäran."
 
-#: ../src/vcard.py:360 ../src/vcard.py:415 ../src/vcard.py:549
+#: ../src/vcard.py:359 ../src/vcard.py:413 ../src/vcard.py:536
 msgid " resource with priority "
 msgstr " resurs med prioritet "
 
+#~ msgid "Your JID:"
+#~ msgstr "Ditt JID:"
+
+#~ msgid "B_OSH Port:"
+#~ msgstr "B_OSH-port:"
+
+#~ msgid "Show _roster"
+#~ msgstr "Visa _kontaktlista"
+
+#, fuzzy
+#~ msgid "Select the account with which to synchronise"
+#~ msgstr "Välj kontot med vilket du vill synkronisera"
+
+#~ msgid ""
+#~ "%(title)s by %(artist)s\n"
+#~ "from %(source)s"
+#~ msgstr ""
+#~ "%(title)s av %(artist)s\n"
+#~ "från %(source)s"
+
+#~ msgid "Always use OS/X default applications"
+#~ msgstr "Använd alltid OS/X standardprogram"
+
+#~ msgid "Custom"
+#~ msgstr "Anpassad"
+
+#~ msgid "Duplicate Jabber ID"
+#~ msgstr "Dubblerat Jabber-ID"
+
+#~ msgid "This account is already configured in Gajim."
+#~ msgstr "Detta kontot är redan konfigurerat i Gajim."
+
+#~ msgid "File transfer stopped by the contact at the other end"
+#~ msgstr "Filöverföringen stoppades av kontakten på andra sidan"
+
+#~ msgid "Generic"
+#~ msgstr "Allmän"
+
+#~ msgid "Mood"
+#~ msgstr "Humör"
+
+#~ msgid "Activity"
+#~ msgstr "Aktivitet"
+
 #~ msgid ""
 #~ "Requires python-gnome2-extras or compilation of gtkspell module from "
 #~ "Gajim sources."
@@ -9973,9 +10193,6 @@ msgstr " resurs med prioritet "
 #~ msgid "Drop %s in group %s"
 #~ msgstr "Placera %s i grupp %s"
 
-#~ msgid "Make %s and %s metacontacts"
-#~ msgstr "Gör %s till en metakontakt för %s"
-
 #, fuzzy
 #~ msgid "Affiliation:"
 #~ msgstr "Anknytning: "
@@ -10071,10 +10288,6 @@ msgstr " resurs med prioritet "
 #~ "Ljud att spela när MUC-meddelande anländer. (Denna inställning behandlas "
 #~ "endast om notify_on_all_muc_messages är satt till True)"
 
-#, fuzzy
-#~ msgid "Add"
-#~ msgstr "Adress"
-
 #, fuzzy
 #~ msgid "Away "
 #~ msgstr "Borta"
@@ -10241,10 +10454,6 @@ msgstr " resurs med prioritet "
 #~ msgid "account: "
 #~ msgstr "konto: "
 
-#, fuzzy
-#~ msgid "Are you sure you want to leave rooms \"%s\"?"
-#~ msgstr "Är du säker på att du vill lämna rummet \"%s\"?"
-
 #, fuzzy
 #~ msgid "If you close this window, you will be disconnected from these rooms."
 #~ msgstr ""
-- 
cgit v1.2.3